1.入库通知,生产日期不对的问题 提交

src/main/java/com/neotel/smfcore/custom/haier1560/Haier1560Api.java

@@ -2,16 +2,23 @@ package com.neotel.smfcore.custom.haier1560;
 
 
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.DateUtil;
+import com.neotel.smfcore.common.utils.HttpHelper;
+import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.api.bean.ApiResult;
 import com.neotel.smfcore.core.api.bean.CodeValidateParam;
 import com.neotel.smfcore.core.api.bean.CodeValidateParam;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.custom.neotel.NeotelApi;
 import com.neotel.smfcore.custom.neotel.NeotelApi;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 
+@Slf4j
 @Component
 @Component
 public class Haier1560Api extends NeotelApi {
 public class Haier1560Api extends NeotelApi {
 
 
@@ -22,7 +29,41 @@ public class Haier1560Api extends NeotelApi {
 
 
     @Override
     @Override
     public void inTaskStatusChange(String inNotifyUrl, DataLog task) {
     public void inTaskStatusChange(String inNotifyUrl, DataLog task) {
-        super.inTaskStatusChange(inNotifyUrl, task);
+        String requestParams = "";
+        String responseInfo = "";
+        if (task.isFinished()) {
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("reelId", task.getBarcode());
+            paramMap.put("location", task.getPosName());
+            paramMap.put("source", "SMF");
+            paramMap.put("fullCode", "");
+            paramMap.put("partNum", "");
+            paramMap.put("vendor", "");
+            paramMap.put("qty", 0);
+            paramMap.put("produceDate", "");
+            paramMap.put("batch", "");
+            Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
+            if (barcode != null) {
+                paramMap.put("fullCode", barcode.getFullCode());
+                paramMap.put("partNum", barcode.getPartNumber());
+                paramMap.put("vendor", barcode.getProvider());
+                paramMap.put("qty", barcode.getAmount());
+                if (barcode.getProduceDate() != null){
+                    paramMap.put("produceDate", DateUtil.toDateString(barcode.getProduceDate(),"yyyy-MM-dd HH:mm:ss"));
+                }
+                paramMap.put("batch", barcode.getBatch());
+            }
+            try {
+                requestParams = JsonUtil.toJsonStr(paramMap);
+                log.info(task.getBarcode() + "入库通知,参数" + requestParams);
+                responseInfo = HttpHelper.postJson(inNotifyUrl, paramMap);
+                log.info(task.getBarcode() + "入库通知返回" + responseInfo);
+                ApiResult apiResult = JsonUtil.toObj(responseInfo, ApiResult.class);
+
+            } catch (Exception e) {
+                log.error("入库通知接口出错:" + e.getMessage());
+            }
+        }
     }
     }
 
 
     @Override
     @Override