Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx

@@ -377,6 +377,19 @@
 						<m:icon>iconfont iconxiaoshoujihuashenhe1x</m:icon>
 					</m:function-node>
 					<m:function-node>
+						<m:id>9e32391e-1911-4951-80a2-15875e688d0f</m:id>
+						<m:name>market_plan_temporary_approve</m:name>
+						<m:title>临时销售计划审核</m:title>
+						<m:index>4500</m:index>
+						<m:license></m:license>
+						<m:privilege></m:privilege>
+						<m:function-definition>
+							<m:view>function-market-plan-temporary-approve</m:view>
+							<m:view-config></m:view-config>
+						</m:function-definition>
+						<m:icon>iconfont iconxiaoshoujihuashenhe1x</m:icon>
+					</m:function-node>
+					<m:function-node>
 						<m:id>9b325506-f1e8-4ddf-842e-9a85725238fb</m:id>
 						<m:name>market_warning</m:name>
 						<m:title>销售预警</m:title>

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/ProductionPlanReportServiceImpl.java

@@ -179,20 +179,23 @@ public class ProductionPlanReportServiceImpl implements ProductionPlanReportServ
             UUID stationId = station.getUuid("id");
             String stationName = station.getString("stationName");
             KObject[] dinasTypeDetails = kObject.get("dinasTypeDetails").toArray();
-            params.put("regionalCompanyId",regionalCompanyId.toString());
+            params.put("regionalCompany",regionalCompanyId.toString());
             ArrayList<JSONObject> strings = new ArrayList<>();
             JSONObject dinasTypeDetailJson ;
             for (KObject dinasTypeDetail : dinasTypeDetails) {
                 dinasTypeDetailJson=new JSONObject();
                 dinasTypeDetailJson.put("stationId",stationId.toString());
                 dinasTypeDetailJson.put("stationName",stationName);
-                dinasTypeDetailJson.put("dinasTypeId",dinasTypeDetail.getUuid("id").toString());
-                dinasTypeDetailJson.put("dinasTypeName",dinasTypeDetail.get("dinasType").get("dinasTypeName"));
+                dinasTypeDetailJson.put("dinasTypeId",dinasTypeDetail.get("dinasType").getUuid("id").toString());
+                dinasTypeDetailJson.put("dinasTypeName",dinasTypeDetail.get("dinasType").getString("dinasTypeName"));
                 dinasTypeDetailJson.put("amount",dinasTypeDetail.getDouble("dinasWeight"));
                 strings.add(dinasTypeDetailJson);
             }
-            params.put("datas",strings);
-            inventoryService.modifyInventory(params.toString(),false,true);
+            params.put("data",strings);
+            ArrayList<JSONObject> jsonObjects = new ArrayList<>();
+            jsonObjects.add(params);
+            JSONObject datas = new JSONObject().put("datas", jsonObjects);
+            inventoryService.modifyInventory(datas.toString(),false,true);
             kObject.set("warehousingStatus",true);
             productionLineDao.update(kObject);
         }