修改bug

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/PhysicalIDTimed.java

@@ -28,7 +28,7 @@ public class PhysicalIDTimed implements Job {
     public void Materialinventory() throws IOException, ParseException {
          physicalIDService.synchronization(null);
 
-         System.out.println("执行了");
+//         System.out.println("执行了");
     }
 
     @Override

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/ProductionOrderTimed.java

@@ -20,9 +20,10 @@ public class ProductionOrderTimed implements Job {
     @Autowired
     IProductionOrderService productionOrderService;
     @Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
-//    @Scheduled(fixedDelay = 1000*60)
+//    @Scheduled(fixedDelay = 1000*60*10)
     public void job() throws ParseException {
         productionOrderService.synchronization(null);
+
     }
 
     @SneakyThrows

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/ProductionSchedulingTimed.java

@@ -20,9 +20,10 @@ public class ProductionSchedulingTimed implements Job {
     @Autowired
     IProductionSchedulingService productionSchedulingService;
     @Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
-//    @Scheduled(fixedDelay = 1000*60)
+    @Scheduled(fixedDelay = 1000*60*10)
     public void job() throws ParseException {
         productionSchedulingService.synchronization(null);
+//        System.out.println("执行了");
     }
 
     @SneakyThrows

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/PurchaseorderTimed.java

@@ -26,7 +26,7 @@ public class PurchaseorderTimed implements Job {
      * 测试定时
      */
      @Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
-//    @Scheduled(fixedDelay = 1000 * 60)
+//    @Scheduled(fixedDelay = 1000 * 60 * 10)
     public void Materialinventory() throws IOException, ParseException {
         iPurchaseorderService.synchronizationList(null);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/SalesOrderTimed.java

@@ -25,9 +25,10 @@ public class SalesOrderTimed implements Job {
     @Autowired
     ISalesOrderService salesOrderService;
     @Scheduled(cron = "0 0 1 * * ?")//cron表达式每天凌晨一点
-//    @Scheduled(fixedDelay = 1000*60)
+//    @Scheduled(fixedDelay = 1000*60*10)
     public void job() throws ParseException {
         salesOrderService.synchronization(null);
+//        System.out.println("执行完成");
     }
 
     @SneakyThrows

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/ProductionOrderServiceImpl.java

@@ -72,6 +72,7 @@ public class ProductionOrderServiceImpl extends ServiceImpl<ProductionOrderMappe
         }
         //保存金蝶云操作的日志记录
         list = addKingdeeJournalProductionOrder(synchronization);
+
         if (list == null || list.size() < 1) return false;
 
         //从金蝶云查询数据(传给国网用)
@@ -87,6 +88,7 @@ public class ProductionOrderServiceImpl extends ServiceImpl<ProductionOrderMappe
         //创建list对象
 //        ArrayList<Productionordererror> Productionordererrors = new ArrayList<>();
         ArrayList<ProductionOrder> productionOrders = new ArrayList<>();
+
         for (Map<String, String> stringStringMap : list) {
             // 向国网添加数据
             String rs = productionOrderApi.add(stringStringMap);
@@ -163,6 +165,7 @@ public class ProductionOrderServiceImpl extends ServiceImpl<ProductionOrderMappe
                 Boolean ny = webApiLog.setKingdeeJournal(key, name,BusinessNo, selectInList);
                 if (ny) {//记录金蝶日志并判断是否转换国网字段
                     list = productionOrderWebapi.ProductionOrder(selectInList);
+
                 }
                 break;
             }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/PurchaseorderServiceImpl.java

@@ -82,6 +82,7 @@ public class PurchaseorderServiceImpl extends ServiceImpl<PurchaseorderMapper, P
         }
 
         JSONObject jsonObject = JSONObject.fromObject(purchaseorderApi.selectList(map));
+        System.out.println("jsonObject "+jsonObject);
         if (jsonObject.get("success") == null) {
             //请求国网的返回信息
             JSONObject resultValue = JSONObject.fromObject(jsonObject.get("resultValue"));
@@ -90,7 +91,7 @@ public class PurchaseorderServiceImpl extends ServiceImpl<PurchaseorderMapper, P
             if (null == list && 0 == list.size()) return false;
             //记录请求国网的返回信息
             Map<Boolean, String> booleanStringMap = gridErrorService.setGridError(jsonObject, JsonUtil.Mapjson(map), BusinessNo);
-            String ReturnProcessId = null;
+            String ReturnProcessId = null;//请求国网日志id
             if (booleanStringMap.containsKey(true)) {
                 ReturnProcessId = booleanStringMap.get(true);
             }
@@ -166,15 +167,17 @@ public class PurchaseorderServiceImpl extends ServiceImpl<PurchaseorderMapper, P
                 JSONObject model = JSONObject.fromObject(map);//转换数据格式
                 Map<String, Object> SAL_SaleOrder = FieldConversion.nameAPI(model);//拼接需要的数据 字段转换
                 String rswebapi = salesOrderWebapi.add(SAL_SaleOrder);//同步到金蝶
-                System.out.println(rswebapi);
+
                 JSONObject Result = JSONObject.fromObject(rswebapi);//
                 JSONObject ResponseStatus = JSONObject.fromObject(JSONObject.fromObject(Result.get("Result")).get("ResponseStatus"));
                 //记录金蝶日志
                 setKingdeeJournalReturnProcess(JsonUtil.Objectjson(SAL_SaleOrder), ReturnProcessId, rswebapi, JsonUtil.Objectjson(map));
 
                 List<Map<String, String>> SuccessEntitys = (List<Map<String, String>>) ResponseStatus.get("SuccessEntitys");//金蝶云返回值SuccessEntitys
-                Map<String, String> stringStringMap = SuccessEntitys.get(0);
-                if (stringStringMap.get("Id") != null && stringStringMap.get("Number") != null) {
+
+                Map<String, String> stringStringMap = 0==SuccessEntitys.size()?null:SuccessEntitys.get(0);
+                if (null!=stringStringMap)
+                if (null != stringStringMap.get("Id") && null != stringStringMap.get("Number")) {
                     map.put("FId", stringStringMap.get("Id"));
                     map.put("FNumber", stringStringMap.get("Number"));
                     //获取返回数据记录到记录明细

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/PhysicalIDWebapi.java

@@ -36,6 +36,7 @@ public class PhysicalIDWebapi implements web_api {
     private ProductionOrderWebapi productionOrderWebapi;
     @Autowired
     private IPurchaseorderService purchaseorderService;
+
     public PhysicalIDWebapi() {
         /*查询字段*/
         keyList.add("FBILLNO");//单据编码0
@@ -87,26 +88,40 @@ public class PhysicalIDWebapi implements web_api {
      * @return
      */
     public List<Map<String, String>> PhysicalID(List<List<Object>> list) throws ParseException {
-        System.out.println(list.size() + "list" + list);
         List<Map<String, String>> salesorderlist = new ArrayList<>();
         Map<String, String> fid = new IdentityHashMap<String, String>();
         for (List<Object> list1 : list) {//获取生产订单id 拼接查询条件
             fid.put(new String("fid = "), list1.get(7).toString());
         }
         List<List<Object>> FSaleOrderIds = productionOrderWebapi.selectOr(fid);//查询关联生产订单
-        int i=0;
-        for (List<Object> list1 : list) {
+
+        List<List<Object>> f=new ArrayList<>();
+        List<List<Object>> l=new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            String s = list.get(i).get(7).toString();
+            label:for (int j = 0; j < FSaleOrderIds.size(); j++) {
+                if (s.equals(FSaleOrderIds.get(j).get(1).toString())) {
+                    f.add(list.get(i));
+                    l.add(FSaleOrderIds.get(j));
+                    FSaleOrderIds.remove(j);
+                    break label;
+                }
+            }
+        }
+
+        int i = 0;
+        for (List<Object> list1 : f) {
             Map<String, String> salesordermap = new HashMap<>();
             QueryWrapper<Purchaseorder> queryWrapper = new QueryWrapper<>();
             queryWrapper.select("F_Id");
-            Object SaleOrderId = FSaleOrderIds.get(i++).get(0);//销售订单id，可匹配过滤是否平台生成订单获取采购订单行项目号
+            Object SaleOrderId = l.get(i++).get(0);//销售订单id，可匹配过滤是否平台生成订单获取采购订单行项目号
             queryWrapper.eq("F_Id", SaleOrderId.toString());
             //查询是否为集成平台生成的订单，并过滤
             Purchaseorder purchaseorders1 = purchaseorderService.getBaseMapper().selectOne(queryWrapper);
-            if (purchaseorders1==null) continue;
-            System.out.println("getFId"+purchaseorders1.getFId());
-            System.out.println("getPoItemId"+purchaseorders1.getPoItemId());
-            salesordermap.put("poItemId",purchaseorders1.getPoItemId());//采购订单行项目id
+            if (purchaseorders1 == null) continue;
+            System.out.println("getFId" + purchaseorders1.getFId());
+            System.out.println("getPoItemId" + purchaseorders1.getPoItemId());
+            salesordermap.put("poItemId", purchaseorders1.getPoItemId());//采购订单行项目id
             String id = list1.get(0).toString();
             salesordermap.put("suppliercode", "linqin");//供应商编码
             salesordermap.put("purchaserhqcode", "SGCC");//采购方总部编码

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/ProductionOrderWebapi.java

@@ -58,6 +58,7 @@ public class ProductionOrderWebapi implements web_api {
     public List<List<Object>> selectOr(Map<String, String> or) {
         LinkedHashMap<String, String> orkey = new LinkedHashMap<String, String>() {{
             put("FSaleOrderId", "FSaleOrderId ");
+            put("FID","FID");
         }};
         List<List<Object>> lists = categoryDao.selectWhereOr(sFormId, orkey, or);
         return lists;
@@ -88,8 +89,7 @@ public class ProductionOrderWebapi implements web_api {
      */
     public List<Map<String,String>>  ProductionOrder(List<List<Object>> list){
         List<Map<String,String>> ProductionOrderlist = new ArrayList<>();
-        if(!list.isEmpty())
-        {
+        if(!list.isEmpty()) {
             for (List<Object> list1 : list) {
                 Map<String, String> ProductionOrdermap = new HashMap<>();
                 QueryWrapper<Purchaseorder> queryWrapper = new QueryWrapper<>();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/webapi/ProductionSchedulingWebapi.java

@@ -89,12 +89,25 @@ public class ProductionSchedulingWebapi implements web_api {
                 fid.put(new String("fid = "), list1.get(2).toString());
             }
             List<List<Object>> FSaleOrderIds = productionOrderWebapi.selectOr(fid);//查询关联生产订单
+            List<List<Object>> f=new ArrayList<>();
+            List<List<Object>> l=new ArrayList<>();
+            for (int i = 0; i < list.size(); i++) {
+                String s = list.get(i).get(2).toString();
+                label:for (int j = 0; j < FSaleOrderIds.size(); j++) {
+                    if (s.equals(FSaleOrderIds.get(j).get(1).toString())) {
+                        f.add(list.get(i));
+                        l.add(FSaleOrderIds.get(j));
+                        FSaleOrderIds.remove(j);
+                        break label;
+                    }
+                }
+            }
             int i=0;
-            for (List<Object> list1 : list) {
+            for (List<Object> list1 : f) {
                 Map<String, String> ProductionSchedulingmap = new HashMap<>();
                 QueryWrapper<Purchaseorder> queryWrapper = new QueryWrapper<>();
                 queryWrapper.select("F_Id");
-                Object SaleOrderId = FSaleOrderIds.get(i++).get(0);//销售订单id，可匹配过滤是否平台生成订单获取采购订单行项目号
+                Object SaleOrderId = l.get(i++).get(0);//销售订单id，可匹配过滤是否平台生成订单获取采购订单行项目号
                 queryWrapper.eq("F_Id", SaleOrderId.toString());
                 //查询是否为集成平台生成的订单，并过滤
                 Purchaseorder purchaseorders1 = purchaseorderService.getBaseMapper().selectOne(queryWrapper);