1.自动推送odn切到正式环境

2.推送记录增加已取消和库别

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/bean/AutoStoOdn.java

@@ -16,5 +16,5 @@ public class AutoStoOdn extends BasePo {
     private String sto;
     private String odn;
     private String warehouse = "W101";
-    private int status = 0; //0:未开始 1:正在执行中 2:已完成
+    private int status = 0; //0:未开始 1:正在执行中 2:已完成 3:已取消
 }

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

@@ -6,12 +6,15 @@ import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
+import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
+import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.AutoStoRequest;
 import com.neotel.smfcore.custom.luxsan.api.bean.result.AutoStoResult;
 import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.service.manager.IAutoStoOdnManager;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +43,9 @@ public class AutoDispatchInfoController {
     @Autowired
     private IBarcodeManager barcodeManager;
 
+    @Autowired
+    private IAutoStoOdnManager autoStoOdnManager;
+
     @ApiOperation("手动解除绑定信息")
     @RequestMapping("/removeBindOdn")
     @AnonymousAccess
@@ -49,12 +55,22 @@ public class AutoDispatchInfoController {
             if (pos != null) {
                 Barcode barcode = pos.getBarcode();
                 if (barcode != null){
+                    String odn = barcode.getOdn();
                     barcode.setCurrentRequestId("");
                     barcode.setOdn("");
                     barcode.setSto("");
                     barcodeManager.save(barcode);
                     pos.setBarcode(barcode);
                     storagePosManager.save(pos);
+
+                    //同时更新autoStoOdn信息
+                    if (StringUtils.isNotEmpty(odn)){
+                        LiteOrder liteOrder = new LiteOrder();
+                        liteOrder.setOrderNo(odn);
+                        liteOrder.setStatus(LITEORDER_STATUS.PAUSE);
+                        autoStoOdnManager.updateOdnStatus(liteOrder, LITEORDER_STATUS.PAUSE);
+                    }
+
                 }
             }
         }

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

@@ -236,6 +236,7 @@ public class AutoDispatchInventoryController {
                 autoStoOdn.setModel(autoStoRequest.getModel());
                 autoStoOdn.setSto(autoStoResult.getDETAIL());
                 autoStoOdn.setOdn(autoStoResult.getDATA());
+                autoStoOdn.setWarehouse(autoStoRequest.getWarehouse_code());
                 autoStoOdnManager.save(autoStoOdn);
                 log.info("【自动出库】保存ODN记录成功：{}", JSON.toJSONString(autoStoOdn));
             }

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

@@ -86,6 +86,8 @@ public class AutoStoOdnController {
                             data.add("正在执行");
                         } else if (autoStoOdn.getStatus() == 2){
                             data.add("已完成");
+                        } else if (autoStoOdn.getStatus() == 3){
+                            data.add("已取消");
                         }
                         dataList.add(data);
                     }

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

@@ -170,7 +170,10 @@ public class PnPriorityMtController {
             return ResultBean.newErrorResult(-1,"","请检查是否有空值或者出库数量和优先级不是数字");
         }
         for (PnPriorityMt pnPriorityMt : pnPriorityMtList) {
-            PnPriorityMt mt = pnPriorityMtManager.findOne(new Query(Criteria.where("partNumber").is(pnPriorityMt.getPartNumber()).and("modelFamily").is(pnPriorityMt.getModelFamily())));
+            PnPriorityMt mt = pnPriorityMtManager.findOne(new Query(Criteria.where("partNumber").is(pnPriorityMt.getPartNumber())
+                    .and("modelFamily").is(pnPriorityMt.getModelFamily())
+                    .and("warehouse").is(pnPriorityMt.getWarehouse()))
+            );
             if (mt != null){
                 pnPriorityMt.setId(mt.getId());
                 pnPriorityMt.setCreateDate(mt.getCreateDate());

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/service/manager/impl/AutoStoOdnManagerImpl.java

@@ -64,6 +64,8 @@ public class AutoStoOdnManagerImpl implements IAutoStoOdnManager {
                 autoStoOdnDao.updateFirst(new Query(Criteria.where("odn").is(order.getOrderNo())), Update.update("status", 1));
             } else if (order.isClosed()){
                 autoStoOdnDao.updateFirst(new Query(Criteria.where("odn").is(order.getOrderNo())), Update.update("status", 2));
+            } else if (order.getStatus() == LITEORDER_STATUS.PAUSE){
+                autoStoOdnDao.updateFirst(new Query(Criteria.where("odn").is(order.getOrderNo())), Update.update("status", 3));
             }
         }catch (Exception e){
             log.error(e.getMessage());

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

@@ -189,4 +189,4 @@ api:
   ticketGbPost: http://10.68.30.22:8082/api/mlb/TicketGbPost
 
   #自动抛送信息,生成odn
-  autoSto: http://10.42.220.171:8082/api/mlb/AutoSto
+  autoSto: http://10.68.30.22:8082/api/mlb/AutoSto