Merge remote-tracking branch 'origin/master'

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.getCode());
+        stockTransfer.setCode(CodeEnum.STOCK_TRANSFER_WDLY.getCode());
         stockTransfer.setBusinessId(jdOrder.getId());
         stockTransfer.setBusinessCode(jdOrder.getCode());
         stockTransfer.setInWarehouseId(jdOrderDto.getInWarehouseId());
@@ -301,6 +301,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
     public Page<JdOrderVo> receivePage(JdOrderSelectDto dto) {
         IWrapper<JdOrder> wrapper = getWrapper();
         wrapper.eq("st.in_status", dto.getInStatus());
+        wrapper.orderByDesc("jdo.create_time");
         Page<JdOrderVo> page = this.baseMapper.getReceivePage(dto.getPage(), wrapper);
         List<JdOrderVo> records = page.getRecords();
         // 赋值国省市
@@ -356,6 +357,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
             }
             if(abnormalFlag ==1){
                 AbnormalInfo abnormalInfo = new AbnormalInfo();
+                abnormalInfo.setStatus(0);
                 abnormalInfo.setId(IdWorker.getId());
                 abnormalInfo.setType(30);
                 abnormalInfo.setLinkId(stockTransfer.getId());
@@ -371,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.getCode());
+        stockJournal.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
         stockJournal.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal.setBusinessId(stockTransfer.getId());
@@ -382,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.getCode());
+        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
         stockJournal1.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal1.setBusinessId(stockTransfer.getId());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -153,7 +153,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             BigDecimal qualityQuantity = arrivalStockRecordsDetails.getQualityQuantity();
             qualityQuantity = ObjectUtil.isEmpty(qualityQuantity) ? BigDecimal.ZERO : qualityQuantity;
             arrivalStockRecordsDetails.setQualityQuantity(qualityQuantity.add(count));
-            if (quantity.compareTo(count) != 0) {
+            if (quantity.compareTo(arrivalStockRecordsDetails.getQualityQuantity()) > 0) {
                 qualityInfoDto.setStatus(1);//修改为部分质检
                 arrivalStockRecords.setQualityStatus(1);//修改为部分质检
             }

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.getCode());
+        stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER_WDLY.getCode());
         stockTransferDto.setType(1);
         stockTransferDto.setInStatus(0);
         this.save(stockTransferDto);
@@ -179,6 +179,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
             if(abnormalFlag ==1){
                 AbnormalInfo abnormalInfo = new AbnormalInfo();
                 abnormalInfo.setId(IdWorker.getId());
+                abnormalInfo.setStatus(0);
                 abnormalInfo.setType(30);
                 abnormalInfo.setLinkId(stockTransfer.getId());
                 abnormalInfo.setLinkCode(stockTransfer.getCode());
@@ -194,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.getCode());
+        stockJournal.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
         stockJournal.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal.setBusinessId(stockTransfer.getId());
@@ -205,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.getCode());
+        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
         stockJournal1.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal1.setBusinessId(stockTransfer.getId());
@@ -230,7 +231,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         Assert.notEmpty(stockTransferDto.getInWarehouseId(),"入库仓库不能为空");
         Assert.notEmpty(stockTransferDto.getStockTransferDetailsList(),"调仓明细不能为空");
 
-        stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER.getCode());
+        stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER_WDLY.getCode());
         stockTransferDto.setType(1);
         stockTransferDto.setInStatus(2);//已接收
         this.save(stockTransferDto);
@@ -251,7 +252,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
         //创建出库记录
         StockJournal stockJournal = new StockJournal();
-        stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());
+        stockJournal.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
         stockJournal.setOpType(2);//出库
         stockJournal.setType(JournalType.ADJUSTING_OUT.getDetailType());//调仓入库
         stockJournal.setWarehouseId(stockTransferDto.getOutWarehouseId());
@@ -265,7 +266,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
         //创建入库记录
         StockJournal stockJournal1 = new StockJournal();
-        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER.getCode());
+        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER_J.getCode());
         stockJournal1.setOpType(1);//入库
         stockJournal1.setType(JournalType.ADJUSTING_IN.getDetailType());//调仓出库
         stockJournal1.setWarehouseId(stockTransferDto.getInWarehouseId());

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

@@ -8,6 +8,8 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.victoriatourist.service.order.OrderInfoService;
 import com.fjhx.victoriatourist.service.stock.StockTransferService;
+import com.fjhx.wms.service.stock.StockJournalService;
+import com.fjhx.wms.service.stock.impl.StockJournalServiceImpl;
 import com.obs.services.internal.ServiceException;
 import lombok.Getter;
 
@@ -17,8 +19,11 @@ import java.util.Map;
 @Getter
 public enum CodeEnum {
 
-    // 调仓
-    STOCK_TRANSFER("SM", "yyMM-", "code", 3, StockTransferService.class),
+    // 调仓出入库记录
+    STOCK_TRANSFER_J("SM", "yyMM-", "code", 3, StockJournalService.class),
+    //调仓 维多利亚
+    STOCK_TRANSFER_WDLY("SM", "yyMM-", "code", 3, StockTransferService.class),
+
     // 销售订单
     ORDER_SALES("SO", null, "code", 5, OrderInfoService.class),
     //京东退货质检

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.wms.service.stock.impl.StockCheckServiceImpl;
+import com.fjhx.wms.service.stock.impl.StockJournalServiceImpl;
 import com.obs.services.internal.ServiceException;
 import lombok.Getter;
 
@@ -19,11 +20,11 @@ public enum CodeEnum {
     //盘点
     CHECK_CODE("SC", "-yyMM-", "code", 3, StockCheckServiceImpl.class),
     //调仓
-    STOCK_TRANSFER("SC", "-yyMM-", "code", 3, StockCheckServiceImpl.class),
+    STOCK_TRANSFER("SC", "-yyMM-", "code", 3, StockJournalServiceImpl.class),
     //出入库入库
-    SIN_CODE("SI", "-yyMM-", "code", 3, StockCheckServiceImpl.class),
+    SIN_CODE("SI", "-yyMM-", "code", 3, StockJournalServiceImpl.class),
     //出入库出库
-    SOUT_CODE("SO", "-yyMM-", "code", 3, StockCheckServiceImpl.class);
+    SOUT_CODE("SO", "-yyMM-", "code", 3, StockJournalServiceImpl.class);
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
         this.prefix = prefix;