diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index c275c37f..27fee112 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -622,8 +622,18 @@ public class WmsToWCSmissionController { List list = wmsProductPutService.selectBaseEquipmentList(baseEquipment); return success(list); } - - + //根据线体查询单子 + @PostMapping("/listProOrderWorkorder") + public AjaxResult listProOrderWorkorder(@RequestBody ProOrderWorkorder proOrderWorkorder) { + List list = wmsProductPutService.listProOrderWorkorder(proOrderWorkorder); + return success(list); + } + //保存--成品生产记录 + @PostMapping("/finishedProductProductionRecords") + public AjaxResult finishedProductProductionRecords(@RequestBody ProOrderWorkorder proOrderWorkorder) { + List list = wmsProductPutService.listProOrderWorkorder(proOrderWorkorder); + return success(list); + } /** * 成品自动码垛完以后,RGV 接驳要入库的托盘,扫描 RFID 号,请求 WMS 获取入库托盘信息。 * 触发时机:扫描 RFID 编码,进行入库 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 6caa7444..a0027c6f 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 @@ -73,4 +73,6 @@ public interface WmsOdsWhiteEmbryoInMapper { WmsOdsWhiteEmbryoIn selectWmsOdsWhiteEmbryoInByOrderCodeAndUserDefined1(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn); String selectByOrderAndBc(@Param("proOrderWorkorderBatch") ProOrderWorkorderBatch proOrderWorkorderBatch,@Param("orderCode") String orderCode); + + List listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index bd910f3b..114b75f0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -132,4 +132,6 @@ public interface IWmsProductPutService { String finishedProductSalesReturnTD(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); List selectBaseEquipmentList(BaseEquipment baseEquipment); + + List listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder); } 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 04b66376..b81c5963 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 @@ -990,6 +990,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return baseEquipments; } + @Override + public List listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) { + DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode()); + List workorderList= wmsOdsWhiteEmbryoInMapper.listProOrderWorkorder(proOrderWorkorder); + return workorderList; + } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); 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 cb1a82cb..f6c17e30 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 @@ -285,5 +285,26 @@ WHERE Active='1' AND Order_Code=#{orderCode} AND User_Defined1=#{userDefined1} - +