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 5568bd0f..58d83e6b 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 @@ -120,6 +120,8 @@ public class OdsProcureOrderController extends BaseController { @PostMapping("/PurchaseOrderdeliPda") public AjaxResult PurchaseOrderdeliPda(@RequestBody OdsProcureOrder odsProcureOrder) { +// odsProcureOrderService.PurchaseOrderdeliPdas(odsProcureOrder); +// return success(null); int tem =odsProcureOrderService.PurchaseOrderdeliPda(odsProcureOrder); return success(tem); } 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 697f57df..558ec2ad 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 @@ -60,4 +60,6 @@ public interface OdsProcureOrderMapper { public int deleteOdsProcureOrderByIDs(String[] IDs); Integer updateRealityNuById(OdsProcureOrder odsProcureOrder); + + String selectBaseSupplier(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index e318ab39..543496b2 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -73,4 +73,6 @@ public interface OdsProcureOutOrderMapper { List selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder); List selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1); + + List selectOdsProcureOutOrderListByu1(@Param("list")List orderList); } 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 5cb22132..e7754fb3 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 @@ -92,4 +92,6 @@ public interface IOdsProcureOrderService { void OutboundPostingSAP(List odsProcureOutOrder); AjaxResult sapPurchaseOrderSync(OdsProcureOrder odsProcureOrder); + + void PurchaseOrderdeliPdas(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 9917b7c2..398228d0 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 @@ -39,6 +39,10 @@ import com.op.wms.mapper.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.service.IOdsProcureOrderService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; /** * 包材采购单Service业务层处理 @@ -178,16 +182,25 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { odsProcureOrder.setOrderStatus("2"); } Integer tem= odsProcureOrderMapper.updateRealityNuById(odsProcureOrder); -// //插入检验集计划 -// QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO=new QcCheckTaskIncomeDTO(); -// qcCheckTaskIncomeDTO.setCheckLoc("mjtest"); -// qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); -// qcCheckTaskIncomeDTO.setCheckManCode("mobile"); -// qcCheckTaskIncomeDTO.setCheckManName("手持测试用户"); -//// qcCheckTaskIncomeDTO.setSupplierCode(); -//// qcCheckTaskIncomeDTO.setSupplierName(); -//// qcCheckTaskIncomeDTO.setOrderType("bc"); -// remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); + //插入检验集计划 + QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO=new QcCheckTaskIncomeDTO(); + qcCheckTaskIncomeDTO.setCheckLoc("mjtest"); + qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); + qcCheckTaskIncomeDTO.setCheckManCode("mobile"); + qcCheckTaskIncomeDTO.setCheckManName("手持测试用户"); + qcCheckTaskIncomeDTO.setSupplierCode(order.getSupplierCode()); + String name= odsProcureOrderMapper.selectBaseSupplier(odsProcureOrder); + qcCheckTaskIncomeDTO.setSupplierName(name); + qcCheckTaskIncomeDTO.setOrderType("bc"); + qcCheckTaskIncomeDTO.setUnit(order.getUnit()); + qcCheckTaskIncomeDTO.setFactoryCode(odsProcureOrder.getFactoryCode()); + qcCheckTaskIncomeDTO.setQuality(odsProcureOrder.getPlanNumber()); + qcCheckTaskIncomeDTO.setMaterialCode(odsProcureOrder.getMaterialCode()); + qcCheckTaskIncomeDTO.setMaterialName(odsProcureOrder.getSupplierName()); + qcCheckTaskIncomeDTO.setIncomeBatchNo(odsProcureOrder.getIncomeBatchNo()); + qcCheckTaskIncomeDTO.setOrderNo(order.getProcureCode()); + qcCheckTaskIncomeDTO.setIncomeTime(new Date()); + remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); return tem; } @@ -657,6 +670,31 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return AjaxResult.success(); } + @Override + public void PurchaseOrderdeliPdas(OdsProcureOrder odsProcureOrder) { + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + + request.setAttribute("#header.poolName", "ds_" + odsProcureOrder.getFactoryCode()); + QcCheckTaskIncomeDTO qcCheckTaskIncomeDTO=new QcCheckTaskIncomeDTO(); + qcCheckTaskIncomeDTO.setCheckLoc("mjtest"); + qcCheckTaskIncomeDTO.setCheckType("checkTypeLL"); + qcCheckTaskIncomeDTO.setCheckManCode("mobile"); + qcCheckTaskIncomeDTO.setCheckManName("手持测试用户"); + qcCheckTaskIncomeDTO.setSupplierCode("1"); + qcCheckTaskIncomeDTO.setFactoryCode("1000"); + qcCheckTaskIncomeDTO.setSupplierName("1"); + qcCheckTaskIncomeDTO.setOrderType("bc"); + qcCheckTaskIncomeDTO.setUnit("1"); + qcCheckTaskIncomeDTO.setQuality(new BigDecimal("1")); + qcCheckTaskIncomeDTO.setMaterialCode("1"); + qcCheckTaskIncomeDTO.setMaterialName("1"); + qcCheckTaskIncomeDTO.setIncomeBatchNo("1"); + qcCheckTaskIncomeDTO.setOrderNo("1"); + qcCheckTaskIncomeDTO.setIncomeTime(new Date()); + remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); + } + public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle){ // 定义请求的URL地址 String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundByPallet"; 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 60db94ef..3a40d3a1 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 @@ -207,4 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where ID = #{ID} + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 1267b32b..2d76839d 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -315,5 +315,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.ID} - +