From 886c016d013a361c4efbe2482699fe0030c4d6f0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 6 Aug 2024 15:00:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcInterfaceServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java index b55582b20..42b5466ca 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java @@ -202,8 +202,8 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { q2.setQuality("5800"); q2.setUnit("个"); q2.setSupplierName("广州市网能产品设计有限公司"); - q2.setIncomeTime("2024-03-07 00:00:00"); - q2.setCheckTime("2024-03-07 13:42:00"); + q2.setIncomeTime("2024-08-06 00:00:00"); + q2.setCheckTime("2024-08-06 13:42:00"); q2.setCheckResult("合格"); q2.setCheckManName("马娥章"); q2.setCheckName("来料检验"); @@ -218,7 +218,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { q3.setUnit("个"); q3.setSupplierName("广州市网能产品设计有限公司"); q3.setCheckTime("2024-03-05 13:50:00"); - q3.setIncomeTime("2024-03-07 00:00:00"); + q3.setIncomeTime("2024-08-06 00:00:00"); q3.setCheckResult("合格"); q3.setCheckManName("马娥章"); q3.setCheckName("来料检验"); @@ -283,22 +283,22 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { QcInterface q0 = new QcInterface(); q0.setProjectName("产品外观"); q0.setCheckManName("马娥章"); - q0.setCheckTime("2024-03-08 16:30:00"); + q0.setCheckTime("2024-08-06 16:30:00"); dtos.add(q0); QcInterface q1 = new QcInterface(); q1.setProjectName("厚度（一盘）"); q1.setCheckManName("马娥章"); - q1.setCheckTime("2024-03-08 15:35:00"); + q1.setCheckTime("2024-08-06 15:35:00"); dtos.add(q1); QcInterface q2 = new QcInterface(); q2.setProjectName("其它不良现象"); q2.setCheckManName("马娥章"); - q2.setCheckTime("2024-03-08 15:05:00"); + q2.setCheckTime("2024-08-06 15:05:00"); dtos.add(q2); QcInterface q3 = new QcInterface(); q3.setProjectName("灌装量/净含量/喷药量"); q3.setCheckManName("马娥章"); - q3.setCheckTime("2024-03-07 16:00:00"); + q3.setCheckTime("2024-08-06 16:00:00"); dtos.add(q3); QcInterface q4 = new QcInterface(); q4.setProjectName("是否符合签样及材料清单要求，堆板日期朝外"); From 3983470a67f938d70687cc311eeb86a08f087134 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 6 Aug 2024 15:01:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/service/impl/QcInterfaceServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java index 42b5466ca..a41990e61 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java @@ -303,12 +303,12 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { QcInterface q4 = new QcInterface(); q4.setProjectName("是否符合签样及材料清单要求，堆板日期朝外"); q4.setCheckManName("马娥章"); - q4.setCheckTime("2024-03-05 11:00:00"); + q4.setCheckTime("2024-08-05 11:00:00"); dtos.add(q4); QcInterface q5 = new QcInterface(); q5.setProjectName("其它不良现象"); q5.setCheckManName("马娥章"); - q5.setCheckTime("2024-03-05 16:00:00"); + q5.setCheckTime("2024-08-05 16:00:00"); dtos.add(q5); /**质量看板测试结束**/ return dtos; From b2dbca3bfbd396ad73c8e70e6de6a497c83dd84d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 6 Aug 2024 15:10:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcInterfaceServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java index a41990e61..36d2b74f9 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java @@ -283,12 +283,12 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { QcInterface q0 = new QcInterface(); q0.setProjectName("产品外观"); q0.setCheckManName("马娥章"); - q0.setCheckTime("2024-08-06 16:30:00"); + q0.setCheckTime("2024-08-06 15:01:00"); dtos.add(q0); QcInterface q1 = new QcInterface(); q1.setProjectName("厚度（一盘）"); q1.setCheckManName("马娥章"); - q1.setCheckTime("2024-08-06 15:35:00"); + q1.setCheckTime("2024-08-06 14:35:00"); dtos.add(q1); QcInterface q2 = new QcInterface(); q2.setProjectName("其它不良现象"); @@ -298,18 +298,18 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { QcInterface q3 = new QcInterface(); q3.setProjectName("灌装量/净含量/喷药量"); q3.setCheckManName("马娥章"); - q3.setCheckTime("2024-08-06 16:00:00"); + q3.setCheckTime("2024-08-06 15:00:00"); dtos.add(q3); QcInterface q4 = new QcInterface(); q4.setProjectName("是否符合签样及材料清单要求，堆板日期朝外"); q4.setCheckManName("马娥章"); q4.setCheckTime("2024-08-05 11:00:00"); dtos.add(q4); - QcInterface q5 = new QcInterface(); - q5.setProjectName("其它不良现象"); - q5.setCheckManName("马娥章"); - q5.setCheckTime("2024-08-05 16:00:00"); - dtos.add(q5); +// QcInterface q5 = new QcInterface(); +// q5.setProjectName("其它不良现象"); +// q5.setCheckManName("马娥章"); +// q5.setCheckTime("2024-08-05 16:00:00"); +// dtos.add(q5); /**质量看板测试结束**/ return dtos; } From 42e1dd81505a6942b0b79f3dd3bea77ec7d1b75f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 6 Aug 2024 21:55:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=92=8C=E6=8A=A5=E8=A1=A8=E3=80=81=E6=A0=87=E8=AF=86=E5=8D=A1?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=A1=A5=E6=89=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProOrderWorkorderController.java | 6 ++ .../com/op/plan/domain/ProOrderWorkorder.java | 63 +++++++++++++++++++ .../plan/mapper/ProOrderWorkorderMapper.java | 4 ++ .../service/IProOrderWorkorderService.java | 2 + .../impl/ProOrderWorkorderServiceImpl.java | 53 ++++++++++++++++ .../mapper/plan/ProOrderWorkorderMapper.xml | 30 +++++++++ .../service/impl/QcInterfaceServiceImpl.java | 32 ---------- .../impl/QcStaticTableServiceImpl.java | 4 +- .../java/com/op/wms/domain/BaseProduct.java | 18 ++++++ .../op/wms/domain/BaseProductAttached.java | 9 +++ .../mapper/wms/BaseProductAttachedMapper.xml | 5 +- .../mapper/wms/BaseProductMapper.xml | 8 +-- 12 files changed, 196 insertions(+), 38 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index a92b54b02..b226c0d40 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -308,4 +308,10 @@ public class ProOrderWorkorderController extends BaseController { public List getProdLineList() { return proOrderWorkorderService.getProdLineList(); } + + /**获取标识卡**/ + @PostMapping("/getIdCardList") + public List getIdCardList(@RequestBody ProOrderWorkorder proOrderWorkorder) { + return proOrderWorkorderService.getIdCardList(proOrderWorkorder); + } } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java index d50e5c37b..c29121fe9 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java @@ -331,6 +331,69 @@ public class ProOrderWorkorder extends TreeEntity { private String factoryCode; private Boolean hasChildren; + private List idCards; + private String batchCode; + private BigDecimal batchQuantity; + private BigDecimal palletNum; + private Integer palletNo; + private String palletCode; + private String recordId; + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getPalletCode() { + return palletCode; + } + + public void setPalletCode(String palletCode) { + this.palletCode = palletCode; + } + + public Integer getPalletNo() { + return palletNo; + } + + public void setPalletNo(Integer palletNo) { + this.palletNo = palletNo; + } + + public BigDecimal getPalletNum() { + return palletNum; + } + + public void setPalletNum(BigDecimal palletNum) { + this.palletNum = palletNum; + } + + public BigDecimal getBatchQuantity() { + return batchQuantity; + } + + public void setBatchQuantity(BigDecimal batchQuantity) { + this.batchQuantity = batchQuantity; + } + + public String getBatchCode() { + return batchCode; + } + + public void setBatchCode(String batchCode) { + this.batchCode = batchCode; + } + + public List getIdCards() { + return idCards; + } + + public void setIdCards(List idCards) { + this.idCards = idCards; + } public String getSapCode() { return sapCode; diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index c3eb57a41..d19835380 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -233,5 +233,9 @@ public interface ProOrderWorkorderMapper { List selectChildWorkOrderCG(String workorderCode); List getBatchDict(String batchFlag); + + List getPreIdCardList(ProOrderWorkorder proOrderWorkorder); + + int addBatchPallet(@Param("list")List dtos); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java index b0ffd663f..bc8f05c64 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java @@ -149,4 +149,6 @@ public interface IProOrderWorkorderService { int deleteWorkOrderBatch(ProOrderWorkorderBatch proOrderWorkorderBatch); List getProdLineList(); + + List getIdCardList(ProOrderWorkorder proOrderWorkorder); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index e058e4f79..8afbe5524 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1259,6 +1259,59 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { return proOrderWorkorderBatchMapper.getProdLineList(); } + @Override + @DS("#header.poolName") + public List getIdCardList(ProOrderWorkorder proOrderWorkorder) { + List dtos = new ArrayList<>(); + List dtos0 = proOrderWorkorderMapper.getPreIdCardList(proOrderWorkorder); + + if(!CollectionUtils.isEmpty(dtos0) && dtos0.get(0).getPalletNo() == null){//说明没生成过标识卡 + ProOrderWorkorder pw = null; + int i = 1; + Date nowDate = DateUtils.getNowDate(); + for(ProOrderWorkorder pow:dtos0){ + if(pow.getPalletNum()!=null){ + + BigDecimal pall = pow.getBatchQuantity(); + BigDecimal pn = pow.getPalletNum(); + + while(pall.subtract(pn).compareTo(BigDecimal.ZERO)>0){ + pw = new ProOrderWorkorder(); + pw.setProductName(pow.getProductName()); + pw.setWorkorderCode(pow.getWorkorderCode()); + pw.setBatchCode(pow.getBatchCode()); + pw.setProductDateStr(pow.getProductDateStr()); + pw.setRecordId(IdUtils.fastSimpleUUID()); + pw.setBatchQuantity(pn); + pw.setPalletNo(i++); + pw.setPalletCode(pow.getPalletCode()+"-"+pw.getPalletNo()); + pw.setCreateTime(nowDate); + dtos.add(pw); + pall = pall.subtract(pn); + } + if(pall.compareTo(pn)<0){//最后一托盘 + pw = new ProOrderWorkorder(); + pw.setProductName(pow.getProductName()); + pw.setWorkorderCode(pow.getWorkorderCode()); + pw.setBatchCode(pow.getBatchCode()); + pw.setProductDateStr(pow.getProductDateStr()); + pw.setRecordId(IdUtils.fastSimpleUUID()); + pw.setBatchQuantity(pall); + pw.setPalletNo(i++); + pw.setPalletCode(pow.getPalletCode()+"-"+pw.getPalletNo()); + pw.setCreateTime(nowDate); + dtos.add(pw); + } + } + } + proOrderWorkorderMapper.addBatchPallet(dtos); + }else{ + dtos.addAll(dtos0); + } + + return dtos; + } + /** * 校验工单是否可以修改 diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index e91bf44ec..f18ce253c 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -680,6 +680,24 @@ + insert into mes_prepare_detail @@ -800,6 +818,18 @@ ) + + INSERT INTO pro_order_workorder_batch_pallet ( + id,workorder_code,batch_code,quantity,pallet_num, + create_time,pallet_code + )VALUES + + ( + #{d.recordId},#{d.workorderCode},#{d.batchCode},#{d.batchQuantity},#{d.palletNo}, + #{d.createTime},#{d.palletCode} + ) + + update pro_order_workorder diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java index 36d2b74f9..76ff9cd16 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java @@ -279,38 +279,6 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { String nowYMD = DateUtils.getDate(); qcInterface.setYmd(nowYMD); List dtos = qcInterfaceMapper.getProduceNoOkList(qcInterface); - /**质量看板测试开始**/ - QcInterface q0 = new QcInterface(); - q0.setProjectName("产品外观"); - q0.setCheckManName("马娥章"); - q0.setCheckTime("2024-08-06 15:01:00"); - dtos.add(q0); - QcInterface q1 = new QcInterface(); - q1.setProjectName("厚度（一盘）"); - q1.setCheckManName("马娥章"); - q1.setCheckTime("2024-08-06 14:35:00"); - dtos.add(q1); - QcInterface q2 = new QcInterface(); - q2.setProjectName("其它不良现象"); - q2.setCheckManName("马娥章"); - q2.setCheckTime("2024-08-06 15:05:00"); - dtos.add(q2); - QcInterface q3 = new QcInterface(); - q3.setProjectName("灌装量/净含量/喷药量"); - q3.setCheckManName("马娥章"); - q3.setCheckTime("2024-08-06 15:00:00"); - dtos.add(q3); - QcInterface q4 = new QcInterface(); - q4.setProjectName("是否符合签样及材料清单要求，堆板日期朝外"); - q4.setCheckManName("马娥章"); - q4.setCheckTime("2024-08-05 11:00:00"); - dtos.add(q4); -// QcInterface q5 = new QcInterface(); -// q5.setProjectName("其它不良现象"); -// q5.setCheckManName("马娥章"); -// q5.setCheckTime("2024-08-05 16:00:00"); -// dtos.add(q5); - /**质量看板测试结束**/ return dtos; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java index 96f0e9eb8..f19bffb16 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java @@ -113,7 +113,9 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService { } } - return tabledtos; + return tabledtos.stream() + .filter(obj -> obj.getBatchs() != 0) + .collect(Collectors.toList()); } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index 2a656afe1..129af20e9 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java @@ -352,8 +352,26 @@ public class BaseProduct extends BaseEntity { @Excel(name = "报工汇率") private BigDecimal reportRate; private String mvgr5Nm; + private String mvgr5; + private String palletNum; private String warehouseCycle; + public String getMvgr5() { + return mvgr5; + } + + public void setMvgr5(String mvgr5) { + this.mvgr5 = mvgr5; + } + + public String getPalletNum() { + return palletNum; + } + + public void setPalletNum(String palletNum) { + this.palletNum = palletNum; + } + public String getWarehouseCycle() { return warehouseCycle; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java index 1e4882764..cf47713e2 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProductAttached.java @@ -123,6 +123,15 @@ public class BaseProductAttached extends BaseEntity { @Excel(name = "其它") private String other; private String warehouseCycle; + private String palletNum; + + public String getPalletNum() { + return palletNum; + } + + public void setPalletNum(String palletNum) { + this.palletNum = palletNum; + } public String getWarehouseCycle() { return warehouseCycle; diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml index cdbd24949..540b1b0af 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml @@ -87,6 +87,7 @@ iei, man_standar, warehouse_cycle, + pallet_num, spray_way, blank_diameter, blank_no, @@ -108,6 +109,7 @@ #{iei}, #{manStandar}, #{warehouseCycle}, + #{palletNum}, #{sprayWay}, #{blankDiameter}, #{blankNo}, @@ -152,7 +154,8 @@ set iei = #{iei}, man_standar = #{manStandar}, - warehouse_cycle = #{warehouseCycle} + warehouse_cycle = #{warehouseCycle}, + pallet_num = #{palletNum} where id = #{id} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index bd8b298f1..6337fe2e5 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -66,7 +66,7 @@ - + @@ -168,7 +168,7 @@ bp.append_flag, bp.append_percent, bp.mtart, - bp.report_rate,bp.mvgr5_nm, + bp.report_rate,bp.mvgr5_nm,bp.mvgr5, bpa.id, bpa.category, bpa.pc, @@ -185,7 +185,7 @@ bpa.support_no, bpa.pvc, bpa.support_plate, - bpa.other,bpa.warehouse_cycle + bpa.other,bpa.warehouse_cycle,bpa.pallet_num palletNum from base_product bp left join base_product_attached bpa on bpa.product_code = right(bp.product_code,11) where product_id = #{productId} @@ -336,7 +336,7 @@ append_percent = #{appendPercent}, mtart = #{mtart}, mvgr5_nm = #{mvgr5Nm}, - + mvgr5 = #{mvgr5}, report_rate = #{reportRate}, where product_id = #{productId} From f78bc76dba5fc0963c9e099b9a7805db598f0dc8 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 7 Aug 2024 18:30:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A6=96=E6=A3=80bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op-open/src/main/resources/mapper/open/OpenMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index e6c5cedeb..afbe4d828 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -229,11 +229,11 @@ and check_type = #{checkType} From f52d9436819b56a68da35a603c76e525ee626c0d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 8 Aug 2024 13:59:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A6=96=E6=A3=80bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/plan/ProOrderWorkorderMapper.xml | 3 +- .../op/quality/controller/QuaController.java | 9 ++--- .../quality/domain/QcCheckReportIncome.java | 9 +++++ .../mapper/QcCheckReportIncomeMapper.java | 2 +- .../impl/QcCheckReportIncomeServiceImpl.java | 4 ++ .../impl/QcCheckReportProduceServiceImpl.java | 27 ++++++++++---- .../impl/QcCheckTaskIncomeServiceImpl.java | 1 + .../quality/QcCheckReportIncomeMapper.xml | 37 ++++++++++++------- .../quality/QcCheckTaskIncomeMapper.xml | 1 + 9 files changed, 64 insertions(+), 29 deletions(-) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index f18ce253c..72b80400f 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -685,7 +685,8 @@ pow.product_date productDateStr, pow.workorder_code_sap workorderCode, powb.batch_code batchCode, - powb.batch_quantity batchQuantity, + case when powbp.quantity is not null then powbp.quantity + else powb.batch_quantity end batchQuantity, bpa.pallet_num palletNum, concat(pow.workorder_code_sap,'-', powb.batch_code) palletCode, powbp.pallet_num palletNo diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index e44657e9c..f3a49d2d7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -214,18 +214,15 @@ public class QuaController extends BaseController { @PostMapping(value = "commitCheckResults") public AjaxResult commitCheckResults(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) { DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); - if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){ - return error("[List]不能为空"); - } +// if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){ +// return error("[List]不能为空"); +// } if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){ return error("[updateBy]不能为空"); } if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){ return error("[updateByName]不能为空"); } -// if(StringUtils.isBlank(qcCheckTaskIncome.getCheckResult())){ -// return error("[checkResult]不能为空"); -// } return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java index 9e3b6297c..fbaad8a7a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java @@ -187,6 +187,15 @@ public class QcCheckReportIncome extends BaseEntity { private Boolean myself; private String shiftId; private String orderType; + private String standardNo; + + public String getStandardNo() { + return standardNo; + } + + public void setStandardNo(String standardNo) { + this.standardNo = standardNo; + } public String getOrderType() { return orderType; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java index ce996f4fc..8f8612cb0 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java @@ -82,7 +82,7 @@ public interface QcCheckReportIncomeMapper { QcCheckReportIncome getLastXJTaskInfo(QcCheckReportIncome qcCheckReportIncome); - QcCheckTaskProduce getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); + List getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); List getBatchsByTaskId(String recordId); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java index 5d7999881..27e558019 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java @@ -208,6 +208,10 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi dto.setActualValue(dto.getRemark()); } + if(StringUtils.isNotBlank(dto.getActualValue()) && dto.getActualValue().equals("[\"/\"]")){ + dto.setStatus("未检验"); + } + //检验项目 String ruleName = dto.getRuleName(); if(StringUtils.isNotBlank(ruleName)){ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 0b70e8246..6dfb5cd86 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -221,13 +221,26 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId()); List checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable); produce.setCheckInfos(checkInfos); - QcCheckTaskProduce lastProduce = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); - if (lastProduce != null) { - produce.setProductType(lastProduce.getProductType()); - produce.setCheckManCode(lastProduce.getCheckManCode()); - produce.setCheckManName(lastProduce.getCheckManName()); - produce.setConfirmManCode(lastProduce.getConfirmManCode()); - produce.setConfirmManName(lastProduce.getConfirmManName()); + List lastProduces = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); + if (!CollectionUtils.isEmpty(lastProduces)) { + produce.setProductType(lastProduces.get(0).getProductType()); + String mancodes = lastProduces.stream() + .map(QcCheckTaskProduce::getCheckManCode) + .collect(Collectors.joining(", ")); + produce.setCheckManCode(mancodes); + String mannames = lastProduces.stream() + .map(QcCheckTaskProduce::getCheckManName) + .collect(Collectors.joining(", ")); + produce.setCheckManName(mannames); + String cmancodes = lastProduces.stream() + .map(QcCheckTaskProduce::getConfirmManCode) + .collect(Collectors.joining(", ")); + produce.setConfirmManCode(cmancodes); + String cmannames = lastProduces.stream() + .map(QcCheckTaskProduce::getConfirmManName) + .filter(confirmManName -> confirmManName != null) + .collect(Collectors.joining(", ")); + produce.setConfirmManName(cmannames); } return produce; } 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 d9b9951c4..17eba19cc 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 @@ -689,6 +689,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName()); qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); qcCheckTask.setReason(qcCheckTaskIncome.getReason()); + qcCheckTask.setAttr3(qcCheckTaskIncome.getAttr3()); /**qc_check_task**/ n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); logger.info("qc_check_task:"+n); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index 3c43be897..2738f0b18 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -39,6 +39,8 @@ + + @@ -90,8 +92,16 @@