优化

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

@@ -867,11 +867,24 @@ public class InspectionsheetmstServiceImpl implements InspectionsheetmstService
          */
         JSONArray IvtArr = new JSONArray();
         if (StrUtil.equals(jsonDtl.getString("result"), "01") || StrUtil.equals(jsonDtl.getString("result"), "03")) {
-            IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "' and quality_scode <> '01'").getResultJSONArray(0);
+            IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "'").getResultJSONArray(0);
         } else if (StrUtil.equals(jsonDtl.getString("result"), "02")) {
-            IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "' and quality_scode <> '02'").getResultJSONArray(0);
+            IvtArr = ivtTab.query("material_id = '" + jsonDtl.getString("material_id") + "' and pcsn = '" + jsonDtl.getString("pcsn") + "'").getResultJSONArray(0);
         }
-        if (!ObjectUtil.isEmpty(IvtArr)) {
+        if (ObjectUtil.isNotEmpty(IvtArr)) {
+            //判断当前库存是否有冻结数或者待入数
+            JSONObject ivt_now = WQL.getWO("QL_TEST_INSPECTIONSHEET002")
+                    .addParam("flag", "5")
+                    .addParam("material_id", jsonDtl.getString("material_id"))
+                    .addParam("pcsn", jsonDtl.getString("pcsn"))
+                    .process().uniqueResult(0);
+            if(ivt_now != null){
+                double frozen_qty = ivt_now.getDouble("frozen_qty");
+                double warehousing_qty = ivt_now.getDouble("warehousing_qty");
+                if(frozen_qty!=0 || warehousing_qty != 0){
+                    throw new BadRequestException("此批次物料库存冻结数或待入数不为0,有未完成的单据,请稍后再试！");
+                }
+            }
             /*
              *  更新仓位库存表
              */

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

@@ -140,3 +140,25 @@
 		ENDQUERY
 	ENDIF
 
+	IF 输入.flag = "5"
+        QUERY
+            SELECTinandoutreturn
+                sum(ivt.frozen_qty) AS frozen_qty,
+                sum(ivt.warehousing_qty) AS warehousing_qty,
+                ivt.material_id,
+                ivt.pcsn
+            FROM
+                ST_IVT_StructIvt ivt
+            WHERE
+            1=1
+            OPTION 输入.material_id <> ""
+                  ivt.material_id = 输入.material_id
+            ENDOPTION
+            OPTION 输入.pcsn <> ""
+                  ivt.pcsn = 输入.pcsn
+            ENDOPTION
+              group by ivt.material_id,ivt.pcsn
+            ENDSELECT
+        ENDQUERY
+    ENDIF
+

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/rest/DevicesafetyqtyqueryController.java

@@ -81,4 +81,10 @@ public class DevicesafetyqtyqueryController {
         devicesafetyqtyqueryService.download(whereJson, response);
     }
 
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download2")
+    public void download2(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {
+        devicesafetyqtyqueryService.download2(whereJson, response);
+    }
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/DevicesafetyqtyqueryService.java

@@ -81,4 +81,6 @@ public interface DevicesafetyqtyqueryService {
 
     void download(Map whereJson, HttpServletResponse response) throws IOException;
 
+    void download2(Map whereJson, HttpServletResponse response) throws IOException;
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesafetyqtyqueryServiceImpl.java

@@ -215,4 +215,45 @@ public class DevicesafetyqtyqueryServiceImpl implements DevicesafetyqtyqueryServ
         FileUtil.downloadExcel(list, response);
     }
 
+    @Override
+    public void download2(Map whereJson, HttpServletResponse response) throws IOException {
+        String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
+        String class_idStr = (String) whereJson.get("class_idStr");
+        String material_code = MapUtil.getStr(whereJson, "material_code");
+        String type = MapUtil.getStr(whereJson, "type");
+        String is_all = MapUtil.getStr(whereJson, "is_all");
+        if(StrUtil.isEmpty(class_idStr)){
+            class_idStr = MaterOptTypeEnum.BCP_AND_YL_AND_FL.getClass_idStr();
+        }
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "2");
+        map.put("type",type);
+        map.put("is_all",is_all);
+        if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%"+material_code+"%");
+        //处理物料当前节点的所有子节点
+        if (StrUtil.isNotEmpty(material_type_id)) {
+            map.put("material_type_id", material_type_id);
+            String classIds = classstandardService.getChildIdStr(material_type_id);
+            map.put("classIds", classIds);
+        } else if (ObjectUtil.isNotEmpty(class_idStr)) {
+            String classIds = classstandardService.getAllChildIdStr(class_idStr);
+            map.put("classIds", classIds);
+        }
+        JSONArray rows = WQL.getWO("EM_DEVICESAFETQTYQUERY001").addParamMap(map).process().getResultJSONArray(0);
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (int i = 0; i < rows.size(); i++) {
+            JSONObject jo = rows.getJSONObject(i);
+            Map<String, Object> dtl_map = new LinkedHashMap<>();
+            dtl_map.put("物料编码", jo.getString("material_code"));
+            dtl_map.put("物料名称", jo.getString("material_name"));
+            dtl_map.put("物料分类", jo.getString("class_name"));
+            dtl_map.put("安全库存下限", jo.getString("safe_ivt_down"));
+            dtl_map.put("库存", jo.getString("ivt_qty"));
+            dtl_map.put("单位", jo.getString("qty_unit_name"));
+            list.add(dtl_map);
+        }
+        FileUtil.downloadExcel(list, response);
+    }
+
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java

@@ -117,7 +117,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(map.get("remark"))) {
             map.put("remark", "%" + map.get("remark") + "%");
         }
-        JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
+        JSONObject jo = WQL.getWO("QST_IVT_CHECKOUTBILL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mb.material_code");
         return jo;
     }
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql

@@ -98,11 +98,11 @@
                ENDOPTION
 
                OPTION 输入.begin_time <> ""
-                   mst.biz_date >= 输入.begin_time
+                   mst.input_time >= 输入.begin_time
                ENDOPTION
 
                OPTION 输入.end_time <> ""
-                   mst.biz_date <= 输入.end_time
+                   mst.input_time <= 输入.end_time
                ENDOPTION
 
                OPTION 输入.material_search <> ""