禁用料展示

src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java

@@ -10,6 +10,7 @@ import com.neotel.smfcore.common.utils.HttpHelper;
 import com.neotel.smfcore.common.utils.JsonUtil;
 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.listener.DefaultSmfApiListener;
 import com.neotel.smfcore.core.api.listener.DefaultSmfApiListener;
+import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
@@ -38,6 +39,13 @@ public class LuxsanApi extends DefaultSmfApiListener {
     @Autowired
     @Autowired
     private KafkaService kafkaService;
     private KafkaService kafkaService;
 
 
+    private static IBarcodeManager barcodeManager;
+
+    @Autowired
+    private void setBarcodeManager(IBarcodeManager manager){
+        LuxsanApi.barcodeManager = manager;
+    }
+
     @Override
     @Override
     public void inTaskStatusChange(String inNotifyUrl, DataLog task) {
     public void inTaskStatusChange(String inNotifyUrl, DataLog task) {
         if (task.isFinished()){
         if (task.isFinished()){
@@ -957,16 +965,18 @@ public class LuxsanApi extends DefaultSmfApiListener {
         }
         }
 
 
         //保存禁用料记录
         //保存禁用料记录
-        /*Barcode barcodeOri = barcodeManager.findByBarcode(barcode.getBarcode());
-        if (barcodeOri != null){
+        Barcode barcodeOri = barcodeManager.findByBarcode(barcode.getBarcode());
+        if (barcodeOri != null) {
+            if (StringUtils.isNotEmpty(resultStr)) {
                 barcodeOri.setDisableMsg(resultStr);
                 barcodeOri.setDisableMsg(resultStr);
-            barcode = barcodeManager.save(barcodeOri);
-            StoragePos storagePos = storagePosManager.getByBarcode(barcode.getBarcode());
-            if (storagePos != null){
-                storagePos.setBarcode(barcode);
-                storagePosManager.save(storagePos);
+                barcodeManager.save(barcodeOri);
+            } else {
+                if (StringUtils.isNotEmpty(barcodeOri.getDisableMsg())) {
+                    barcodeOri.setDisableMsg("");
+                    barcodeManager.save(barcodeOri);
+                }
+            }
         }
         }
-        }*/
 
 
         if (StringUtils.isNotBlank(resultStr)) {
         if (StringUtils.isNotBlank(resultStr)) {
             throw new ValidateException("smfcore.mesApi.inCheck.ng", /*"MES验证失败:" + */barcode.getBarcode() + "验证失败:" + resultStr);
             throw new ValidateException("smfcore.mesApi.inCheck.ng", /*"MES验证失败:" + */barcode.getBarcode() + "验证失败:" + resultStr);
@@ -1163,6 +1173,19 @@ public class LuxsanApi extends DefaultSmfApiListener {
         } catch (Exception e){
         } catch (Exception e){
             log.info("批量禁用接口调用失败:"+e.getMessage());
             log.info("批量禁用接口调用失败:"+e.getMessage());
         }
         }
+
+        for (Barcode barcode : barcodeList) {
+            if(reelList.contains(barcode.getBarcode())) {
+                barcode.setDisableMsg("禁用料");
+                barcodeManager.save(barcode);
+            } else {
+                if (StringUtils.isNotEmpty(barcode.getDisableMsg())) {
+                    barcode.setDisableMsg("");
+                    barcodeManager.save(barcode);
+                }
+            }
+        }
+
         return reelList;
         return reelList;
     }
     }