Merge remote-tracking branch 'origin/master'

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -205,6 +205,9 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         //将业务信息设置成采购id和采购编码
         stockWait.setBusinessId(purchase.getId());
         stockWait.setBusinessCode(purchase.getCode());
+
+        json.put("arrivalId",arrival.getId());
+        json.put("arrivalCode",arrival.getCode());
         stockWait.setVictoriatouristJson(json.toJSONString());
         stockWaitService.save(stockWait);
 

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

@@ -17,6 +17,7 @@ import com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo;
 import com.fjhx.victoriatourist.mapper.quality.QualityInfoMapper;
 import com.fjhx.victoriatourist.service.quality.QualityDetailsService;
 import com.fjhx.victoriatourist.service.quality.QualityInfoService;
+import com.fjhx.victoriatourist.utils.CodeEnum;
 import com.fjhx.wms.entity.arrival.po.ArrivalStockRecords;
 import com.fjhx.wms.entity.arrival.po.ArrivalStockRecordsDetails;
 import com.fjhx.wms.entity.stock.emums.JournalType;
@@ -123,6 +124,9 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         ArrivalStockRecords arrivalStockRecords = arrivalStockRecordsService.getById(qualityInfoDto.getArrivalStockRecordsId());
         arrivalStockRecords.setQualityStatus(2);//质检完成
 
+        //根据到货编号生成质检编号
+        qualityInfoDto.setCode(arrivalStockRecords.getArrivalCode() + CodeEnum.QUALITY.getCode());
+
         qualityInfoDto.setWarehouseId(arrivalStockRecords.getWarehouseId());
         //查询入库明细
         List<ArrivalStockRecordsDetails> arrivalStockRecordsDetailsList = arrivalStockRecordsDetailsService.list(q -> q.eq(ArrivalStockRecordsDetails::getArrivalStockRecordsId, qualityInfoDto.getArrivalStockRecordsId()));

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

@@ -6,6 +6,10 @@ import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityDetails;
+import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
+import com.fjhx.victoriatourist.service.jd.JdBackDetailsService;
+import com.fjhx.victoriatourist.service.jd.JdBackQualityDetailsService;
 import com.fjhx.victoriatourist.service.order.OrderInfoService;
 import com.fjhx.victoriatourist.service.quality.QualityInfoService;
 import com.fjhx.victoriatourist.service.stock.StockTransferService;
@@ -23,9 +27,9 @@ public enum CodeEnum {
     // 销售订单
     ORDER_SALES("SO", null, "code", 5, OrderInfoService.class),
     //京东退货质检
-    JD_BACK_QUALITY("PA", "yyMM-", "code", 3, StockTransferService.class),
+    JD_BACK_QUALITY("PA", "yyMM-", "code", 3, JdBackQualityDetailsService.class),
     //异常记录
-    ABNORMAL("PO", "yyMM-", "code", 3, StockTransferService.class),
+    ABNORMAL("PO", "yyMM-", "code", 3, AbnormalInfoService.class),
     //到货质检
     QUALITY("", null, "code", 3, QualityInfoService.class);
 

hx-wms/src/main/java/com/fjhx/wms/entity/arrival/po/ArrivalStockRecords.java

@@ -1,8 +1,7 @@
 package com.fjhx.wms.entity.arrival.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,7 +10,7 @@ import lombok.Setter;
  * 采购到货入库记录 维多利亚
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-26
  */
 @Getter
@@ -34,4 +33,9 @@ public class ArrivalStockRecords extends BasePo {
      */
     private Integer qualityStatus;
 
+    /**
+     * 到货单编号
+     */
+    private String arrivalCode;
+
 }

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

@@ -294,6 +294,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             arrivalStockRecords.setStockWaitId(stockWait.getId());
             arrivalStockRecords.setWarehouseId(stockWaitDto.getWarehouseId());
             arrivalStockRecords.setQualityStatus(0);
+            arrivalStockRecords.setArrivalCode(json.getString("arrivalCode"));//设置到货编码
             arrivalStockRecordsService.save(arrivalStockRecords);
             //创建入库明细
             List<ArrivalStockRecordsDetails> arrivalStockRecordsDetailsList = new ArrayList<>();