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 e28f8a3e..8b7a6b55 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 @@ -125,6 +125,17 @@ public class WmsToWCSmissionController { String result = odsProcureOrderService.PurchaseOrderdeliPdaConfirm(odsProcureOrder); return success(result); } + /** + * 手持 --包材采购单采购收货---到货登记操作 + */ + + @PostMapping("/ArrivalRegistration") + public AjaxResult ArrivalRegistration(@RequestBody OdsProcureOrder odsProcureOrder) { +// odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); +// return success(); + String result = odsProcureOrderService.ArrivalRegistration(odsProcureOrder); + return success(result); + } @PostMapping("/selectOdsProcureOrderAlready") public AjaxResult selectOdsProcureOrderAlready(@RequestBody OdsProcureOrder odsProcureOrder) { // odsProcureOrderService.PurchaseOrderdeliPdas(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 eca17bf1..0e5e8d46 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 @@ -97,4 +97,6 @@ public interface IOdsProcureOrderService { List selectOdsProcureOrderAlready(OdsProcureOrder odsProcureOrder); String PurchaseOrderdeliPdaConfirm(OdsProcureOrder odsProcureOrder); + + String ArrivalRegistration(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 74a7167a..d96f7d5d 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 @@ -722,28 +722,39 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); String result="操作成功"; List wmsRawOrderInSn = wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder); - for (WmsRawOrderInSn order: wmsRawOrderInSn){ -// //查询这次收货信息----生成质检任务------- //插入检验集计划 - QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO = new QcCheckTaskIncomeDTO(); - qcCheckTaskIncomeDTO.setCheckLoc("mjtest"); - qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); + return result; + } + + @Override + public String ArrivalRegistration(OdsProcureOrder odsProcureOrder) { + String result="操作成功"; + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + OdsProcureOrder order=new OdsProcureOrder(); + order.setProcureCode(odsProcureOrder.getProcureCode()); + order.setActive("1"); + List orderList= odsProcureOrderMapper.selectOdsProcureOrderList(order); + for (OdsProcureOrder order1:orderList){ + //查询这次收货信息----生成质检任务------- //插入检验集计划 + QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO = new QcCheckTaskIncomeDTO(); + qcCheckTaskIncomeDTO.setCheckLoc("mjtest"); + qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); // qcCheckTaskIncomeDTO.setCheckManCode("mobile"); // qcCheckTaskIncomeDTO.setCheckManName("手持测试用户"); - OdsProcureOrder order1 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getUserDefined3()); - qcCheckTaskIncomeDTO.setSupplierCode(order1.getSupplierCode()); - String name = odsProcureOrderMapper.selectBaseSupplier(order1); - qcCheckTaskIncomeDTO.setSupplierName(name); - qcCheckTaskIncomeDTO.setOrderType("bc"); - qcCheckTaskIncomeDTO.setUnit(order1.getUnit()); - qcCheckTaskIncomeDTO.setFactoryCode(odsProcureOrder.getFactoryCode()); - qcCheckTaskIncomeDTO.setQuality(order.getAmount()); - qcCheckTaskIncomeDTO.setMaterialCode(order.getMaterialCode()); - qcCheckTaskIncomeDTO.setMaterialName(order.getMaterialDesc()); - qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2()); - qcCheckTaskIncomeDTO.setOrderNo(order.getPoNo()); - qcCheckTaskIncomeDTO.setIncomeTime(new Date()); - remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); + qcCheckTaskIncomeDTO.setSupplierCode(order1.getSupplierCode()); + String name = odsProcureOrderMapper.selectBaseSupplier(order1); + qcCheckTaskIncomeDTO.setSupplierName(name); + qcCheckTaskIncomeDTO.setOrderType("bc"); + qcCheckTaskIncomeDTO.setUnit(order1.getUnit()); + qcCheckTaskIncomeDTO.setFactoryCode(odsProcureOrder.getFactoryCode()); + qcCheckTaskIncomeDTO.setQuality(order.getPlanNumber()); + qcCheckTaskIncomeDTO.setMaterialCode(order.getMaterialCode()); + qcCheckTaskIncomeDTO.setMaterialName(order.getMaterialDesc()); + // qcCheckTaskIncomeDTO.setIncomeBatchNo(order.getUserDefined2()); + qcCheckTaskIncomeDTO.setOrderNo(order.getProcureCode()); + qcCheckTaskIncomeDTO.setIncomeTime(new Date()); + remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); } +// return result; }