优化

mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java

@@ -1001,8 +1001,8 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
         for (int i = 0; i < dataArr.size(); i++) {
             JSONObject json = dataArr.getJSONObject(i);
             JSONObject jsonPhyMst = phyMstTab.query("inspection_id = '"+json.getString("inspection_id")+"'").uniqueResult(0);
-            if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99")) {
-                throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成");
+            if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99") && StrUtil.equals(jsonPhyMst.getString("is_effective"), "`99`")) {
+                throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成且有效");
             }
 
             // 1.将wms物料id转换成本erp物料id

mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql

@@ -71,15 +71,13 @@
             where
                is_effective = '1'
                AND dr = '0'
-
                 OPTION 输入.ext_id <> ""
                         material_id = 输入.ext_id
                 ENDOPTION
-
                 OPTION 输入.pcsn <> ""
                         pcsn = 输入.pcsn
                 ENDOPTION
-
+                order by confirm_time desc
 			ENDSELECT
 		ENDQUERY
 	ENDIF
@@ -104,4 +102,4 @@
 
 			ENDSELECT
 		ENDQUERY
-	ENDIF
+	ENDIF