优化

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -417,6 +417,13 @@ public class Barcode extends BasePo implements Serializable {
 
 
     }
     }
 
 
+    public void setPutInTime(long putInTime,boolean needUpdateTime) {
+        this.putInTime = putInTime;
+        this.putInDate = new Date(putInTime);
+        status = BARCODE_STATUS.IN_STORE;
+        updateExpTime();
+    }
+
 
 
     public Date getPutInDate() {
     public Date getPutInDate() {
         return putInDate;
         return putInDate;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AgvDeviceController.java

@@ -187,6 +187,7 @@ public class AgvDeviceController {
     private void finishedOutTask(DataLog queueTask){
     private void finishedOutTask(DataLog queueTask){
 
 
         Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
         Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
+
         //通知WMS
         //通知WMS
         PalletUpdateRequest palletUpdateRequest = new PalletUpdateRequest();
         PalletUpdateRequest palletUpdateRequest = new PalletUpdateRequest();
         palletUpdateRequest.setREQUEST_ID(System.currentTimeMillis()+"");
         palletUpdateRequest.setREQUEST_ID(System.currentTimeMillis()+"");
@@ -227,22 +228,12 @@ public class AgvDeviceController {
     private void finishedPutInTask(DataLog queueTask){
     private void finishedPutInTask(DataLog queueTask){
 
 
         Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
         Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
-        //通知WMS
-        PalletUpdateRequest palletUpdateRequest = new PalletUpdateRequest();
-        palletUpdateRequest.setREQUEST_ID(System.currentTimeMillis()+"");
-        palletUpdateRequest.setPALLET_LIST(Lists.newArrayList(barcode.getPalletId()));
-        //上架是SWC, 下架是SWCT
-        palletUpdateRequest.setBIN_CODE("SWC");
-        palletUpdateRequest.setBIZ_TYPE("M");
-        palletUpdateRequest.setPLANT_CODE(CommonUtil.plantCode);
-        LuxsanApi.palletUpdate(palletUpdateRequest);
-
 
 
         //已完成,加入库存,并且从完成队列中清除
         //已完成,加入库存,并且从完成队列中清除
         StoragePos storagePos = storagePosManager.get(queueTask.getPosId());
         StoragePos storagePos = storagePosManager.get(queueTask.getPosId());
         if (barcode != null) {
         if (barcode != null) {
             barcode.setUsedCount(barcode.getUsedCount() + 1);
             barcode.setUsedCount(barcode.getUsedCount() + 1);
-            barcode.setPutInTime(System.currentTimeMillis());
+            barcode.setPutInTime(System.currentTimeMillis(),true);
             barcode.setInOpor("");
             barcode.setInOpor("");
             barcode.setCheckOutDate(null, "");
             barcode.setCheckOutDate(null, "");
             barcode.setPosName(queueTask.getPosName());
             barcode.setPosName(queueTask.getPosName());

src/main/resources/config/application-21088prod.yml

@@ -10,7 +10,7 @@ api:
   cancelOdn: http://10.68.27.86/smf-core/cancelRestock/cancelOdn
   cancelOdn: http://10.68.27.86/smf-core/cancelRestock/cancelOdn
 
 
   #禁用料
   #禁用料
-  inCheckUrl: http://10.190.25.124:8001/Npm/WmsCheckReelfob
+  inCheckUrl: http://10.68.25.40:8001/Npm/WmsCheckReelfob
 
 
   #储位查询
   #储位查询
   queryBin: http://10.68.30.22:8082/api/mlb/QueryBin
   queryBin: http://10.68.30.22:8082/api/mlb/QueryBin