Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/JsonChangeUtils.java

@@ -102,8 +102,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',case when mo.iSum is null then '0' else mo.iSum end as amount,ex.cbdefine2 as lineAttributeString7,ex.cbdefine3 as lineAttributeString8," +
                         "mo.cDefine28 as 'lineAttributeString1',mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3'," +
                         "mo.cDefine30 as 'lineAttributeString4',mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8," +
-                        "mo.cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeDatetime2," +
-                        "inv.bConfigFree1 as bConfigFree1,inv.bConfigFree2 as bConfigFree2,inv.bConfigFree3 as bConfigFree3,inv.bConfigFree4 as bConfigFree4,inv.bConfigFree5 as bConfigFree5,inv.bConfigFree6 as bConfigFree6,inv.bConfigFree7 as bConfigFree7,inv.bConfigFree8 as bConfigFree8,inv.bConfigFree9 as bConfigFree9,inv.bConfigFree10 as bConfigFree10,"+
+                        "cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeDatetime2," +
                         "'' as externalLineNum,'' as itemAttrId,'"+map.get("moId")+"' as poId  from OM_MODetails mo  " +
                         "left join Inventory inv  on mo.cInvCode = inv.cInvCode "+
                         "left join OM_MOdetails_extradefine ex on mo.MODetailsID = ex.MODetailsID "+
@@ -131,8 +130,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',case when mo.iSum is null then '0' else mo.iSum end as amount,ex.cbdefine2 as lineAttributeString7,ex.cbdefine3 as lineAttributeString8," +
                         "mo.cDefine28 as 'lineAttributeString1',mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3'," +
                         "mo.cDefine30 as 'lineAttributeString4',mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8," +
-                        "mo.cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeDatetime2," +
-                        "inv.bConfigFree1 as bConfigFree1,inv.bConfigFree2 as bConfigFree2,inv.bConfigFree3 as bConfigFree3,inv.bConfigFree4 as bConfigFree4,inv.bConfigFree5 as bConfigFree5,inv.bConfigFree6 as bConfigFree6,inv.bConfigFree7 as bConfigFree7,inv.bConfigFree8 as bConfigFree8,inv.bConfigFree9 as bConfigFree9,inv.bConfigFree10 as bConfigFree10,"+
+                        "cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeDatetime2," +
                         "'' as externalLineNum,'' as itemAttrId,'"+map.get("moId")+"' as poId  from OM_MODetails mo  " +
                         "left join Inventory inv  on mo.cInvCode = inv.cInvCode "+
                         "left join OM_MOdetails_extradefine ex on mo.MODetailsID = ex.MODetailsID "+
@@ -161,8 +159,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',case when mo.iSum is null then '0' else mo.iSum end as amount,ex.cbdefine2 as lineAttributeString7,ex.cbdefine3 as lineAttributeString8," +
                         "mo.cDefine28 as 'lineAttributeString1',mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3'," +
                         "mo.cDefine30 as 'lineAttributeString4',mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8," +
-                        "mo.cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeDatetime2," +
-                        "inv.bConfigFree1 as bConfigFree1,inv.bConfigFree2 as bConfigFree2,inv.bConfigFree3 as bConfigFree3,inv.bConfigFree4 as bConfigFree4,inv.bConfigFree5 as bConfigFree5,inv.bConfigFree6 as bConfigFree6,inv.bConfigFree7 as bConfigFree7,inv.bConfigFree8 as bConfigFree8,inv.bConfigFree9 as bConfigFree9,inv.bConfigFree10 as bConfigFree10,"+
+                        "cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeDatetime2," +
                         "'' as externalLineNum,'' as itemAttrId,'"+map.get("moId")+"' as poId  from OM_MODetails mo  " +
                         "left join Inventory inv  on mo.cInvCode = inv.cInvCode "+
                         "left join OM_MOdetails_extradefine ex on mo.MODetailsID = ex.MODetailsID "+
@@ -236,7 +233,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
                         "mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8,'' as 'color'," +
-                        "inv.bConfigFree1 as bConfigFree1,inv.bConfigFree2 as bConfigFree2,inv.bConfigFree3 as bConfigFree3,inv.bConfigFree4 as bConfigFree4,inv.bConfigFree5 as bConfigFree5,inv.bConfigFree6 as bConfigFree6,inv.bConfigFree7 as bConfigFree7,inv.bConfigFree8 as bConfigFree8,inv.bConfigFree9 as bConfigFree9,inv.bConfigFree10 as bConfigFree10,"+
                         "'' as 'externalLineNum',0 as 'itemAttrId' from PO_Podetails mo left join Inventory inv on mo.cInvCode = inv.cInvCode " +
                         "left join PO_Podetails_extradefine ex on mo.ID = ex.ID"+
                         " where mo.POID = '"+map.get("moId")+"'";
@@ -263,7 +259,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
                         "mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8,'' as 'color'," +
-                        "inv.bConfigFree1 as bConfigFree1,inv.bConfigFree2 as bConfigFree2,inv.bConfigFree3 as bConfigFree3,inv.bConfigFree4 as bConfigFree4,inv.bConfigFree5 as bConfigFree5,inv.bConfigFree6 as bConfigFree6,inv.bConfigFree7 as bConfigFree7,inv.bConfigFree8 as bConfigFree8,inv.bConfigFree9 as bConfigFree9,inv.bConfigFree10 as bConfigFree10,"+
                         "'' as 'externalLineNum',0 as 'itemAttrId' from PO_Podetails mo left join Inventory inv on mo.cInvCode = inv.cInvCode " +
                         "left join PO_Podetails_extradefine ex on mo.ID = ex.ID"+
                         " where mo.POID = '"+map.get("moId")+"'";
@@ -289,7 +284,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
                         "mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8,'' as 'color'," +
-                        "inv.bConfigFree1 as bConfigFree1,inv.bConfigFree2 as bConfigFree2,inv.bConfigFree3 as bConfigFree3,inv.bConfigFree4 as bConfigFree4,inv.bConfigFree5 as bConfigFree5,inv.bConfigFree6 as bConfigFree6,inv.bConfigFree7 as bConfigFree7,inv.bConfigFree8 as bConfigFree8,inv.bConfigFree9 as bConfigFree9,inv.bConfigFree10 as bConfigFree10,"+
                         "'' as 'externalLineNum',0 as 'itemAttrId' from PO_Podetails mo left join Inventory inv on mo.cInvCode = inv.cInvCode " +
                         "left join PO_Podetails_extradefine ex on mo.ID = ex.ID "+
                         " where mo.POID = '"+map.get("moId")+"'";
@@ -402,28 +396,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
                     }else if(key.equals("cFree10")&&oConvertUtils.isNotEmpty(map.get(key))){
                         mapCfree.put(key,map.get(key));
                     }
-                    //处理物料属性结构性
-                    if(key.equals("bConfigFree1")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree2")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree7")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree8")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree9")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree10")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }
                     jf.put(key, map.get(key));
                 }
             }
@@ -446,7 +418,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
             for (String key : keysCfree) {
                 jf.put("attributeCode"+ii, key);
                 jf.put("attributeValue"+ii, map.get(key));
-                jf.put("attributeFlag"+ii, key);
                 ii++;
             }
             ii = 1;
@@ -461,16 +432,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
             jf.remove("cFree8");
             jf.remove("cFree9");
             jf.remove("cFree10");
-            jf.remove("bConfigFree1");
-            jf.remove("bConfigFree2");
-            jf.remove("bConfigFree3");
-            jf.remove("bConfigFree4");
-            jf.remove("bConfigFree5");
-            jf.remove("bConfigFree6");
-            jf.remove("bConfigFree7");
-            jf.remove("bConfigFree8");
-            jf.remove("bConfigFree9");
-            jf.remove("bConfigFree10");
             pljf.add(jf);
         }
         return pljf;
@@ -516,28 +477,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
                     }else if(key.equals("cFree10")&&oConvertUtils.isNotEmpty(map.get(key))){
                         mapCfree.put(key,map.get(key));
                     }
-                    //处理物料属性结构性
-                    if(key.equals("bConfigFree1")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree2")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree7")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree8")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree9")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }else if(key.equals("bConfigFree10")&&oConvertUtils.isNotEmpty(map.get(key))){
-                        mapCfree.put(key,map.get(key));
-                    }
                     jf.put(key, map.get(key));
                 }
             }
@@ -597,7 +536,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
             for (String key : keysCfree) {
                 jf.put("attributeCode"+ii, key);
                 jf.put("attributeValue"+ii, map.get(key));
-                jf.put("attributeFlag"+ii, key);
                 ii++;
             }
             ii = 1;
@@ -611,16 +549,6 @@ public class JsonChangeUtils implements ApplicationContextAware{
             jf.remove("cFree8");
             jf.remove("cFree9");
             jf.remove("cFree10");
-            jf.remove("bConfigFree1");
-            jf.remove("bConfigFree2");
-            jf.remove("bConfigFree3");
-            jf.remove("bConfigFree4");
-            jf.remove("bConfigFree5");
-            jf.remove("bConfigFree6");
-            jf.remove("bConfigFree7");
-            jf.remove("bConfigFree8");
-            jf.remove("bConfigFree9");
-            jf.remove("bConfigFree10");
                 jf.remove("MODetailsID");
                 jf.remove("MOID");
                 jf.remove("pkorg");