问题处理

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

@@ -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());

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

@@ -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());

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;