维护箱尺寸

src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyHeader.java

@@ -94,5 +94,7 @@ public class EcssCoDelNotifyHeader extends QueryPage {
     private Integer modifyCount;
 
     private String fscFlag;
+
+    private String boxSizeFlag;
 }
 

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java

@@ -2435,10 +2435,14 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     hsCodeDesc = "\n"+(data.getHsCodeDescType()!=null&& data.getHsCodeDescType().equals("N")
                             ?eorder.get("hsCodeDescEn") :eorder.get("hsCodeDesc"));
                 }
+                String boxSize = null;
+                if (notifyHeader.getBoxSizeFlag()!=null && notifyHeader.getBoxSizeFlag().equals("Y")) {
+                    boxSize = list.get(m).get("remark") != null ? list.get(m).get("remark").toString() : "";
+                }
                 eorder.put("artNo",  eorder.get("part_description")  + "\n" + "PO：" + eorder.get("po_no")
                         + (data.getHsCodeFlag()!=null && data.getHsCodeFlag()?"      HS Code：" + eorder.get("hsCode"):"")+ hsCodeDesc + lossratio
                         + (data.getUpc()!=null && data.getUpc()?"\n" + "UPC:"+ eorder.get("upc"):"")
-                        + (data.getSo()!=null && data.getSo()?"\n" + "SO:"+eorder.get("so"):""));
+                        + (data.getSo()!=null && data.getSo()?"\n" + "SO:"+eorder.get("so"):"")+(boxSize!=null?"     "+boxSize:""));
                 exportList.add(eorder);
             }
             // 如果当前箱子对应多个物料（合箱），添加合并单元格区域

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -1835,6 +1835,7 @@ public class CoDelServiceImpl implements CoDelService {
                 updateParams.put("grossWeight", box.get("grossWeight"));
                 updateParams.put("netWeight", box.get("netWeight"));
                 updateParams.put("rolls", box.get("rolls"));
+                updateParams.put("remark", box.get("remark"));
                 updateParams.put("updateBy", updateBy);
 
                 coDelMapper.updateBoxInfo(updateParams);

src/main/resources/mapper/ecss/CoDelMapper.xml

@@ -4,7 +4,7 @@
    <select id="searchEcssCoDelNotifyHeader"   resultType="EcssCoDelNotifyHeaderData">
         select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
         a.notify_status,a.remark,a.createDate,a.createBy,a.cmc_invoice,a.updateDate,a.updateBy,dbo.get_bu_desc(a.site,a.bu_no) as buDesc,
-        a.modifyFlag,a.modify_count as modifyCount,a.overseasShipper,a.overseasAddress,a.cnative,a.localShipAddress,a.walMartOrderFlag,a.fscFlag
+        a.modifyFlag,a.modify_count as modifyCount,a.overseasShipper,a.overseasAddress,a.cnative,a.localShipAddress,a.walMartOrderFlag,a.fscFlag,a.boxSizeFlag
        from ecss_CoDelNotifyHeader a
            left join accessBu D on A.site=D.site and A.bu_no=d.bu_no and D.username=#{query.username}
      <where>
@@ -24,6 +24,9 @@
              <if test="query.fscFlag == 'true'">
                 AND a.fscFlag = 'Y'
             </if>
+             <if test="query.boxSizeFlag == 'true'">
+                 AND a.boxSizeFlag = 'Y'
+             </if>
              <if test="query.walMartOrderFlag == 'true'">
                  AND a.walMartOrderFlag = 'Y'
              </if>
@@ -43,7 +46,7 @@
    <select id="searchEcssCoDelNotifyHeaderForCK"   resultType="EcssCoDelNotifyHeaderData">
         select a.site,a.bu_no,a.delNo,a.erp_delNo,a.ready_date,a.notifyDate,a.customer_name,a.Destination,a.shipping_mode,a.erp_flag,
         a.notify_status,a.remark,a.createDate,a.createBy,a.cmc_invoice,a.updateDate,a.updateBy,dbo.get_bu_desc(a.site,a.bu_no) as buDesc,a.walMartOrderFlag,
-       a.modifyFlag,a.modify_count as modifyCount,ISNULL(a.export_flag,'N') as exportFlag,a.fscFlag
+       a.modifyFlag,a.modify_count as modifyCount,ISNULL(a.export_flag,'N') as exportFlag,a.fscFlag,a.boxSizeFlag
        from ecss_CoDelNotifyHeader a
            left join accessBu D on A.site=D.site and A.bu_no=d.bu_no and D.username=#{query.username}
 
@@ -252,7 +255,8 @@
     </update>
 
     <update id="changeEcssDelStatus">
-        update ecss_CoDelNotifyHeader set notify_status=#{notifyStatus},walMartOrderFlag=#{walMartOrderFlag},fscFlag=#{fscFlag} where site=#{site} and delNo=#{delNo}
+        update ecss_CoDelNotifyHeader set notify_status=#{notifyStatus},walMartOrderFlag=#{walMartOrderFlag},
+                                          fscFlag=#{fscFlag},boxSizeFlag=#{boxSizeFlag} where site=#{site} and delNo=#{delNo}
     </update>
 
     <update id="updateEcssDelDetailStatus">
@@ -1285,7 +1289,8 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
         set box_qty = #{box_qty},
             gross_weight = #{grossWeight},
             net_weight = #{netWeight},
-            rolls = #{rolls}
+            rolls = #{rolls},
+            remark = #{remark}
         where site = #{site}
           and bu_no = #{buNo}
           and delNo = #{delNo}