出库通知mes 修改

src/main/java/com/neotel/smfcore/custom/lizhen/LizhenApi.java

@@ -347,17 +347,37 @@ public class LizhenApi extends DefaultSmfApiListener {
     public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
     public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
 
 
         if (task.isFinished()) {
         if (task.isFinished()) {
+            List<Map<String, Object>> paramList = new ArrayList<>();
+
             Storage storage = dataCache.getStorage(task.getCid());
             Storage storage = dataCache.getStorage(task.getCid());
             Map<String, Object> paramMap = new HashMap<>();
             Map<String, Object> paramMap = new HashMap<>();
-            paramMap.put("machineid", storage.getMachineId());
-            paramMap.put("reelno", task.getBarcode());
-            paramMap.put("line", task.getLine());
-            paramMap.put("partno", task.getPartNumber());
-            paramMap.put("qty", task.getNum());
-            paramMap.put("issuetime", task.getUpdateDate());
-            log.info("出库通知入参为:" + JSON.toJSONString(paramMap));
+            paramMap.put("line",task.getLine());
+            paramMap.put("mc_id",storage.getMachineId());
+            paramMap.put("reel_id",task.getBarcode());
+            paramMap.put("ipn",task.getPartNumber());
+            paramMap.put("qty",task.getNum());
+
+            //发料类型(0:智能仓1:虚拟仓2:物料预警3：手动发料)
+            int type = 0;
+            if (StringUtils.isNotEmpty(task.getSourceId())) {
+                type = 2;
+            } else {
+                if (storage.isVirtual()) {
+                    type = 1;
+                } else {
+                    type = 3;
+                }
+            }
+
+            paramMap.put("gi_type",type);
+            paramMap.put("create_empno",StringUtils.isEmpty(task.getCreator()) ? "System" : task.getCreator());
+            paramMap.put("create_time",task.getCreateDate());
+
+            paramList.add(paramMap);
+            log.info("出库通知入参为:" + JSON.toJSONString(paramList));
+
             try {
             try {
-                String result = HttpHelper.postJson(outNotifyUrl, paramMap);
+                String result = HttpHelper.postJson(outNotifyUrl, paramList);
                 log.info(task.getBarcode() + "出入库通知返回结果为:" + result);
                 log.info(task.getBarcode() + "出入库通知返回结果为:" + result);
             } catch (ApiException e) {
             } catch (ApiException e) {
                 e.printStackTrace();
                 e.printStackTrace();