代码更新

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql

@@ -114,7 +114,8 @@ IF 输入.flag = "3"
                     ivt.workprocedure_id,
                     ivt.producetask_id,
                     material.stewing_time,
-                    ruledis.out_seq_no
+                    ruledis.out_seq_no,
+                    ivt.instorage_time
                   FROM
                     st_ivt_structivt ivt
                     left join md_me_material material on material.material_id = ivt.material_id
@@ -142,7 +143,7 @@ IF 输入.flag = "3"
                  OPTION 输入.is_full <> ""
                      ivt.is_full = 输入.is_full
                  ENDOPTION
-                 order by material.stewing_time desc,ruledis.out_seq_no
+                 order by ivt.instorage_time, material.stewing_time desc,ruledis.out_seq_no
         ENDSELECT
     ENDQUERY
 ENDIF

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql

@@ -102,9 +102,9 @@
                      1=1
            		 OPTION 输入.vehicle_code <> ""
                               kiln.vehicle_code = 输入.vehicle_code
-                        ENDOPTION
+                 ENDOPTION
+                   ORDER BY in_time desc
         		ENDSELECT
-        		ORDER BY in_time desc
         	ENDQUERY
         ENDIF
   IF 输入.flag = "4"