From 42e1dd81505a6942b0b79f3dd3bea77ec7d1b75f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 6 Aug 2024 21:55:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9C=8B=E6=9D=BF=E5=92=8C?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=81=E6=A0=87=E8=AF=86=E5=8D=A1=E6=89=93?= =?UTF-8?q?=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}