fix:优化--粉料计划原料到货需求 ，优化--日计划管理

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java

@@ -56,11 +56,12 @@ public class DailyplanServiceImpl implements DailyplanService {
     @Override
     public Map<String, Object> queryAll2(Map whereJson) {
         HashMap<String, String> map = new HashMap<>(whereJson);
-
+        String plan_org_code = map.get("plan_org_code");
         String material_code = map.get("material_code");
         if (StrUtil.isNotEmpty(material_code)) {
             map.put("material_code", "%" + material_code + "%");
         }
+        map.put("plan_org_code",plan_org_code);
         map.put("flag", "1");
         JSONArray json = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).process().getResultJSONArray(0);
         JSONArray ja = new JSONArray();

mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql

@@ -25,6 +25,7 @@
     输入.device_id					    TYPEAS s_string
     输入.old_mark					    TYPEAS s_string
     输入.material_id					    TYPEAS s_string
+    输入.plan_org_code					    TYPEAS s_string
     输入.workorder_type					    TYPEAS s_string
 
 
@@ -73,6 +74,9 @@
                 LEFT JOIN PCS_IF_ProductPlanProc ProductPlanProc ON ProductPlanProc.plan_id = pp.plan_id
             WHERE
                 1=1
+                OPTION 输入.plan_org_code <> ""
+                        pp.plan_org_code = 输入.plan_org_code
+                ENDOPTION
                 OPTION 输入.status <> ""
                         pp.status = 输入.status
                 ENDOPTION

mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/wql/statistical_report_query_02.wql

@@ -92,7 +92,8 @@
                 mater.material_name,
                 dtl.pcsn,
                 dtl.receive_code,
-                dtl.material_id
+                dtl.material_id,
+                mst.source_name
              FROM
                 PCS_RC_ReceiveDtl dtl
                 inner JOIN pcs_rc_receivemst mst ON mst.receive_id = dtl.receive_id