diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorderBatch.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorderBatch.java index 03746a5c..34b78942 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorderBatch.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorderBatch.java @@ -38,6 +38,15 @@ public class ProOrderWorkorderBatch extends BaseEntity { private Long batchQuantity; @Excel(name = "已入数量") private Long includedQuantity; + private String realityNumber; + + public String getRealityNumber() { + return realityNumber; + } + + public void setRealityNumber(String realityNumber) { + this.realityNumber = realityNumber; + } public Long getIncludedQuantity() { return includedQuantity; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsWhiteEmbryoInMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsWhiteEmbryoInMapper.java index 63ce40cc..6caa7444 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsWhiteEmbryoInMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsWhiteEmbryoInMapper.java @@ -5,6 +5,7 @@ import java.util.List; import com.op.wms.domain.ProOrderWorkorder; import com.op.wms.domain.ProOrderWorkorderBatch; import com.op.wms.domain.WmsOdsWhiteEmbryoIn; +import org.apache.ibatis.annotations.Param; /** * 白胚入库单Mapper接口 @@ -70,4 +71,6 @@ public interface WmsOdsWhiteEmbryoInMapper { List selectProOrderWorkorderBatch(ProOrderWorkorder proOrderWorkorder); WmsOdsWhiteEmbryoIn selectWmsOdsWhiteEmbryoInByOrderCodeAndUserDefined1(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn); + + String selectByOrderAndBc(@Param("proOrderWorkorderBatch") ProOrderWorkorderBatch proOrderWorkorderBatch,@Param("orderCode") String orderCode); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index bc1fa458..e80f277b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -551,7 +551,16 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { ProOrderWorkorder proOrderWorkorder= wmsOdsWhiteEmbryoInMapper.selectProOrderWorkorder(wmsOdsWhiteEmbryoIns); if (proOrderWorkorder!=null){ List proOrderWorkorderBatchList= wmsOdsWhiteEmbryoInMapper.selectProOrderWorkorderBatch(proOrderWorkorder); + for(ProOrderWorkorderBatch proOrderWorkorderBatch:proOrderWorkorderBatchList){ + String realityNumber= wmsOdsWhiteEmbryoInMapper.selectByOrderAndBc(proOrderWorkorderBatch,proOrderWorkorder.getOrderCode()); + if (realityNumber!=null){ + proOrderWorkorderBatch.setRealityNumber(realityNumber); + }else { + proOrderWorkorderBatch.setRealityNumber("0"); + } + } proOrderWorkorder.setProOrderWorkorderBatchList(proOrderWorkorderBatchList); + } return proOrderWorkorder; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml index a7b6f5b3..78d48926 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsWhiteEmbryoInMapper.xml @@ -272,6 +272,15 @@ AND workorder_id = #{workorderId} +