diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java index ba05e6d2..e3858c66 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java @@ -623,6 +623,7 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService public int addProduceInboundSave(ErpInboundOrder erpInboundOrder) { String loginName = ShiroUtils.getLoginName(); String makeNo = erpInboundOrder.getMakeNo(); + SysMakeOrder makeOrder = sysMakeOrderMapper.selectMakeOrderByMakeNo(makeNo); erpInboundOrder.setCreateBy(loginName); erpInboundOrder.setCreateTime(DateUtils.getNowDate()); List inboundDetails = erpInboundOrder.getInboundDetails(); @@ -658,6 +659,12 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService List deviceList = inboundDetail.getSalesShippingDeviceList(); if(StringUtils.isNotEmpty(deviceList)){ for (AfterSalesShippingDevice device:deviceList) { + device.setMaterialModelCode(makeorderBom.getMaterialModel()); + device.setMaterialType(makeorderBom.getMaterialType()); + device.setMaterialUnit(makeorderBom.getUnit()); + device.setMakeName(loginName);//生产员 + device.setCustomerId(makeOrder.getCustomerId()); + device.setCustomerName(makeOrder.getCustomerName()); QualityShippingDevice qualityDevice = generateQualityShippingDevice(qualityOrderCode,device); int insertDeviceResult = qualityDeviceMapper.insertQualityShippingDevice(qualityDevice); if(insertDeviceResult<=0){