。

db/Dockerfile

@@ -6,4 +6,4 @@ ENV TZ=Asia/Shanghai
 
 RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-COPY ./wmssystem.sql /docker-entrypoint-initdb.d
+COPY ./API.sql /docker-entrypoint-initdb.d
\ No newline at end of file

jeecg-boot-module-system/pom.xml

@@ -42,7 +42,7 @@
 		</dependency>
 		<!--k3cloud-WebAPI-->
 		<dependency>
-			<groupId>client</groupId>
+			<groupId>webapi</groupId>
 			<artifactId>k3cloud-webapi-client</artifactId>
 			<scope>system</scope>
 			<version>1.0</version>
@@ -83,6 +83,16 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<includeSystemScope>true</includeSystemScope>
+				</configuration>
 			</plugin>
 			  <plugin>
 				<groupId>com.github.wvengen</groupId>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/Dao/CategoryDao.java

@@ -13,7 +13,7 @@ import java.util.Map;
 @Slf4j
 @Component
 public class CategoryDao {
-	static String K3CloudURL = "http://192.168.1.32/k3cloud/";//指定地址
+	static String K3CloudURL = "http://1ar8696937.iok.la/k3cloud/";//指定地址
 	static String dbId = "60ef9f7f48f36d";
 	static String uid = "Administrator";
 	static String pwd = "Kingdee$2021";
@@ -27,7 +27,7 @@ public class CategoryDao {
 				if (where!=null){
 					where = where + " AND " + key + "=" + value;
 				}else {
-					where = key + "=" + value;
+					where = key + "='" + value+"'";
 				}
 			}
 		}
@@ -53,6 +53,7 @@ public class CategoryDao {
 		}
 		return "";
 	}
+
 	/**
 	 * 查询单据体
 	 * @return
@@ -60,18 +61,24 @@ public class CategoryDao {
 	 */
 	K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
 	public List<List<Object>> select(String sFormId, Map<String,Object> key,Map<String,Object> where){
+		List<List<Object>> list = null;
 		try {
 			Boolean result = client.login(dbId, uid, pwd, lang);
 		if(result){
-				String content = "{\"FormId\":\""+sFormId+"\","+Stringkey(key)+"}";
-				List<List<Object>> list = client.executeBillQuery(content);
-				return list;
+			String content;
+			if(where!=null){
+				content= "{\"FormId\":\""+sFormId+"\","+Stringkey(key)+Stringwhere(where)+"}";
+			}else{
+			    content = "{\"FormId\":\""+sFormId+"\","+Stringkey(key)+"}";
 			}
+			    list = client.executeBillQuery(content);
+		}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return null;
+		return list;
 	}
+
 	public String add(String sFormId,String json) {
 		String result2 = null;
 		try {
@@ -85,4 +92,5 @@ public class CategoryDao {
 		}
 		return result2;
 	}
+
 }
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/MaterialinventoryApi.java

@@ -6,6 +6,7 @@ import org.jeecg.modules.iost.API.ExternalInterface.Interface.API;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -14,14 +15,13 @@ import java.util.Map;
  */
 @Service
 public class MaterialinventoryApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
-    Map<String,String> hreader ;
+    Map<String,String> hreader = new HashMap<>();
 
     @Override
     public String add(Map<String,Object> map) {
         String result = HttpUtils.postRequest(url, hreader,null);
-        
         return result;
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/PhysicalIDApi.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 @Component
 public class PhysicalIDApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
     Map<String,String> hreader = new HashMap<>();
     public PhysicalIDApi(){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/ProductInventoryApi.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 @Component
 public class ProductInventoryApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
     Map<String,String> hreader ;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/ProductionOrderApi.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 @Component
 public class ProductionOrderApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
     Map<String,String> hreader ;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/ProductionSchedulingApi.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 @Component
 public class ProductionSchedulingApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
     Map<String,String> hreader ;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/PurchaseorderApi.java

@@ -12,7 +12,7 @@ import java.util.Map;
 
 @Component
 public class PurchaseorderApi implements API {
-    private String url = "http://192.168.136.1:8080/wmssystem/API/supplier-send/";
+    private String url = "http:///www.lingqingkeji.com/wmssystem/API/supplier-send/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String, Object>>();
     private Map<String, String> hreader = new HashMap<>();
     public PurchaseorderApi(){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/ReportWorkApi.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 @Component
 public class ReportWorkApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
     Map<String,String> hreader ;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/ReserveStockApi.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 @Component
 public class ReserveStockApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
     Map<String,String> hreader ;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/SalesOrderApi.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 @Component
 public class SalesOrderApi implements API {
-    private String url = "http://192.168.150.1:8080/wmssystem/API/supplier-so/";
+    private String url = "http:///www.lingqingkeji.com/wmssystem/API/supplier-so/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String, Object>>();
     private Map<String, String> hreader = new HashMap<>();
     public SalesOrderApi(){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/SupplyListIApi.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 @Component
 public class SupplyListIApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
     Map<String,String> hreader ;
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/WorkOrderApi.java

@@ -15,7 +15,7 @@ import java.util.Map;
  */
 @Component
 public class WorkOrderApi implements API {
-    private String url = "http://192.168.1.19:8080/wmssystem/API/eip-prod-store/";
+    private String url = "http://www.lingqingkeji.com/wmssystem/API/eip-prod-store/";
     private List<Map<String, Object>> lists = new ArrayList<Map<String,Object>>();
     Map<String,String> hreader = new HashMap<>();
     public WorkOrderApi(){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/MaterialinventoryController.java

@@ -57,7 +57,7 @@ public class MaterialinventoryController {
      */
     @GetMapping(value = "/selectwebapi")
     public Result<?> selectwebapi(@RequestBody Map<String,Object> map){
-        List<List<Object>> list = materialinventoryWebapi.select(map);
+        List<Map<String, Object>> list = materialinventoryWebapi.select(map,null);
         return Result.OK(list);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/PhysicalIDController.java

@@ -54,7 +54,7 @@ public class PhysicalIDController {
      */
     @GetMapping(value = "/selectwebapi")
     public Result<?> selectwebapi(@RequestBody Map<String,Object> map){
-        List<List<Object>> list = physicalIDWebapi.select(map);
+        List<Map<String, Object>>list = physicalIDWebapi.select(map,null);
         return Result.OK(list);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/ProductInventoryController.java

@@ -55,7 +55,7 @@ public class ProductInventoryController {
      */
     @GetMapping(value = "/selectwebapi")
     public Result<?> selectwebapi(@RequestBody Map<String,Object> map){
-        List<List<Object>> list = productInventoryWebapi.select(map);
+        List<Map<String, Object>>list = productInventoryWebapi.select(map,null);
         return Result.OK(list);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/ProductionOrderController.java

@@ -59,7 +59,7 @@ public class ProductionOrderController {
      */
     @GetMapping(value = "/selectwebapi")
     public Result<?> selectwebapi(@RequestBody Map<String,Object> map){
-        List<List<Object>> list = productionOrderWebapi.select(map);
+        List<Map<String, Object>>list = productionOrderWebapi.select(map,null);
         return Result.OK(list);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/ReserveStockController.java

@@ -56,7 +56,7 @@ public class ReserveStockController {
      */
     @GetMapping(value = "/selectwebapi")
     public Result<?> selectwebapi(@RequestBody Map<String,Object> map){
-        List<List<Object>> list = reserveStockWebapi.select(map);
+        List<Map<String, Object>>list = reserveStockWebapi.select(map,null);
         return Result.OK(list);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/SalesOrderController.java

@@ -26,7 +26,7 @@ public class SalesOrderController {
     SalesOrderWebapi salesOrderWebapi;
     /**
      *   销售订单-新增
-     * @param object
+     * @param map
      * @return
      */
     @PostMapping(value = "/add")
@@ -40,12 +40,17 @@ public class SalesOrderController {
      */
     @GetMapping(value = "/select")
     public Result<?> select(@RequestBody Map<String,Object> map){
-        JSONObject jsonObject = salesOrderService.select(map);
+        List<Map<String, Object>>jsonObject = salesOrderWebapi.select(null,null);
         return Result.OK(jsonObject);
     }
     @GetMapping(value = "/selectweb")
     public Result<?> selectweb(@RequestBody Map<String,Object> map){
-        List<List<Object>> list = salesOrderWebapi.select(map);
-        return Result.OK(list);
+        salesOrderService.synchronization(map);
+        return Result.OK("成功");
+    }
+
+    @PostMapping(value = "/synchronization")
+    public Result<?> synchronization(){
+        return Result.OK( salesOrderService.synchronization(null));
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/SupplyListController.java

@@ -56,7 +56,7 @@ public class SupplyListController {
      */
     @GetMapping(value = "/selectwebapi")
     public Result<?> selectwebapi(@RequestBody Map<String,Object> map){
-        List<List<Object>> list = supplyListWebapi.select(map);
+        List<Map<String, Object>>list = supplyListWebapi.select(map,null);
         return Result.OK(list);
     }
 }

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

@@ -12,6 +12,7 @@ import org.jeecg.modules.iost.API.webapi.SalesOrderWebapi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -62,8 +63,8 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, Salesor
      */
     @Override
     public Salesordererror synchronization(Object object) {
-        String rsapi = salesOrderApi.select();
-        String rswebapi =  salesOrderWebapi.add(object);
+        List<Map<String, Object>> list =  salesOrderWebapi.select(null,null);
+        String rs = salesOrderApi.add(list.get(0));
         return null;
     }
 }

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

@@ -6,7 +6,7 @@ import java.util.Map;
 public interface web_api {
     public String add(Object object);
 
-    public List<List<Object>> select(Map<String,Object> map);
+    public List<Map<String,Object>> select(Map<String,Object> map,String where);
 
     public String update(Object object);
 }

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

@@ -26,10 +26,9 @@ public class MaterialinventoryWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        Map<String, Object> where = new HashMap<>();
-        where.put("F_LQKJ_ISIMPORTENT",1);
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -25,8 +25,9 @@ public class PhysicalIDWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -25,8 +25,9 @@ public class ProductInventoryWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -25,8 +25,9 @@ public class ProductionOrderWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -23,8 +23,9 @@ public class ProductionSchedulingWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -24,8 +24,9 @@ public class PurchaseordererrorWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -25,8 +25,9 @@ public class ReportWorkWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -25,8 +25,9 @@ public class ReserveStockWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -8,6 +8,8 @@ import org.jeecg.modules.iost.API.webapi.Interface.web_api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -21,6 +23,15 @@ import java.util.Map;
 public class SalesOrderWebapi implements web_api {
     /**操作的单据体名称*/
     private String sFormId = "SAL_SaleOrder";
+    private Map<String,Object> key = new HashMap<>();
+    public SalesOrderWebapi(){
+        /*查询字段*/
+        key.put("FQTY","FQTY");//物料数量
+        key.put("FBILLNO","FBILLNO");//单据编码
+        key.put("FUNITID","FUNITID");//销售单位
+        key.put("FMATERIALID","FMATERIALID");//物料编码
+        key.put("FDATE","FDATE");//时间
+    }
     @Autowired
     private CategoryDao categoryDao;
     @Override
@@ -30,10 +41,28 @@ public class SalesOrderWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String,Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        List<List<Object>> list =categoryDao.select(sFormId,key,new HashMap<String,Object>(){{put("FBILLNO","SEORD129976");}});
+        return SalesOrder(list);
     }
 
+    /**
+     * 销售订单字段转换国网字段
+     * @return
+     */
+    private List<Map<String,Object>>  SalesOrder(List<List<Object>> list){
+        List<Map<String,Object>> salesorderlist = new ArrayList<>();
+        for (List<Object> list1:list) {
+            Map<String,Object> salesordermap = new HashMap<>();
+            salesordermap.put("productAmount",list1.get(0));
+            salesordermap.put("soNo",list1.get(1));
+            salesordermap.put("FUNITID",list1.get(2));
+            salesordermap.put("productCode",list1.get(3));
+            salesordermap.put("dataSourceCreateTime",list1.get(4));
+            salesorderlist.add(salesordermap);
+        }
+        return salesorderlist;
+    }
     @Override
     public String update(Object object) {
         return null;

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

@@ -25,8 +25,9 @@ public class SupplyListWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
-        return categoryDao.select(sFormId,map,null);
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
+        categoryDao.select(sFormId,map,null);
+        return null;
     }
 
     @Override

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

@@ -30,9 +30,7 @@ public class FieldConversion {
         mapwebapi.put("F_PAEZ_Combo2","A");
         mapwebapi.put("F_PAEZ_Combo3","D");
         mapwebapi.put("F_PAEZ_Combo31","F");
-        Map<String,Object> F_PAEZ_Base2 = new HashMap<>();
-        F_PAEZ_Base2.put("FNUMBER","001");
-        mapwebapi.put("F_PAEZ_Base2",F_PAEZ_Base2);
+        mapwebapi.put("F_PAEZ_Base2",new HashMap<String, String>() {{ put("FNUMBER","001");}});
         mapwebapi.put("F_PAEZ_Base3",new HashMap<String, String>() {{ put("FNUMBER","002");}});
         mapwebapi.put("F_PAEZ_Base4",new HashMap<String, String>(){{put("FSTAFFNUMBER","001");}});
         mapwebapi.put("F_CYGC_Base",new HashMap<String, String>() {{ put("FNUMBER","0000");}});

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

@@ -15,7 +15,7 @@ public class WorkOrderWebapi implements web_api {
     }
 
     @Override
-    public List<List<Object>> select(Map<String, Object> map) {
+    public List<Map<String,Object>>select(Map<String,Object> map,String where) {
         return null;
     }