From 4178683094e8ac6f3fba67fd073ec5aba5ce8ed1 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Thu, 23 Apr 2026 20:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/pojo/entity/YieldOrder.java | 6 + .../pojo/dto/view/MesRbPacturnrecord.java | 1 + .../erpdata/pojo/dto/view/MesRbPk.java | 1 + .../erpdata/pojo/dto/view/MesRbPurtoso.java | 1 + .../erpdata/pojo/dto/view/MesRbSjso.java | 1 + .../pojo/dto/view/MesRbSodelrecwx.java | 1 + .../pojo/dto/view/MesRbSodelreczg.java | 1 + .../pojo/dto/view/MesRbWxpromotion.java | 1 + .../desk/order/mapper/MoldDemandMapper.xml | 2 +- .../service/impl/YieldOrderServiceImpl.java | 65 +++++++--- .../mapper/ErpMesRbPacturnrecordMapper.xml | 3 +- .../erpdata/mapper/ErpMesRbPkMapper.xml | 3 +- .../erpdata/mapper/ErpMesRbPurtosoMapper.xml | 2 +- .../erpdata/mapper/ErpMesRbSjsoMapper.xml | 3 +- .../mapper/ErpMesRbSodelrecwxMapper.xml | 3 +- .../mapper/ErpMesRbSodelreczgMapper.xml | 3 +- .../mapper/ErpMesRbWxpromotionMapper.xml | 3 +- .../service/impl/ErpMesRbWoServiceImpl.java | 122 ++++++++++-------- 18 files changed, 137 insertions(+), 85 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index 88dffb08..1eaa1d2a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -469,6 +469,12 @@ public class YieldOrder extends BaseEntity { @TableField(value = "craft_id") private Long craftId; + /** + * 计划部门 + */ + @TableField(value = "plan_deptcode") + private String planDeptCode; + @JsonSerialize(nullsUsing = NullSerializer.class) private Double plateThickness1; diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java index 69c3d74a..3f7bae12 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPacturnrecord.java @@ -55,4 +55,5 @@ public class MesRbPacturnrecord { private String warctlr; private String usedeptcode; private String conductor; + private String plndeptcode; //计划部门 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java index 811064dd..66530487 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPk.java @@ -55,4 +55,5 @@ public class MesRbPk { private String prtudeptcode; private String newlevname; private Date newlevdate; + private String plndeptcode; //计划部门 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java index 9e3679a8..00ee13db 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbPurtoso.java @@ -48,4 +48,5 @@ public class MesRbPurtoso { private String prtudeptcode; private String newlevname; private Date newlevdate; + private String plndeptcode; //计划部门 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java index 1aebe479..4dd0bc55 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSjso.java @@ -48,4 +48,5 @@ public class MesRbSjso { private String prtudeptcode; private String newlevname; private Date newlevdate; + private String plndeptcode; //计划部门 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java index c1fb7335..be8a7e20 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelrecwx.java @@ -56,4 +56,5 @@ public class MesRbSodelrecwx { private String prtudeptcode; private String newlevname; private Date newlevdate; + private String plndeptcode; //计划部门 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java index 5de956d4..48c00cfa 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbSodelreczg.java @@ -56,4 +56,5 @@ public class MesRbSodelreczg { private String prtudeptcode; private String newlevname; private Date newlevdate; + private String plndeptcode; //计划部门 } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java index 07a2ae0e..ec0d3922 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/pojo/dto/view/MesRbWxpromotion.java @@ -56,4 +56,5 @@ public class MesRbWxpromotion { private String prtudeptcode; private String newlevname; private Date newlevdate; + private String plndeptcode; //计划部门 } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml index bd6955f0..eeced584 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml @@ -115,7 +115,7 @@ AND a.TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%')) - + AND a.MAF_STATUS = #{entity.mafStatus} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index f7e2ed92..d02b676c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -342,19 +342,39 @@ public class YieldOrderServiceImpl extends BaseServiceImpl emptyFields = new ArrayList<>(); + if (StringUtils.isEmpty(yieldOrder.getBatchNo())) emptyFields.add("批次号"); + if (StringUtils.isEmpty(yieldOrder.getProductIdent())) emptyFields.add("生产标识"); + if (StringUtils.isEmpty(yieldOrder.getUseDept())) emptyFields.add("使用部门"); + if (Objects.isNull(yieldOrder.getYpQty()) || yieldOrder.getYpQty() == 0.0) emptyFields.add("数量"); + if (StringUtils.isEmpty(yieldOrder.getPlanUser())) emptyFields.add("计划员"); + if (Objects.isNull(yieldOrder.getReleaseDate())) emptyFields.add("计划下达时间"); + if (Objects.isNull(yieldOrder.getDemandDate())) emptyFields.add("需求交期"); + if (StringUtils.isEmpty(yieldOrder.getUseDeptCode())) emptyFields.add("使用部门代码"); + if (!emptyFields.isEmpty()) { + String errorMsg = "以下字段不能为空：" + String.join("、", emptyFields); + yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode()); + yieldOrder.setValidationTime(DateUtil.now()); + yieldOrder.setValidationMomo(errorMsg); + this.updateById(yieldOrder); + return false; } + //在工艺校验中处理 +// // 2. 当生产订单类型为：表处理，壳体，插针订单，当镀种为空或面积为0时，不得自动分派并提示 +// if (YieldOrderEnum.YIELD_TYPE_1.equals(yieldOrder.getYieldType()) +// || YieldOrderEnum.YIELD_TYPE_4.equals(yieldOrder.getYieldType()) +// || YieldOrderEnum.YIELD_TYPE_5.equals(yieldOrder.getYieldType())) { +// if (StringUtils.isBlank(yieldOrder.getPlate()) || yieldOrder.getYpArea() == 0) { +// yieldOrder.setValidationResult(YieldOrderEnum.VALIDATION_RESULT_LESS_DATA.getCode()); +// yieldOrder.setValidationTime(DateUtil.now()); +// yieldOrder.setValidationMomo("生产订单中镀种或面积为空，请维护基础数据"); +// this.updateById(yieldOrder); +// return false; +// } +// } + // 3. 玻璃饼订单工艺路线包含外购不再自动分派，直接关闭订单 if (YieldOrderEnum.YIELD_TYPE_3.equals(yieldOrder.getYieldType()) && yieldOrder.getPrimaryCraft().contains(YieldOrderConst.PRIMARY_CRAFT_WG)) { @@ -426,21 +446,26 @@ public class YieldOrderServiceImpl extends BaseServiceImpl diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml index c49191de..a2eaf20d 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml @@ -36,7 +36,8 @@ a.newlevflag, a.prtudeptcode, a.newlevname, - a.newlevdate + a.newlevdate, + a.plndeptcode FROM dba_mgr.v_mes_rb_pk a diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml index db434488..8ba0d03f 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml @@ -21,7 +21,7 @@