feat: bug-962 普通物料送货单和钢构件送货单添加状态字段

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

@@ -1,5 +1,6 @@
 package com.nflg.wms.common.pojo.qo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
@@ -26,4 +27,10 @@ public class SRMOrderSearchQO extends SearchBaseQO {
      */
     private String itemCode;
 
+    /**
+     * 是否已完结
+     */
+    @JsonProperty("isCompleted")
+    private Boolean isCompleted;
+
 }

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

@@ -19,4 +19,9 @@ public class StructuralPackageDeliverOrderSearchQO extends SearchBaseQO{
      * 供应商编号
      */
     private String supplierNo;
+
+    /**
+     * 状态，0：待收货；1：收货中；2：已收货
+     */
+    private Short state;
 }

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

@@ -6,8 +6,8 @@
         from wms_srm_order a
         left join user_supplier b on a.supplier_num=b.supplier_code
         <where>
-            <if test="request.noteNum !=null and request.noteNum !='' ">
+            <if test="request.isCompleted!=null">
-                and a.note_num ilike concat('%', #{request.noteNum}, '%')
+                a.is_completed = #{request.isCompleted}
             </if>
             <if test="request.supplierNum !=null and request.supplierNum !='' ">
                 and a.supplier_num =#{request.supplierNum}
@@ -26,6 +26,9 @@
             <if test="request.endDate !=null">
                 and a.create_time &lt; #{request.endDate}
             </if>
+            <if test="request.noteNum !=null and request.noteNum !='' ">
+                and a.note_num ilike concat('%', #{request.noteNum}, '%')
+            </if>
         </where>
         order by a.id desc
     </select>

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

@@ -24,6 +24,9 @@
                     </foreach>
                 </if>
             </if>
+            <if test="request.state!=null">
+                and pdo.state=#{request.state}
+            </if>
             <if test="request.supplierNo!=null and request.supplierNo!=''">
                 and us.supplier_code=#{request.supplierNo}
             </if>