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 d97aaa75..1df02da5 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 @@ -781,8 +781,12 @@ public class WmsToWCSmissionController { BaseWarehouse baseWarehouse = baseAreaService.listTableCK(baseArea); return success(baseWarehouse); } - //扫码物料标识卡 - + //扫码物料标识卡--获取信息 + @PostMapping("/selectOrderCard") + public AjaxResult selectOrderCard(@RequestBody OdsProcureOrder odsProcureOrder) { + OdsProcureOrder odsProcureOrder1 = odsProcureOrderService.selectOrderCard(odsProcureOrder); + return success(odsProcureOrder1); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index 09de2d8f..d8dc69ac 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -75,4 +75,6 @@ public interface OdsProcureOrderMapper { List getIdCardList(OdsProcureOrder odsProcureOrder); void addBatchPallet(@Param("list")List dtos); + + OdsProcureOrder selectOdsProcureOrderCard(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index 1762aa82..db3a7362 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -115,4 +115,6 @@ public interface IOdsProcureOrderService { String getIdCardList(OdsProcureOrder odsProcureOrder); String getIdCardListDA(OdsProcureOrder odsProcureOrder); + + OdsProcureOrder selectOrderCard(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 6921d9a4..42ea8130 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1146,7 +1146,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { pw.setSupplierName(order.getSupplierName()); pw.setUserDefined8(order.getUserDefined8()); pw.setUserDefined7(order.getUserDefined7()); + pw.setUserDefined10("0");//标识卡状态0是未收货的 pw.setUserDefined11(order.getUserDefined11()); + pw.setUserDefined4(odsProcureOrder.getID()); pw.setUnit(order.getUnit()); if(pall.compareTo(pn)<0) {//最后一托盘 pw.setPlanNumber(pall); @@ -1202,6 +1204,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return resylt; } + @Override + public OdsProcureOrder selectOrderCard(OdsProcureOrder odsProcureOrder) { + //送货单,采购单,行项目,物料编码,物料名称,工厂号,托盘,状态,实际收货 + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + OdsProcureOrder order= odsProcureOrderMapper.selectOdsProcureOrderCard(odsProcureOrder); + return order; + } + public String dayin( List orderList) { // 定义请求的URL地址 String url = dayinUrl1; diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 2a14c2ac..e8e3e833 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -38,6 +38,7 @@ + @@ -48,6 +49,7 @@ and Site_code = #{siteCode} + and ID = #{ID} and Procure_Code = #{procureCode} and Material_Code like concat('%', #{materialCode}, '%') @@ -432,5 +434,24 @@ +