From 0fe05dab1f38039190bfe42f7e4713048ca530c4 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 16 Aug 2024 17:45:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WmsProductPutServiceImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 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 92842b2a..d2699d05 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 @@ -1063,6 +1063,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { List wmsProductPutRecords1= wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords); if(wmsProductPutRecords1.size()>0){ wmsProductPut1.setRemark("1");//已经入库 + wmsProductPut1.setNumber(wmsProductPutRecords1.get(0).getNumber()); }else { wmsProductPut1.setRemark("0");//未入库 } @@ -1072,6 +1073,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { if (wmsProductPut1.getAttr3()==null){ wmsProductPut1.setAttr3(wmsProductPut1.getPlanQuantity().toString()); } + wmsProductPut1.setPallet(wmsProductPut.getPallet()); return wmsProductPut1; } @@ -1118,7 +1120,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { //wms_product_put wmsProductPutk.setWorkOrder(wmsProductPut1.getWorkOrder()); wmsProductPutk.setProductOrder(wmsProductPut1.getProductOrder()); - wmsProductPutk.setFactoryCode(wmsProductPut1.getFactoryCode()); + wmsProductPutk.setFactoryCode(wmsProductPut.getFactoryCode()); wmsProductPutk.setWhCode(wmsProductPut1.getWhCode());//仓库编码 wmsProductPutk.setWaCode(wmsProductPut1.getWaCode());//仓库编码 wmsProductPutk.setProductName(wmsProductPut1.getProductName()); @@ -1132,9 +1134,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { BigDecimal planQuantity= wmsProductPut2.getPlanQuantity(); BigDecimal putQuantity= wmsProductPut2.getPutQuantity(); if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){ - wmsProductPutk.setStatus("2"); - }else { wmsProductPutk.setStatus("1"); + }else { + wmsProductPutk.setStatus("2"); } BigDecimal putQuantityT=putQuantity.add(new BigDecimal(wmsProductPut1.getNumber()));//入库数量 wmsProductPut2.setPutQuantity(putQuantityT); @@ -1142,7 +1144,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut2.setUpdateBy(wmsProductPut.getCreateBy()); wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); }else { - wmsProductPutk.setStatus("1"); + wmsProductPutk.setStatus("2"); wmsProductPutk.setSapStatus("0"); wmsProductPutk.setAttr3(formattedDate);// wmsProductPutk.setCreateBy(wmsProductPut.getCreateBy()); @@ -1157,7 +1159,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPutRecords.setProductName(wmsProductPut1.getProductName()); wmsProductPutRecords.setProductCode(wmsProductPut1.getProductCode()); wmsProductPutRecords.setWhCode(wmsProductPut1.getWhCode());//仓库编码 - wmsProductPutRecords.setWaCode(wmsProductPut1.getWaCode());//仓库编码 + wmsProductPutRecords.setWaCode(wmsProductPut1.getWaCode());//库区编码 wmsProductPutRecords.setId(IdUtils.fastSimpleUUID()); wmsProductPutRecords.setWlCode(wmsProductPut1.getWlCode()); wmsProductPutRecords.setSn(wmsProductPut1.getSn()); @@ -1171,6 +1173,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn.setStorageId(IdUtils.fastSimpleUUID()); wmsFpStorageNewsSn.setFactoryCode(wmsProductPut.getFactoryCode()); wmsFpStorageNewsSn.setWhCode(wmsProductPut1.getWhCode());//仓库编码 + wmsFpStorageNewsSn.setWaCode(wmsProductPut1.getWaCode()); wmsFpStorageNewsSn.setWlCode(wmsProductPut1.getWlCode()); wmsFpStorageNewsSn.setOrderNo(wmsProductPutk.getId()); wmsFpStorageNewsSn.setProductCode(wmsProductPut1.getProductCode()); @@ -1187,18 +1190,19 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews(); wmsFpStorageNews.setWhCode(wmsProductPut1.getWhCode());//仓库编码 - wmsFpStorageNews.setWlCode(wmsProductPut1.getWaCode()); + wmsFpStorageNews.setWaCode(wmsProductPut1.getWaCode()); + wmsFpStorageNews.setWlCode(wmsProductPut1.getWlCode()); wmsFpStorageNews.setStorageType("成品"); wmsFpStorageNews.setProductCode(wmsProductPut1.getProductCode()); wmsFpStorageNews.setProductName(wmsProductPut1.getProductName()); - wmsFpStorageNews.setFactoryCode(wmsProductPut1.getFactoryCode()); + wmsFpStorageNews.setFactoryCode(wmsProductPut.getFactoryCode()); wmsFpStorageNews.setActiveFlag("1"); wmsFpStorageNews.setUserDefined1(wmsProductPut1.getUnitOfMeasure()); List wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews); wmsFpStorageNews.setStorageId(IdUtils.fastSimpleUUID()); wmsFpStorageNews.setAmount(new BigDecimal(wmsProductPut1.getNumber())); wmsFpStorageNews.setCreateBy(wmsProductPut.getCreateBy()); - wmsFpStorageNews.setCreateTime(new Date()); + wmsFpStorageNews.setGmtCreate(new Date()); if (wmsFpStorageNewsList.size() > 0) { WmsFpStorageNews wmsFpStorageNews1 = wmsFpStorageNewsList.get(0); BigDecimal amount = wmsFpStorageNews1.getAmount(); From 74c71be7e276faf5ab983196b050e8c467787412 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Fri, 16 Aug 2024 18:03:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=8F=8F=E8=BF=B0code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/quality/domain/QcCheckTaskIncome.java | 9 +++++++++ .../service/impl/QcCheckTaskIncomeServiceImpl.java | 2 ++ .../resources/mapper/quality/QcCheckTaskIncomeMapper.xml | 9 ++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java index cf51b102..5205ae47 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java @@ -190,6 +190,7 @@ public class QcCheckTaskIncome extends BaseEntity { private String fileList; private List files; private String remark; + private String remarkCode; private String belongTo; private String oldBelongTo; private String noOkQualityNames; @@ -852,6 +853,14 @@ public class QcCheckTaskIncome extends BaseEntity { return delFlag; } + public String getRemarkCode() { + return remarkCode; + } + + public void setRemarkCode(String remarkCode) { + this.remarkCode = remarkCode; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index 5bb13f95..5c7d77a1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -678,6 +678,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setUpdateTime(nowTime); qcCheckTask.setCheckTime(nowTime); qcCheckTask.setRemark(qcCheckTaskIncome.getRemark()); + qcCheckTask.setRemarkCode(qcCheckTaskIncome.getRemarkCode()); qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格 qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo()); BigDecimal noOkQquality = new BigDecimal("0"); @@ -841,6 +842,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setUpdateTime(nowTime); qcCheckTask.setCheckTime(nowTime); qcCheckTask.setRemark(qcCheckTaskIncome.getRemark()); + qcCheckTask.setRemarkCode(qcCheckTaskIncome.getRemarkCode()); qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格 qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo()); BigDecimal noOkQquality = new BigDecimal("0"); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml index abdd4fe7..bcb89235 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml @@ -39,6 +39,7 @@ + @@ -46,7 +47,7 @@ supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code, check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality, - order_type,order_type_desc + order_type,order_type_desc,remark from qc_check_task @@ -313,6 +314,7 @@ cNoOkquality = #{cNoOkquality}, income_batch_no = #{incomeBatchNo}, remark = #{remark}, + remark_code = #{remarkCode}, reason = #{reason}, bz = #{bz}, cxzz = #{cxzz}, @@ -362,6 +364,7 @@ order_type, order_type_desc, remark, + remark_code, reason, bz, start_oA, @@ -420,6 +423,7 @@ #{orderType}, #{orderTypeDesc}, #{remark}, + #{remarkCode}, #{reason}, #{bz}, #{startOA}, @@ -458,6 +462,7 @@ cNoOkquality = #{cNoOkquality}, income_batch_no = #{incomeBatchNo}, remark = #{remark}, + remark_code = #{remarkCode}, reason = #{reason}, bz = #{bz}, start_oA = #{startOA}, @@ -592,6 +597,7 @@ qct.income_time incomeTime, qct.check_loc checkLoc, qct.remark, + qct.remark_code remarkCode, qct.cxzz, qct.jgy, qct.pgy @@ -621,6 +627,7 @@ qct.income_time incomeTime, qct.check_loc checkLoc, qct.remark, + qct.remark_code remarkCode, qct.czbjr, qct.zcf, qct.zcoemcm, From 584484ef9a4d9d28822d38a44d50e62da90049c5 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 16 Aug 2024 18:08:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/service/impl/WmsProductPutServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 d2699d05..ae5ec4c3 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 @@ -1185,6 +1185,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn.setCreateBy(wmsProductPut.getCreateBy()); wmsFpStorageNewsSn.setCreateTime(new Date()); wmsFpStorageNewsSn.setActiveFlag("1"); + wmsFpStorageNewsSn.setUserDefined3(wmsProductPut1.getUnitOfMeasure()); wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn); // wms_fp_storage_news WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews();