Merge branch 'master' of http://106.15.194.121:8083/sunke/smf-core

src/main/java/com/neotel/smfcore/custom/tiantong/TianTongApi.java

@@ -14,6 +14,7 @@ import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
 import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
+import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.custom.tiantong.bean.TianTongResult;
 import com.neotel.smfcore.custom.tiantong.bean.TianTongResult;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -143,6 +144,12 @@ public class TianTongApi extends BaseSmfApiListener {
         Map<String, Object> paramMap = new HashMap<>();
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("RID", barcode.getBarcode());
         paramMap.put("RID", barcode.getBarcode());
         paramMap.put("MTRL_ID", barcode.getPartNumber());
         paramMap.put("MTRL_ID", barcode.getPartNumber());
+        String DEV_ID = "";
+        for (Storage storage : params.getStorageList()) {
+            DEV_ID = storage.getName();
+            break;
+        }
+        paramMap.put("DEV_ID", DEV_ID);
         try {
         try {
             log.info(barcode.getBarcode() + "入库验证,参数" + JsonUtil.toJsonStr(paramMap));
             log.info(barcode.getBarcode() + "入库验证,参数" + JsonUtil.toJsonStr(paramMap));
             String result = HttpHelper.postJson(inCheckUrl, paramMap);
             String result = HttpHelper.postJson(inCheckUrl, paramMap);