Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev

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));
             }
 

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();

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();
     }
 
 }