调仓单号相关问题处理

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalDetailsServiceImpl.java

@@ -62,8 +62,12 @@ public class AbnormalDetailsServiceImpl extends ServiceImpl<AbnormalDetailsMappe
         if (ObjectUtil.isEmpty(status)) {
             throw new ServiceException("处理状态不能为空");
         }
-        AbnormalInfo abnormalInfo = new AbnormalInfo();
-        abnormalInfo.setId(abnormalInfoId);
+//        AbnormalInfo abnormalInfo = new AbnormalInfo();
+//        abnormalInfo.setId(abnormalInfoId);
+        AbnormalInfo abnormalInfo = abnormalInfoService.getById(abnormalInfoId);
+        if(ObjectUtil.isEmpty(abnormalInfo)){
+            throw new ServiceException("无法查询到异常记录信息");
+        }
         abnormalInfo.setLinkCode(CodeEnum.ABNORMAL.getCode());
         abnormalInfo.setStatus(status == 1 ? 2 : 1);//如果跟进记录为已处理修改异常状态为已处理要不然跟进中
         abnormalInfo.setHandleUser(abnormalDetailsDto.getHandleUser());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -275,7 +275,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         //创建京东订单调仓
         StockTransfer stockTransfer = new StockTransfer();
         stockTransfer.setType(2);//京东订单出库
-        stockTransfer.setCode(CodeEnum.STOCK_TRANSFER_WDLY.getCode());
+        stockTransfer.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockTransfer.setBusinessId(jdOrder.getId());
         stockTransfer.setBusinessCode(jdOrder.getCode());
         stockTransfer.setInWarehouseId(jdOrderDto.getInWarehouseId());
@@ -373,7 +373,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         StockJournal stockJournal = new StockJournal();
         stockJournal.setOpType(1);
         stockJournal.setType(JournalType.ADJUSTING_IN.getDetailType());
-        stockJournal.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
+        stockJournal.setCode(stockTransfer.getCode());
         stockJournal.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal.setBusinessId(stockTransfer.getId());
@@ -384,7 +384,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         StockJournal stockJournal1 = new StockJournal();
         stockJournal1.setOpType(2);
         stockJournal1.setType(JournalType.ADJUSTING_OUT.getDetailType());
-        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
+        stockJournal1.setCode(stockTransfer.getCode());
         stockJournal1.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal1.setBusinessId(stockTransfer.getId());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/stock/impl/StockTransferServiceImpl.java

@@ -118,7 +118,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         Assert.notEmpty(stockTransferDto.getInWarehouseId(),"入库仓库不能为空");
         Assert.notEmpty(stockTransferDto.getStockTransferDetailsList(),"调仓明细不能为空");
 
-        stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER_WDLY.getCode());
+        stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockTransferDto.setType(1);
         stockTransferDto.setInStatus(0);
         this.save(stockTransferDto);
@@ -195,7 +195,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         StockJournal stockJournal = new StockJournal();
         stockJournal.setOpType(1);
         stockJournal.setType(JournalType.ADJUSTING_IN.getDetailType());
-        stockJournal.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
+        stockJournal.setCode(stockTransfer.getCode());
         stockJournal.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal.setBusinessId(stockTransfer.getId());
@@ -206,7 +206,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         StockJournal stockJournal1 = new StockJournal();
         stockJournal1.setOpType(2);
         stockJournal1.setType(JournalType.ADJUSTING_OUT.getDetailType());
-        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
+        stockJournal1.setCode(stockTransfer.getCode());
         stockJournal1.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal1.setBusinessId(stockTransfer.getId());
@@ -231,7 +231,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         Assert.notEmpty(stockTransferDto.getInWarehouseId(),"入库仓库不能为空");
         Assert.notEmpty(stockTransferDto.getStockTransferDetailsList(),"调仓明细不能为空");
 
-        stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER_WDLY.getCode());
+        stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockTransferDto.setType(1);
         stockTransferDto.setInStatus(2);//已接收
         this.save(stockTransferDto);
@@ -252,11 +252,12 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
         //创建出库记录
         StockJournal stockJournal = new StockJournal();
-        stockJournal.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
+        stockJournal.setCode(stockTransferDto.getCode());
         stockJournal.setOpType(2);//出库
         stockJournal.setType(JournalType.ADJUSTING_OUT.getDetailType());//调仓入库
         stockJournal.setWarehouseId(stockTransferDto.getOutWarehouseId());
-//        stockJournal.setToWarehouseId(stockDto.getToWarehouseId());
+        stockJournal.setBusinessId(stockTransferDto.getId());
+        //        stockJournal.setToWarehouseId(stockDto.getToWarehouseId());
         //保存出入库记录
         stockJournalService.save(stockJournal);
         //操作库存
@@ -266,7 +267,8 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
         //创建入库记录
         StockJournal stockJournal1 = new StockJournal();
-        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
+        stockJournal1.setCode(stockTransferDto.getCode());
+        stockJournal.setBusinessId(stockTransferDto.getId());
         stockJournal1.setOpType(1);//入库
         stockJournal1.setType(JournalType.ADJUSTING_IN.getDetailType());//调仓出库
         stockJournal1.setWarehouseId(stockTransferDto.getInWarehouseId());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/utils/CodeEnum.java

@@ -19,18 +19,14 @@ import java.util.Map;
 @Getter
 public enum CodeEnum {
 
-    // 调仓出入库记录
-    STOCK_TRANSFER_J("SM", "yyMM-", "code", 3, StockJournalService.class),
-    //调仓 维多利亚
-    STOCK_TRANSFER_WDLY("SM", "yyMM-", "code", 3, StockTransferService.class),
-
+    //调仓
+    STOCK_TRANSFER("SM", "yyMM-", "code", 3, StockTransferService.class),
     // 销售订单
     ORDER_SALES("SO", null, "code", 5, OrderInfoService.class),
     //京东退货质检
     JD_BACK_QUALITY("PA", "yyMM-", "code", 3, StockTransferService.class),
-
-    ABNORMAL("PO", "yyMM-", "code", 3, StockTransferService.class),
-            ;
+    //异常记录
+    ABNORMAL("PO", "yyMM-", "code", 3, StockTransferService.class);
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
         this.prefix = prefix;

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -542,12 +542,12 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 stockJournal.setCode(CodeEnum.SOUT_CODE.getCode());
                 break;
             case 3:
-                stockJournal.setOpType(1);//入库
-                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());//调仓入库
+                stockJournal.setOpType(1);//调仓入库
+//                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());//调仓入库
                 break;
             case 11:
-                stockJournal.setOpType(2);//出库
-                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());//调仓出库
+                stockJournal.setOpType(2);//调仓出库
+//                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());//调仓出库
                 break;
 
         }

hx-wms/src/main/java/com/fjhx/wms/utils/CodeEnum.java

@@ -19,8 +19,6 @@ public enum CodeEnum {
 
     //盘点
     CHECK_CODE("SC", "-yyMM-", "code", 3, StockCheckServiceImpl.class),
-    //调仓
-    STOCK_TRANSFER("SC", "-yyMM-", "code", 3, StockJournalServiceImpl.class),
     //出入库入库
     SIN_CODE("SI", "-yyMM-", "code", 3, StockJournalServiceImpl.class),
     //出入库出库