Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

This commit is contained in:
2025-07-23 16:04:39 +08:00
15 changed files with 748 additions and 143 deletions

View File

@@ -12,6 +12,7 @@ import com.klp.domain.WmsPurchasePlanDetail;
import com.klp.domain.vo.WmsOrderDetailVo;
import com.klp.domain.vo.WmsPurchasePlanDetailVo;
import com.klp.mapper.WmsPurchasePlanDetailMapper;
import com.klp.mapper.WmsRawMaterialMapper;
import com.klp.service.*;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -47,6 +48,9 @@ public class WmsPurchasePlanServiceImpl implements IWmsPurchasePlanService {
@Resource
private WmsPurchasePlanDetailMapper wmsPurchasePlanDetailMapper;
@Resource
private WmsRawMaterialMapper wmsRawMaterialMapper;
@Transactional
@Override
public Boolean insertWithDetails(WmsPurchasePlanVo planVo) {
@@ -80,6 +84,8 @@ public class WmsPurchasePlanServiceImpl implements IWmsPurchasePlanService {
vo.setRawMaterialId(bom.getRawMaterialId());
vo.setQuantity(vo.getQuantity() == null ? needQty : vo.getQuantity().add(needQty));
vo.setUnit(bom.getUnit());
vo.setRawMaterialName(wmsRawMaterialMapper.selectById(bom.getRawMaterialId()).getRawMaterialName());
vo.setRawMaterialCode(wmsRawMaterialMapper.selectById(bom.getRawMaterialId()).getRawMaterialCode());
materialMap.put(bom.getRawMaterialId(), vo);
}
}