diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java index 6fe0b484..dbd70fd0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java @@ -320,6 +320,8 @@ public class OdsProcureOrderController extends BaseController { odsProcureOrderService.OutboundPostingSAPfc(orderList); return success(); } + + @PostMapping("/listCKT") public AjaxResult listCKT(BaseWarehouse baseWarehouse) { 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 a2c14243..dba3ced1 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 @@ -300,7 +300,14 @@ public class WmsToWCSmissionController { public AjaxResult WmsProductPutByWorkOrderquery(@RequestBody WmsProductPut wmsProductPut) { return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderquery(wmsProductPut)); } - + /** + * 成品 + * 手持接口:根据报工单号查询--新---改成扫标识卡 + */ + @PostMapping("/WmsProductPutByWorkOrderqueryBS") + public AjaxResult WmsProductPutByWorkOrderqueryBS(@RequestBody WmsProductPut wmsProductPut) { + return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderqueryBS(wmsProductPut)); + } /** * 成品 * 手持接口:确认 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java index 31f815e5..0a72018c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java @@ -217,6 +217,43 @@ public class WmsProductPut extends BaseEntity { List wmsProductPut; private String sn; + private String pallet;//标识卡 + + public String getPallet() { + return pallet; + } + private String attribute1 ; + private String attribute2; + private String attribute3; + + public String getAttribute1() { + return attribute1; + } + + public void setAttribute1(String attribute1) { + this.attribute1 = attribute1; + } + + public String getAttribute2() { + return attribute2; + } + + public void setAttribute2(String attribute2) { + this.attribute2 = attribute2; + } + + public String getAttribute3() { + return attribute3; + } + + public void setAttribute3(String attribute3) { + this.attribute3 = attribute3; + } + + public void setPallet(String pallet) { + this.pallet = pallet; + } + public String getSn() { return sn; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 763c0118..867136fe 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -77,6 +77,7 @@ public interface WmsProductPutMapper { void updateWmsProductPutByIds(@Param("wmsProductPut") WmsProductPut wmsProductPut4, @Param("list") List wmsProductPut2); + WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut); // String selectWmsProductPutNum(wmsReportWork wmsReportWork); 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 6535ef55..832bad7a 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 @@ -138,4 +138,6 @@ public interface IWmsProductPutService { Integer finishedProductProductionRecords(ProOrderWorkorder proOrderWorkorder); List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords); + + WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut); } 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 479b7ad0..aef6dcfc 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 @@ -854,7 +854,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { if (ruslt.getCode()==200){//成功 odsProcureOrderMapper.updateOdsProcureOrderAddOperationNumber(odsProcureOrder); }else { - result="操作失败"; + result="操作失败:"+ruslt.getMsg(); } return result; } 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 8c8a70e6..d29686c8 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 @@ -1028,6 +1028,22 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return records; } + @Override + public WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut) { + // 使用 split 方法根据 '-' 分割字符串,结果是一个字符串数组 + DynamicDataSourceContextHolder.push("ds_" + wmsProductPut.getFactoryCode()); + String[] attributes = wmsProductPut.getPallet().split("-"); + // 通过索引访问分割后的数组,获取所需的三个属性 + String attribute1 = attributes[0]; // 获取第一个属性 + String attribute2 = attributes[1]; // 获取第二个属性 + String attribute3 = attributes[2]; // 获取第三个属性 + wmsProductPut.setAttribute1(attribute1); + wmsProductPut.setAttribute2(attribute2); + wmsProductPut.setAttribute3(attribute3); + WmsProductPut wmsProductPut1 = wmsProductPutMapper.WmsProductPutByWorkOrderqueryBS(wmsProductPut); + return wmsProductPut1; + } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index 07564a79..d05605ab 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -384,5 +384,35 @@ #{item.id} +