1.南瑞多个入库单相同数据合并

2.入库时,如果入库单数据不为空,任务增加入库单号
3.入库单状态更新修改

src/main/java/com/neotel/smfcore/core/inList/util/InListCache.java

@@ -129,7 +129,7 @@ public class InListCache {
 
 
         for (InListItem item : inList.getInListItems()
         for (InListItem item : inList.getInListItems()
         ) {
         ) {
-            if (item.getNum() != item.getInNum()) {
+            if (item.getNum() > item.getInNum()) {
                 listOk = false;
                 listOk = false;
                 break;
                 break;
             }
             }

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -941,6 +941,12 @@ public class TaskService {
                 task.setBarcode(barcode.getBarcode());
                 task.setBarcode(barcode.getBarcode());
                 task.setNum(barcode.getAmount());
                 task.setNum(barcode.getAmount());
 
 
+                //如果入库单不为空，设置入库单
+                Storage storage = dataCache.getStorageById(pos.getStorageId());
+                if (storage != null && StringUtils.isNotBlank(storage.getInListName())){
+                    task.setSourceName(storage.getInListName());
+                }
+
                 dataCache.updateInventory(pos, barcode);
                 dataCache.updateInventory(pos, barcode);
                 //dataCache.updateStorage(task.getCid());
                 //dataCache.updateStorage(task.getCid());
 
 

src/main/java/com/neotel/smfcore/custom/iriichi1081/config/IriichiConfig.java

@@ -2,12 +2,10 @@ package com.neotel.smfcore.custom.iriichi1081.config;
 
 
 public class IriichiConfig {
 public class IriichiConfig {
 
 
-    //config name
-    public static final String iriichi_config_name = "app_neotel";
-    public static final String iriichi_crp_config_name = "Neotel@478*";
+    // token url 测试环境
+    //public static final String token_url = "http://192.168.60.249/IDORequestService/MGRestService.svc/json/token/IRIICHI_CRP";
 
 
-    // token url
-    public static final String token_url = "http://192.168.60.249/IDORequestService/MGRestService.svc/json/token/IRIICHI_CRP";
+    public static final String token_url = "http://192.168.60.249/IDORequestService/MGRestService.svc/json/token/IRIICHI";
 
 
     // Job Material Picklist  url  在配置文件中,配置fetchOrderUrl 地址
     // Job Material Picklist  url  在配置文件中,配置fetchOrderUrl 地址
     //public static final String picklist_url = "http://192.168.60.249/IDORequestService/MGRestService.svc/json/IR_SLAPIs/pick_list,job,job_suffix,job_item,job_item_desc,item_code,Rating,workcenter,vendnum,vendor_name,qty_to_pick/adv";
     //public static final String picklist_url = "http://192.168.60.249/IDORequestService/MGRestService.svc/json/IR_SLAPIs/pick_list,job,job_suffix,job_item,job_item_desc,item_code,Rating,workcenter,vendnum,vendor_name,qty_to_pick/adv";

src/main/java/com/neotel/smfcore/custom/nanrui/NanRuiApi.java

@@ -68,8 +68,24 @@ public class NanRuiApi extends BaseSmfApiListener {
                     if (reelCountStr != null && !qtyStr.toString().isEmpty()) {
                     if (reelCountStr != null && !qtyStr.toString().isEmpty()) {
                         item.setInReelCount(Integer.valueOf(reelCountStr.toString()));
                         item.setInReelCount(Integer.valueOf(reelCountStr.toString()));
                     }
                     }
+                    //判断list里边有没有数据
+                    boolean hasSample = false;
+                    for (int i = 0; i < items.size(); i++) {
+                        InListItem listItem = items.get(i);
+                        if (listItem.getPN().equals(item.getPN())){
+                            hasSample = true;
+                            log.info(partNum+"存在相同的partNumber,上一条数量为:"+listItem.getNum()+",当前数量为:"+item.getNum());
+                            listItem.setNum(listItem.getNum() + item.getNum());
+                            //listItem.setInReelCount();
+                            items.set(i,listItem);
+                            log.info(partNum+"合并后的数量为:"+listItem.getNum());
+                        }
+                    }
+
+                    if (!hasSample) {
                         items.add(item);
                         items.add(item);
                     }
                     }
+                }
                 inList.setInListItems(items);
                 inList.setInListItems(items);
                 log.info("获取到入库单:" + inList.getName() + "，共" + items.size() + "条工单详情");
                 log.info("获取到入库单:" + inList.getName() + "，共" + items.size() + "条工单详情");
                 inList = inListManager.createWithItems(inList);
                 inList = inListManager.createWithItems(inList);