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 f88747b4..9917b7c2 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 @@ -16,7 +16,9 @@ import com.op.common.core.domain.R; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; +import com.op.system.api.RemoteQualityService; import com.op.system.api.RemoteSapService; +import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO; import com.op.system.api.domain.sap.SapBackflushMPQuery; import com.op.system.api.domain.sap.SapMaterialPosting; import com.op.system.api.domain.sap.SapPurchaseOrderQuery; @@ -58,6 +60,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { private OdsProcureOutOrderMapper odsProcureOutOrderMapper; @Autowired private RemoteSapService remoteSapService; + @Autowired + private RemoteQualityService remoteQualityService; @Autowired private BaseWarehouseMapper baseWarehouseMapper; @@ -174,6 +178,16 @@ 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); return tem; } @@ -215,6 +229,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsOdsMateStorageNewsSn.setUserDefined2(wmsRawOrderInSn.getUserDefined2());//批次 wmsOdsMateStorageNewsSn.setFactoryCode(wmsRawOrderInSn.getFactoryCode()); wmsOdsMateStorageNewsSn.setSapFactoryCode(wmsRawOrderInSn.getFactoryCode()); + wmsOdsMateStorageNewsSn.setActiveFlag("1"); wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn); //修改库存 //2,修改库存---/加库存数量-/-冻结数量 @@ -231,7 +246,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsOdsMateStorageNews1.setWhCode(wmsRawOrderInSn.getWhCode()); wmsOdsMateStorageNews1.setWlCode(wmsRawOrderInSn.getWlCode()); wmsOdsMateStorageNews1.setAmount(wmsRawOrderInSn.getAmount()); - wmsOdsMateStorageNews1.setStorageAmount(wmsRawOrderInSn.getAmount()); + wmsOdsMateStorageNews1.setStorageAmount(new BigDecimal("0")); wmsOdsMateStorageNews1.setMaterialCode(wmsRawOrderInSn.getMaterialCode()); wmsOdsMateStorageNews1.setMaterialDesc(wmsRawOrderInSn.getMaterialDesc()); wmsOdsMateStorageNews1.setStorageType("BC"); @@ -246,7 +261,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsOdsMateStorageNewsSnMapper.updateAdd(wmsOdsEmStorageNews); } wmsRawOrderInSnMapper.updateU1Byid(wmsRawOrderInSn); - } @Override @@ -533,10 +547,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Override @DS("#header.poolName") public void OutboundPostingSAP(List orderList) { - // * 退料的移动类型为 262 // * 领料的移动类型为 261 - List orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByIds(orderList); + // List orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByIds(orderList); + List orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByu1(orderList); + //查询这个地方先暂时去掉Order_Status = '3' 条件 for (OdsProcureOutOrder odsProcureOutOrder: orderList1) { //取sap仓库号