Merge branch 'feature/bug-935' into develop

# Conflicts:
#	nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
#	nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageDeliverOrderSearchQO.java

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java

@@ -339,10 +339,6 @@ public class StructuralPackageOrderController extends BaseController {
             }
             return ivo;
         }).toList());
-//        SAPMaterialInfoInOrderDTO dto = sapService.zim004(orderVO.getExternalOrderNo(), orderVO.getSupplierCode(), orderVO.getPackageNo()).get(0);
-//        if (Objects.nonNull(dto)) {
-//            vo.setMaxNum(dto.getTransportNum());
-//        }
         return ApiResult.success(vo);
     }
 
@@ -650,6 +646,7 @@ public class StructuralPackageOrderController extends BaseController {
         WmsStructuralPackageDeliverOrder deliverOrder = new WmsStructuralPackageDeliverOrder()
                 .setNo(deliverOrderNo)
                 .setSupplierId(supplierId)
+                .setQuehuo(trays.stream().anyMatch(DeliverStructuralPackageOrderVO::getQuehuo))
                 .setCreateBy(UserUtil.getUserName())
                 .setCreateTime(LocalDateTime.now());
         structuralPackageDeliverOrderService.save(deliverOrder);
@@ -1097,4 +1094,21 @@ public class StructuralPackageOrderController extends BaseController {
             return ApiResult.success(list);
         }
     }
+
+    /**
+     * 添加备注
+     * @param request 请求参数
+     */
+    @PostMapping("itemRemark")
+    public ApiResult<Void> itemRemark(@Valid @RequestBody List<StructuralPackageOrderItemRemarkQO> request) {
+        deliverStructuralPackageOrderTrayItemService.updateBatchById(
+                request.stream()
+                        .map(it -> new WmsStructuralPackageOrderTrayItem()
+                                .setId(it.getId())
+                                .setRemark(it.getRemark())
+                        )
+                        .toList()
+        );
+        return ApiResult.success();
+    }
 }

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

@@ -21,7 +21,12 @@ public class StructuralPackageDeliverOrderSearchQO extends SearchBaseQO{
     private String supplierNo;
 
     /**
-     * 状态，0：待收货；1：收货中；2：已收货
+     * 状态，0：待收货；1：已收货；2-已完结；
      */
     private Short state;
+
+    /**
+     * 是否存在缺货零件
+     */
+    private Boolean quehuo;
 }

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

@@ -0,0 +1,21 @@
+package com.nflg.wms.common.pojo.qo;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class StructuralPackageOrderItemRemarkQO {
+
+    /**
+     * 托盘项ID
+     */
+    @NotNull
+    private Long id;
+
+    /**
+     * 备注
+     */
+    @NotBlank
+    private String remark;
+}

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

@@ -17,7 +17,7 @@ public class StructuralPackageDeliverOrderVO {
     private String no;
 
     /**
-     * 状态，0：待收货；1：已收货；2-已完结；
+     * 状态，0：待收货；1：收货中；2：已收货
      */
     private Short state;
 

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

@@ -98,4 +98,9 @@ public class TrayItemVO {
      * 线下收货时间
      */
     private LocalDateTime offlineReceiveTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageDeliverOrder.java

@@ -65,4 +65,9 @@ public class WmsStructuralPackageDeliverOrder implements Serializable {
      * 供应商id
      */
     private Long supplierId;
+
+    /**
+     * 是否存在缺货零件
+     */
+    private Boolean quehuo;
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrderTrayItem.java

@@ -106,4 +106,9 @@ public class WmsStructuralPackageOrderTrayItem implements Serializable {
      * 线下收货时间
      */
     private LocalDateTime offlineReceiveTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml

@@ -3,12 +3,7 @@
 <mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapper">
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO">
-        select pdo.*, us.supplier_code, us.supplier_name,di."name" AS "factory_no",EXISTS(
-            SELECT 1
-            FROM wms_structural_package_deliver_order_map pdom
-            INNER JOIN wms_structural_package_order spo on pdom.order_id=spo.id
-            WHERE spo.quehuo AND pdom.deliver_id=pdo.id
-        ) AS quehuo
+        select pdo.*, us.supplier_code, us.supplier_name,di."name" AS "factory_no",pdo.quehuo
         from wms_structural_package_deliver_order pdo
         inner join user_supplier us on pdo.supplier_id=us.id
         LEFT JOIN dictionary_item di ON pdo.factory_id=di."id"
@@ -30,6 +25,12 @@
             <if test="request.supplierNo!=null and request.supplierNo!=''">
                 and us.supplier_code=#{request.supplierNo}
             </if>
+            <if test="request.state!=null">
+                and pdo.state = #{request.state}
+            </if>
+            <if test="request.quehuo!=null">
+                and pdo.quehuo = #{request.quehuo}
+            </if>
             <if test="request.no!=null and request.no!=''">
                 and pdo.no ilike concat('%',#{request.no},'%')
             </if>

nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml

@@ -45,6 +45,7 @@
         SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",ot.order_id,o.*,m.no||wb."no" AS "workbench_code"
         ,us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no",sp."no" AS "package_no"
         ,sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state,ot.id as "tray_id"
+        ,o.quehuo
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
         LEFT JOIN user_supplier us ON o.supplier_id=us.id