diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java index b3ef08e18..b10c62d4c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsFpStorageNewsSnController.java @@ -119,4 +119,13 @@ public class WmsFpStorageNewsSnController extends BaseController { List proOrderWorkorderList= wmsFpStorageNewsSnService.insertBSK(proOrderWorkorder); return proOrderWorkorderList; } + /** + * 获取成品库存明细详细信息 + */ + @GetMapping(value = "/ListRecords") + public TableDataInfo ListRecords( WmsFpStorageNewsSn wmsFpStorageNewsSn) { + startPage(); + List list = wmsFpStorageNewsSnService.selectWmsFpStorageNewsSnRecordsList(wmsFpStorageNewsSn); + return getDataTable(list); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java index c683a6eca..ca117b2cd 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java @@ -95,4 +95,6 @@ public interface WmsFpStorageNewsSnMapper { public void insertWmsFpStorageNewsSnRecords(WmsFpStorageNewsSn wmsFpStorageNewsSn3); List selectwmsFpStorageNewsGroupWaCode(@Param("productCode")String productCode); + + List selectWmsFpStorageNewsSnRecordsList(WmsFpStorageNewsSn wmsFpStorageNewsSn); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java index 3f6a13f7b..580fc58fa 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsFpStorageNewsSnService.java @@ -66,4 +66,6 @@ public interface IWmsFpStorageNewsSnService { List insertBSK(ProOrderWorkorder proOrderWorkorder); List BSKlist(WmsFpStorageNewsSn proOrderWorkorder); + + List selectWmsFpStorageNewsSnRecordsList(WmsFpStorageNewsSn wmsFpStorageNewsSn); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java index aff23d2ee..73cfc6221 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsFpStorageNewsSnServiceImpl.java @@ -188,4 +188,10 @@ public class WmsFpStorageNewsSnServiceImpl implements IWmsFpStorageNewsSnService public List BSKlist(WmsFpStorageNewsSn proOrderWorkorder) { return wmsFpStorageNewsSnMapper.selectBSKList(proOrderWorkorder); } + + @Override + @DS("#header.poolName") + public List selectWmsFpStorageNewsSnRecordsList(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + return wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnRecordsList(wmsFpStorageNewsSn); + } } 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 70cd74521..71d48320d 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 @@ -878,11 +878,12 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn3.setWhCode(wmsFpStorageNewsSn2.getWhCode()); wmsFpStorageNewsSn3.setWaCode(wmsFpStorageNewsSn2.getWaCode()); wmsFpStorageNewsSn3.setWlCode(wmsFpStorageNewsSn2.getWlCode()); - wmsFpStorageNewsSn3.setOrderNo(wmsFpStorageNewsSn2.getOrderNo()); + wmsFpStorageNewsSn3.setOrderNo(wmsSellOutEmbryo1.getDeliveryOrder()); wmsFpStorageNewsSn3.setProductCode(wmsFpStorageNewsSn2.getProductCode()); wmsFpStorageNewsSn3.setProductName(wmsFpStorageNewsSn2.getProductName()); wmsFpStorageNewsSn3.setSn(wmsFpStorageNewsSn2.getSn()); wmsFpStorageNewsSn3.setBatchNumber(wmsFpStorageNewsSn2.getBatchNumber()); + wmsFpStorageNewsSn3.setUserDefined1(wmsSellOutEmbryo1.getStockOrder());//备货 wmsFpStorageNewsSn3.setUserDefined3(wmsFpStorageNewsSn2.getUserDefined3()); wmsFpStorageNewsSn3.setCreateTime(new Date()); wmsFpStorageNewsSn3.setCreateBy(wmsFpStorageNewsSn2.getCreateBy()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml index 0f0427306..c2cb39e78 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml @@ -583,4 +583,68 @@ product_code; +