Forráskód Böngészése

1.wmes系统对接

wzh 1 éve
szülő
commit
b323dfc01d

+ 6 - 2
src/main/java/com/qlm/service/UploadService.java

@@ -58,10 +58,14 @@ public class UploadService {
 			}
 		}
 		Set<Entry<String,JSONObject>> entrySet = masterMap.entrySet();
-		List<Record> find = Db.find("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id from t_jz_item i left join t_jz_product p on (i.product_id = p.id)");
+		List<Record> find = Db.find("SELECT i.sku,i.kouwei,p.product_name,i.id,i.product_id from t_jz_item i left join t_jz_product p on (i.product_id = p.id) where sku is not null");
 		
-		Map<String, Record> skuMap = find.stream().collect(Collectors.toMap(r->r.getStr("sku"), r->r));
+		Map<String, Record> skuMap =new HashMap<String, Record>();
 		
+		for (Record record : find) {
+			String sku = record.getStr("sku");
+			skuMap.put(sku, record);
+		}
 		for (Entry<String, JSONObject> entry : entrySet) {
 			String master = entry.getKey();
 			JSONObject jsonObject = entry.getValue();

+ 6 - 2
src/main/java/com/qlm/service/WmesService.java

@@ -1,5 +1,6 @@
 package com.qlm.service;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -38,6 +39,7 @@ public class WmesService {
 		
 		
 		JSONArray header = new JSONArray();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
 		
 		data.put("header", header);
 		StringBuilder sb = new StringBuilder();
@@ -53,10 +55,12 @@ public class WmesService {
 			String duo_code = record.getStr("duo_code");
 			
 			
-			String pinxiang = record.getStr("pinxiang");
+			String pinxiang = record.getStr("sku");
 			
 			Date guo_time = record.getDate("guo_time");
 			
+			String format = sdf.format(guo_time);
+			
 			JSONObject obj1 = new JSONObject();
 			
 			obj1.put("warehouseid", "JZPJ");
@@ -69,7 +73,7 @@ public class WmesService {
 			
 			obj1.put("traceId", duo_code);//托盘码
 			
-			obj1.put("addtime", guo_time);//关联时间
+			obj1.put("addtime", format);//关联时间
 			obj1.put("udf06", "tm");
 			header.add(obj1);
 		}