问题修改

src/main/java/com/tld/controller/ReceiveGoodsController.java

@@ -22,7 +22,6 @@ public class ReceiveGoodsController {
 
     /**
      * 查询采购单1
-     * @param receiveGoods 参数
      * @return 返回结果
      */
     @GetMapping("getReceiveGoods")

src/main/java/com/tld/model/AskGoods.java

@@ -47,6 +47,10 @@ public class AskGoods implements Serializable {
      * wbs
      */
     private String wbs;
+    /**
+     * wbs编号
+     */
+    private String wbsCode;
     /**
      * 计量单位
      */

src/main/java/com/tld/model/Notice.java

@@ -56,6 +56,10 @@ public class Notice implements Serializable {
      * wbs
      */
     private String wbs;
+    /**
+     * wbs编号
+     */
+    private String wbsCode;
     /**
      * 计量单位
      */

src/main/java/com/tld/model/ReceiveGoods.java

@@ -87,6 +87,10 @@ public class ReceiveGoods implements Serializable {
      * wbs
      */
     private String wbs;
+    /**
+     * wbs编号
+     */
+    private String wbsCode;
     /**
      * 订单类型
      */

src/main/resources/mapper/AskGoodsMapper.xml

@@ -88,11 +88,14 @@
                a.production_code,
                a.wbs,
                a.entry_number,
-               e.wllb_class
+               e.wllb_class,
+               a.wbs,
+               f.code as wbsCode
         FROM tld_ask_goods a
         JOIN tld_ask_goods_f b ON a.ask_goods_id = b.ask_goods_id
         LEFT JOIN tld_department c ON b.department = c.code
         JOIN tld_material e ON a.material_id = e.tld_id
+        LEFT JOIN tld_wbs f ON a.wbs = f.tld_id
         WHERE (a.num + 0) <![CDATA[>]]> (
             IFNULL(a.out_num, 0) + 0)
           and e.part_type != '半成品' and e.part_type != '产成品'
@@ -697,6 +700,7 @@
             e.name as department,
             a.type,
             a.wbs,
+            f.code as wbsCode,
             a.entry_number,
             g.name as companyName,
             c.source_type,
@@ -709,6 +713,7 @@
             join tld_ask_goods_f c on a.ask_goods_id = c.ask_goods_id
             left join tld_department e on c.department = e.code
             left join tld_company g on c.company_number = g.code
+            left join tld_wbs f on a.wbs = f.tld_id
         WHERE
         (a.num + 0) <![CDATA[>]]> (a.out_num + 0) and
           b.part_type = #{partType}
@@ -948,6 +953,9 @@
             <if test="endTime != null and endTime != ''">
                 and a.scrq <![CDATA[<=]]> #{endTime}
             </if>
+            <if test="num != null and num != ''">
+                and a.num = #{num}
+            </if>
         </trim>
         order by a.scrq desc
     </select>

src/main/resources/mapper/DeliveryMapper.xml

@@ -17,7 +17,7 @@
     <if test="projectName == ' '.toString()">
         AND b.project_name is null
     </if>
-    <if test="projectName != ' '.toString() and projectName != null">
+    <if test="projectName != '' and projectName != null">
         AND b.project_name = #{projectName}
     </if>
     <if test="code != '' and code != null">

src/main/resources/mapper/InviteMapper.xml

@@ -73,12 +73,15 @@
             c.code,
             c.id AS departmentId,
             a.wbs,
-            a.entry_number
+            a.entry_number,
+            a.wbs,
+            f.code as wbsCode
         FROM
             tld_invite a
             JOIN tld_invite_f b ON a.ask_goods_id = b.ask_goods_id
             LEFT JOIN tld_department c ON b.department = c.code
             JOIN tld_material e ON a.material_id = e.tld_id
+            LEFT JOIN tld_wbs f ON a.wbs = f.tld_id
         WHERE
             ( a.num + 0 ) <![CDATA[>]]> (IFNULL( a.out_num, 0 ) + 0) and e.part_type != '半成品' and e.part_type != '产成品'
             and a.ask_goods_id = #{askGoodsId} and e.code in (select material_id from tld_user_material where user_id = #{userId})

src/main/resources/mapper/QueryListMappeer.xml

@@ -605,6 +605,9 @@
             <if test="status != null and status != ''">
                 and a.status like CONCAT(CONCAT('%', #{status}), '%')
             </if>
+            <if test="gsDeliveryNum != null and gsDeliveryNum != ''">
+                and a.gs_delivery_num = #{gsDeliveryNum}
+            </if>
         </trim>
         order by a.id desc
     </select>

src/main/resources/mapper/ReceiveGoodsMapper.xml

@@ -394,6 +394,7 @@
             a.arrival_time,
             b.code as wllbCode,
             a.wbs,
+            j.code as wbsCode,
             e.company_number as companyNumber,
             e.supplier_id as supplierId,
             p.name as compName
@@ -402,6 +403,7 @@
         left join tld_customer c on a.supplier_id = c.code
         left join tld_receive_goods_f e on a.order_code = e.order_code
         left join tld_company p on e.company_number = p.code
+        left join tld_wbs j on a.wbs = j.tld_id
         where (warehousing_num + 0) <![CDATA[<]]> (qualified_num + 0)
         <if test="materialId != null and materialId != ''">
             and a.material_id like CONCAT(CONCAT('%',#{materialId},'%'))

src/main/resources/mapper/WarehousingMapper.xml

@@ -430,6 +430,7 @@
             a.production_code,
             a.material_id,
             a.wbs,
+            f.code as wbsCode,
             a.measurement_id,
             a.num,
             a.type,
@@ -447,6 +448,7 @@
         join tld_notice_f b on a.notice_id = b.notice_id
         join tld_material c on a.material_id = c.tld_id
         join tld_company e on b.company_number = e.code
+        left join tld_wbs f on a.wbs = f.tld_id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="userId != null and userId != ''">
                 and c.code in (select material_id from tld_user_material where user_id = #{userId})