代码更新

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java

@@ -187,7 +187,7 @@ public class InbillServiceImpl {
                 JSONObject paramMesMst = new JSONObject();
                 paramMesMst.put("PackageBoxSN",box_row.getString("box_no"));
                 paramMesMst.put("User",box_row.getString("confirm_optname"));
-                new LmsToMesServiceImpl().childRollFGInboundComplete(paramMesMst);
+                // new LmsToMesServiceImpl().childRollFGInboundComplete(paramMesMst);
             }
         }
         //回传SAP

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHANGE.wql

@@ -101,15 +101,32 @@
 
 	 IF 输入.flag = "2"
         QUERY
-            SELECT
-                dtl.*,
-                mb.material_code,
-                mb.material_name
+            SELECT DISTINCT
+            	dtl.mfg_order_name AS new_sale_order_name,
+            	dtl.customer_name AS new_customer_name,
+            	dtl.customer_description AS new_customer_description,
+            	dtl.package_box_sn AS storagevehicle_code,
+            	sa.sect_name AS turnout_sect_name,
+            	sa.struct_code AS turnout_struct_code,
+            	mb.material_code,
+            	mb.material_name,
+            	dtl.seq_no,
+            	sub.sale_order_name,
+            	sub.customer_name,
+            	sub.customer_description,
+            	sub.net_weight AS qty,
+            	dtl.demand_date,
+            	dtl.UpdatedDateOfProduction AS date_of_FG_inbound,
+            	dtl.isRePrintPackageBoxLabel,
+            	dtl.isUnPackBox,
+            	dtl.pcsn
             FROM
-                st_ivt_structivtchangedtl dtl
-            LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
+            	st_ivt_structivtchangedtl dtl
+            	LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
+            	LEFT JOIN st_ivt_structattr sa ON sa.storagevehicle_code = dtl.package_box_sn
+            	LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = dtl.package_box_sn AND sub.container_name = dtl.pcsn
             WHERE
-                1 = 1
+            	1 = 1
             OPTION 输入.changeinv_id <> ""
                   dtl.changeinv_id = 输入.changeinv_id
             ENDOPTION