From bc8cc7402143952182839241ccb28499b6eb6903 Mon Sep 17 00:00:00 2001
From: jason <backo@163.com>
Date: Thu, 27 Feb 2025 17:30:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=8F=91=E8=BF=90=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=8F=8A=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E5=8D=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesShippingOrderManagementDetailService.java        | 12 +++++++++++-
 .../pojo/model/MesShippingOrderManagementDetailModel.java    |  9 +++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
index 76e6c65..febf086 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementDetailService.java
@@ -210,7 +210,18 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
         List<MesJisShipping> mesJisShippings = new ArrayList<>();
 
         for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : detailList) {
+            if (StringUtils.isEmpty(mesShippingOrderManagementDetail.getPartNo())) {
+                MesException.throwMesBusiException("零件号不能为空！");
+            }
             MesShippingOrderManagement mesShippingOrderManagement = orderMap.get(mesShippingOrderManagementDetail.getPid());
+            MesPartShippingGroup mesPartShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(organizeCode, mesShippingOrderManagement.getShippingGroupCode());
+            if (mesPartShippingGroup != null) {
+                if (Objects.equals(mesPartShippingGroup.getConfirmPartType(), String.valueOf(MesExtEnumUtil.SHIPPING_GROUP_CONFIRM_PART_TYPE.SHIPPING_GROUP_CONFIRM_PART_TYPE_30.getValue()))) {
+                    if (StringUtils.isEmpty(mesShippingOrderManagementDetail.getBarcode())) {
+                        MesException.throwMesBusiException("条码不能为空！");
+                    }
+                }
+            }
 
             final String detailBarCode = mesShippingOrderManagementDetail.getBarcode();
             if (!StringUtils.isEmpty(detailBarCode)) {
@@ -227,7 +238,6 @@ public class MesShippingOrderManagementDetailService extends BaseMesService<MesS
                     log.info("计划数量和实际数量不相等");
                     return ResultBean.fail(String.format("计划数量和实际数量不相等"));
                 }
-                MesPartShippingGroup mesPartShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(organizeCode, mesShippingOrderManagement.getShippingGroupCode());
                 mesJisShippings.add(getMesJisShippings(mesShippingOrderManagement, mesShippingOrderManagementDetail, userName, mesPartShippingGroup));
             }
 
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesShippingOrderManagementDetailModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesShippingOrderManagementDetailModel.java
index 1da5af2..ac5bccd 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesShippingOrderManagementDetailModel.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesShippingOrderManagementDetailModel.java
@@ -8,6 +8,8 @@ import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
+
 @Data
 public class MesShippingOrderManagementDetailModel {
 
@@ -134,6 +136,12 @@ public class MesShippingOrderManagementDetailModel {
     @AnnoOutputColumn(refClass = MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.class, refForeignKey = "value", value = "description")
     private Integer detailsStatus;
 
+    /**
+     * vin号
+     */
+    @ApiParam("vin号")
+    private String vin;
+
     public MesShippingOrderManagementDetailModel(){
     }
 
@@ -169,6 +177,7 @@ public class MesShippingOrderManagementDetailModel {
         this.shippingGroupName = m.getShippingGroupName();
         this.carSerialCode = d.getCarSerialCode();
         this.id = d.getId();
+        this.vin = d.getVin();
     }
 
 }

From 255cb7db32a21f0b3b7c47d812ab0c3f1a3e21c1 Mon Sep 17 00:00:00 2001
From: jason <backo@163.com>
Date: Tue, 11 Mar 2025 14:54:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug=EF=BC=9A45549?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BF=87=E8=B4=A6=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E8=B5=B7=E5=A7=8B-=E8=BF=87=E8=B4=A6=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E7=9A=84=20=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesWorkOrderLogService.java           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java
index a80ec8b..c46e4a1 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderLogService.java
@@ -90,6 +90,13 @@ public class MesWorkOrderLogService extends BaseMesService<MesWorkOrderLog> impl
             sql += " and wol.modify_date_time <:endTime ";
         }
 
+        if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateStart())) {
+            sql += " and wol.description >=:postingStartTime ";
+        }
+        if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateEnd())) {
+            sql += " and wol.description <:postingEndTime ";
+        }
+
         if (!StringUtil.isEmpty(mesWorkOrderLog.getWorkOrderNo())) {
             sql += " and wol.work_order_no ='" + mesWorkOrderLog.getWorkOrderNo() + "' ";
         }
@@ -115,6 +122,13 @@ public class MesWorkOrderLogService extends BaseMesService<MesWorkOrderLog> impl
             queryObject.setParameter("endTime", endTime);
         }
 
+        if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateStart())) {
+            queryObject.setParameter("postingStartTime", mesWorkOrderLog.getActualPostingDateStart());
+        }
+        if (!StringUtil.isEmpty(mesWorkOrderLog.getActualPostingDateEnd())) {
+            queryObject.setParameter("postingEndTime", mesWorkOrderLog.getActualPostingDateEnd());
+        }
+
          queryObject.unwrap(SQLQuery.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
 
         List<HashMap<String, Object>> hashMaps = queryObject.getResultList();