From 7d2ee34a17f41a4df32dc4fac76036b4784e72bc Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 19 Apr 2024 10:22:21 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B929?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WmsProductPutServiceImpl.java | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) 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 ed4fbd99..ff445592 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 @@ -11,6 +11,7 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; import com.op.system.api.RemoteQualityService; import com.op.system.api.domain.quality.QcCheckTaskWarehousingDTO; import com.op.system.api.domain.wms.wmsReportWork; @@ -355,35 +356,35 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPutk.setStatus("1"); wmsProductPutk.setUnitOfMeasure(mesReportWork.getUnit()); wmsProductPutk.setBatchNumber(mesReportWork.getBatch());// - //wmsProductPutk.setSapStatus("2"); + wmsProductPutk.setSapStatus("2");//过账失败的 List wmsProductPutList = wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk); if (wmsProductPutList.size() > 0) { String id = wmsProductPutList.get(0).getId(); mesReportWork.setId(id); - wmsReportWorkList.add(mesReportWork); + wmsReportWorkList.add(mesReportWork);//已经插入过并且过账失败的 } else { - wmsReportWorkListRk.add(mesReportWork); + wmsReportWorkListRk.add(mesReportWork);//第一次的 } } for (wmsReportWork mesReportWork : - wmsReportWorkList) { - WmsProductPut wmsProductPutk = new WmsProductPut(); - wmsProductPutk.setWorkOrder(mesReportWork.getReportCode()); - wmsProductPutk.setFactoryCode(factoryCode); - wmsProductPutk.setWhCode(mesReportWork.getWhCode());//仓库编码 - wmsProductPutk.setProductName(mesReportWork.getProductName()); - wmsProductPutk.setProductCode(mesReportWork.getProductCode()); - wmsProductPutk.setProductOrder(mesReportWork.getWorkorderCodeSap()); - wmsProductPutk.setPlanQuantity(mesReportWork.getQuantityFeedback()); - wmsProductPutk.setPutQuantity(mesReportWork.getQuantityQualified()); - wmsProductPutk.setStatus("1"); - wmsProductPutk.setUnitOfMeasure(mesReportWork.getUnit()); - wmsProductPutk.setBatchNumber(mesReportWork.getBatch());// - wmsProductPutk.setSapStatus("2"); - List wmsProductPutList = wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk); - if (wmsProductPutList.size() > 0) { - wmsReportWorkListagain.add(mesReportWork);//再次过账 - } + wmsReportWorkListRk) { +// WmsProductPut wmsProductPutk = new WmsProductPut(); +// wmsProductPutk.setWorkOrder(mesReportWork.getReportCode()); +// wmsProductPutk.setFactoryCode(factoryCode); +// wmsProductPutk.setWhCode(mesReportWork.getWhCode());//仓库编码 +// wmsProductPutk.setProductName(mesReportWork.getProductName()); +// wmsProductPutk.setProductCode(mesReportWork.getProductCode()); +// wmsProductPutk.setProductOrder(mesReportWork.getWorkorderCodeSap()); +// wmsProductPutk.setPlanQuantity(mesReportWork.getQuantityFeedback()); +// wmsProductPutk.setPutQuantity(mesReportWork.getQuantityQualified()); +// wmsProductPutk.setStatus("1"); +// wmsProductPutk.setUnitOfMeasure(mesReportWork.getUnit()); +// wmsProductPutk.setBatchNumber(mesReportWork.getBatch());// +// wmsProductPutk.setSapStatus("2"); + // List wmsProductPutList = wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk); + // if (wmsProductPutList.size() > 0) { + wmsReportWorkListagain.add(mesReportWork);// + // } } //先屏蔽起来 for (wmsReportWork mesReportWork : @@ -487,10 +488,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); } } - if (wmsReportWorkListagain.size() > 0) { + if (wmsReportWorkList.size() > 0) { List> mapList = new ArrayList<>(); for (wmsReportWork mesReportWork : - wmsReportWorkListagain) { + wmsReportWorkList) { Map map = new HashMap<>(); map.put("AUFNR", mesReportWork.getWorkorderCodeSap()); map.put("WERKS", factoryCode); @@ -508,7 +509,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { int code = result.getCode(); String msg = result.getMsg(); for (wmsReportWork mesReportWork : - wmsReportWorkListagain) { + wmsReportWorkList) { WmsProductPut wmsProductPut2 = new WmsProductPut(); wmsProductPut2.setId(mesReportWork.getId()); wmsProductPut2.setSapMessage(msg); @@ -522,7 +523,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); } } -// + // for (wmsReportWork wmsReportWork: // wmsReportWorkListagain) { // QcCheckTaskWarehousingDTO qcCheckTaskWarehousingDTO = new QcCheckTaskWarehousingDTO(); @@ -541,7 +542,8 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { // Date productDate = simpleDateFormat.parse(wmsReportWork.getProductDate()); // qcCheckTaskWarehousingDTO.setIncomeTime(productDate); // //qcCheckTaskWarehousingDTO. -// remoteQualityService.createProductTask(qcCheckTaskWarehousingDTO); +// R productTask= remoteQualityService.createProductTask(qcCheckTaskWarehousingDTO); +// productTask.getData(); // } String SUCCESS = "操作完成";