Merge branch 'qms/yf' into qms/develop

# Conflicts:
#	nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Department.java

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java

@@ -221,7 +221,6 @@ public class IncomingInspectionTaskControllerService {
                     .setCalculatedAqlType(aqlType.getLeft())
                     .setUsedAqlType(aqlType.getLeft())
                     .setTriggerCategory(aqlType.getRight())
-                    .setTriggerTime(LocalDateTime.now())
             );
         }
 
@@ -342,7 +341,6 @@ public class IncomingInspectionTaskControllerService {
                     .setCalculatedAqlType(aqlType.getLeft())
                     .setUsedAqlType(aqlType.getLeft())
                     .setTriggerCategory(aqlType.getRight())
-                    .setTriggerTime(LocalDateTime.now())
             );
         }
 
@@ -991,8 +989,8 @@ public class IncomingInspectionTaskControllerService {
 
         updateWrapper.update();
 
-        if (task.getInspectionResult()) {
+        if (request.getQualified()) {
-            wmsIncomingInspectionTaskCallbackService.process(task.getId());
+            wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0);
         } else {
             issueTicketControllerService.initiate(task.getId());
         }

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsApiService.java

@@ -46,7 +46,6 @@ public class WmsApiService {
 
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
-        headers.add("Authorization", StpUtil.getTokenValue());
         HttpEntity<T> requestEntity = new HttpEntity<>(body, headers);
 
         log.info("{}，URL: {}，数据: {}", bizDesc, fullUrl, JSONUtil.toJsonStr(body));

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DepartmentAddQO.java

@@ -28,4 +28,16 @@ public class DepartmentAddQO {
      * 是否启用
      */
     private Boolean enable;
+
+    /**
+     * 部门负责人id
+     */
+    @NotNull
+    private Long headUserId;
+
+    /**
+     * 部门负责人姓名
+     */
+    @NotBlank
+    private String headUserName;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DepartmentVO.java

@@ -1,5 +1,7 @@
 package com.nflg.wms.common.pojo.vo;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -46,6 +48,16 @@ public class DepartmentVO {
      */
     private Boolean enable;
 
+    /**
+     * 部门负责人id
+     */
+    private Long headUserId;
+
+    /**
+     * 部门负责人姓名
+     */
+    private String headUserName;
+
     /**
      * 创建人
      */

nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java

@@ -770,10 +770,15 @@ public class MaterialCodeController extends BaseController {
                 .toList();
         VUtil.trueThrowBusinessError(materialIds.isEmpty()).throwMessage("物料ID不能为空");
 
-        // 根据前端传入的物料ID查询对应的物料编号再查询物料主数据
+        List<WmsShipmentMaterialCodeItem> materialCodeItems;
-        List<WmsShipmentMaterialCodeItem> materialCodeItems = materialCodeItemService.lambdaQuery()
+        if (CollectionUtil.isNotEmpty(materialIds)) {
-                .in(WmsShipmentMaterialCodeItem::getId, materialIds)
+            materialCodeItems = materialCodeItemService.lambdaQuery()
-                .list();
+                    .in(WmsShipmentMaterialCodeItem::getId, materialIds)
+                    .list();
+        } else {
+            materialCodeItems = new ArrayList<>();
+        }
+        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(materialCodeItems)).throwMessage("未查询到物料信息");
 
         List<String> materialNos = materialCodeItems.stream()
                 .map(WmsShipmentMaterialCodeItem::getMaterialNo)