华高

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdHuaGaoServiceImpl.java

@@ -101,7 +101,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
             for (List<String> formInstanceIdList : formInstanceIdListList) {
                 if (!formInstanceIdList.isEmpty()){
                     ydClient.operateData(YDParam.builder()
-                            .formUuid("FORM-06C833A3B1804929987033DD6B0E7B2F73JP")
+                            .formUuid("FORM-3B2E5C93D7E6494B9AD920B48A90159F7DZ4")
                             .formInstanceIdList(formInstanceIdList)
                             .build(), YDConf.FORM_OPERATION.delete_batch);
                 }
@@ -117,7 +117,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
 
             billQuery.setLimit(limit);
             billQuery.setFormId("BD_SerialMainFile");
-            billQuery.setFieldKeys("FNumber");
+            billQuery.setFieldKeys("FNumber,FMaterialID.FNumber,FMaterialID.FName,FMaterialID.FSpecification,FMaterialID.F_QUXZ_Assistant,FZKTS,FStockStatus,FStockId.FName,FStockLocID.FF100001.FName,FCustId.FName");
             List<Map> filterString = new ArrayList<>();
             //仓库等于成品仓 仓位等于默认仓位或样机仓位 在库状态等于待入库或在库
             filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FStockId.FName","67","成品仓","","","0"));//仓库名称等于XX
@@ -143,73 +143,64 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
             List<Map> originList = new ArrayList<>();
 
             for (Map map : list) {
-                String FNumber = UtilMap.getString(map,"FNumber");
-
-                //查找序列号主档具体信息
-                View view = new View();
-                view.setNumber(FNumber);
-                String resultJson = client.view("BD_SerialMainFile", JSONObject.toJSONString(view));
-                Gson gson = new Gson();
-                RepoRet repoRet = gson.fromJson(resultJson, RepoRet.class);
-                if (isTrue(repoRet)){
-                    Map formData = new HashMap();
-
-                    Map serialMainFileInfo = (Map) repoRet.getResult().getResult();
-
-                    formData.put("textField_mev1n46z",UtilMap.getString(serialMainFileInfo, "Number"));//序列号
-                    formData.put("textField_mev1n470",getNumber(UtilMap.getMap(serialMainFileInfo,"MaterialID")));//物料编码
-                    formData.put("textField_mev1n471",getMultiLanguageTextName(UtilMap.getMap(serialMainFileInfo,"MaterialID")));//物料名称
-                    formData.put("textField_mev1n472",getMultiLanguageTextSpecification(UtilMap.getMap(serialMainFileInfo,"MaterialID")));//规格型号
-                    String ssxl = getMultiLanguageTextName(UtilMap.getMap(UtilMap.getMap(serialMainFileInfo, "MaterialID"), "F_QUXZ_Assistant"));
-                    formData.put("textField_mev1n477", ssxl);//所属系列
-                    double zkts = UtilMap.getDouble(serialMainFileInfo, "FZKTS") == 0.0 ? 1.0 : UtilMap.getDouble(serialMainFileInfo, "FZKTS");
-                    formData.put("numberField_mev1n478", zkts);//在库天数
-
-                    List<Map> bdSerialmasterorg = UtilMap.getList(serialMainFileInfo, "BD_SERIALMASTERORG");
-                    String stockStatus = STOCK_STATUS.get(UtilMap.getString(bdSerialmasterorg.get(0), "StockStatus"));
-                    formData.put("textField_mev1n476", stockStatus);//在库状态
-
-                    List<Map> bdSerialmasterother = UtilMap.getList(serialMainFileInfo, "BD_SERIALMASTEROTHER");
-                    formData.put("textField_mev1n473",getMultiLanguageTextName(UtilMap.getMap((bdSerialmasterother).get(0),"StockId")));//仓库
-                    String cw = getMultiLanguageTextName(UtilMap.getMap(UtilMap.getMap((bdSerialmasterother).get(0), "StockLocId"), "F100001"));
-                    formData.put("textField_mev1n474", cw);//仓位
-                    formData.put("textField_mev1n475",getMultiLanguageTextName(UtilMap.getMap((bdSerialmasterother).get(0),"CustId")));//客户
-
-                    //在库天数分类
-                    int zktsfl = 1;
-                    if ("待入库".equals(stockStatus)){
-                        zktsfl = 1;
+                Map formData = new HashMap();
+
+                formData.put("textField_mev1n46z",UtilMap.getString(map,"FNumber"));//序列号
+                formData.put("textField_mev1n470",UtilMap.getString(map,"FMaterialID.FNumber"));//物料编码
+                formData.put("textField_mev1n471",UtilMap.getString(map,"FMaterialID.FName"));//物料名称
+                formData.put("textField_mev1n472",UtilMap.getString(map,"FMaterialID.FSpecification"));//规格型号
+
+                String ssxl = UtilMap.getString(map, "FMaterialID.F_QUXZ_Assistant");
+                formData.put("textField_mev1n477", ssxl);//所属系列
+
+                Double zkts = UtilMap.getDouble(map, "FZKTS");
+                formData.put("numberField_mev1n478", zkts);//在库天数
+
+                String stockStatus = STOCK_STATUS.get(UtilMap.getString(map, "FStockStatus"));
+                formData.put("textField_mev1n476", stockStatus);//在库状态
+
+                formData.put("textField_mev1n473",UtilMap.getString(map,"FStockId.FName"));//仓库
+
+                String cw = UtilMap.getString(map, "FStockLocID.FF100001.FName");
+                formData.put("textField_mev1n474", cw);//仓位
+
+                formData.put("textField_mev1n475",UtilMap.getString(map,"FCustId.FName"));//客户
+
+                //在库天数分类
+                int zktsfl = 1;
+                if ("待入库".equals(stockStatus)){
+                    zktsfl = 1;
+                }else {
+                    if (zkts <= 30){
+                        zktsfl = 2;
+                    }else if (zkts <= 60){
+                        zktsfl = 3;
+                    }else if (zkts <= 90){
+                        zktsfl = 4;
                     }else {
-                        if (zkts <= 30){
-                            zktsfl = 2;
-                        }else if (zkts <= 60){
-                            zktsfl = 3;
-                        }else if (zkts <= 90){
-                            zktsfl = 4;
-                        }else {
-                            zktsfl = 5;
-                        }
+                        zktsfl = 5;
                     }
-                    formData.put("selectField_mf205zr0",zktsfl);
-                    formData.put("numberField_mev270x6",year);
-                    formData.put("numberField_mev270x5",month);
-                    formData.put("textField_mev2ers5",weekOfMonth);
+                }
+
+                formData.put("selectField_mf205zr0",zktsfl);
+                formData.put("numberField_mev270x6",year);
+                formData.put("numberField_mev270x5",month);
+                formData.put("textField_mev2ers5",weekOfMonth);
 
-                    formData.put("numberField_mfat6egj",1);//统计数值，默认1
+                formData.put("numberField_mfat6egj",1);//统计数值，默认1
 
-                    ydClient.operateData(YDParam.builder()
-                            .formUuid("FORM-3B2E5C93D7E6494B9AD920B48A90159F7DZ4")
-                            .formDataJson(JSONObject.toJSONString(formData))
-                            .build(), YDConf.FORM_OPERATION.create);
+                ydClient.operateData(YDParam.builder()
+                        .formUuid("FORM-3B2E5C93D7E6494B9AD920B48A90159F7DZ4")
+                        .formDataJson(JSONObject.toJSONString(formData))
+                        .build(), YDConf.FORM_OPERATION.create);
 
-                    Map origin = new HashMap();
-                    origin.put("cw",cw);
-                    origin.put("ssxl",ssxl);
-                    origin.put("zktsfl",zktsfl);
-                    origin.put("value",1);
+                Map origin = new HashMap();
+                origin.put("cw",cw);
+                origin.put("ssxl",ssxl);
+                origin.put("zktsfl",zktsfl);
+                origin.put("value",1);
 
-                    originList.add(origin);
-                }
+                originList.add(origin);
             }
 
             //删除宜搭历史最新库存信息
@@ -233,7 +224,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
 
             List<Map> data2 = (List<Map>) ydClient.queryData(YDParam.builder()
                     .formUuid("FORM-5764CC3F6D964FD3A165BD7D4D75999FO8NQ")
-                    .searchFieldJson(JSONObject.toJSONString(UtilMap.map("numberField_mev270x6",Arrays.asList(year,year), Arrays.asList(month,month))))
+                    .searchFieldJson(JSONObject.toJSONString(UtilMap.map("numberField_mev270x6",Arrays.asList(year,year))))
                     .build(), YDConf.FORM_QUERY.retrieve_list).getData();
 
             List<String> formInstanceIdList2 = new ArrayList<>();