diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelog/StorageLogDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelog/StorageLogDO.java index 2e2f2d8c..ca2bd3d0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelog/StorageLogDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelog/StorageLogDO.java @@ -91,6 +91,8 @@ public class StorageLogDO extends BaseDO { @TableField(exist = false) private String pnName; @TableField(exist = false) + private String projectNo; + @TableField(exist = false) private List materialDOList; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java index f129cc1f..01dae8c7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java @@ -21,6 +21,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.outsourcestockboom.Outsou import com.chanko.yunxi.mes.module.heli.dal.dataobject.outsourcestockmaterial.OutsourceStockMaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.pn.PnDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; @@ -39,6 +40,7 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.outsourcestockboom.OutsourceSt import com.chanko.yunxi.mes.module.heli.dal.mysql.outsourcestockmaterial.OutsourceStockMaterialMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.pn.PnMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder.ProjectOrderSubMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorder.PurchaseOrderMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordernodetail.PurchaseOrderNoDetailMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.storageinventory.StorageInventoryMapper; @@ -149,6 +151,8 @@ public class StorageServiceImpl implements StorageService { private StorageLogService storageLogService; @Resource private ProjectOrderMapper projectOrderMapper; + @Resource + private ProjectOrderSubMapper projectOrderSubMapper; /* * * 委外验收取消提交,作废入库单 @@ -517,7 +521,6 @@ public class StorageServiceImpl implements StorageService { // 将物料信息转化日志信息 List logList = BeanUtils.toBean(matList,StorageLogDO.class); // 同步库存单状态到日志,便于以后统计 - ProjectOrderDO projectOrderDO = projectOrderMapper.selectByStockId(stockId); StorageDO storageDO = storageMapper.selectById(stockId); for (StorageLogDO log : logList){ log.setId(null); @@ -535,9 +538,15 @@ public class StorageServiceImpl implements StorageService { log.setStockType(2); log.setGoodsType(1); log.setCodeNo(stockNo); - if (ObjectUtil.isNotEmpty(projectOrderDO)){ - log.setAuItem(projectOrderDO.getAuItem()); + ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(Long.valueOf(log.getProjectNo())); + if (ObjectUtil.isNotEmpty(projectOrderSubDO)){ + ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(projectOrderSubDO.getProjectOrderId()); + if (ObjectUtil.isNotEmpty(projectOrderDO)){ + log.setAuItem(projectOrderDO.getAuItem()); + } } + + } } // 批量保存当前库存物料日志信息