Merge remote-tracking branch 'origin/master'

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

@@ -8,8 +8,11 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.kd100.entity.company.po.CompanyInfo;
 import com.fjhx.kd100.service.company.CompanyInfoService;
+import com.fjhx.purchase.entity.purchase.po.Purchase;
+import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
 import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoDto;
@@ -27,11 +30,13 @@ import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.Stock;
 import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
+import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.service.arrival.ArrivalStockRecordsDetailsService;
 import com.fjhx.wms.service.arrival.ArrivalStockRecordsService;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.fjhx.wms.service.stock.StockJournalService;
 import com.fjhx.wms.service.stock.StockService;
+import com.fjhx.wms.service.stock.StockWaitService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
@@ -73,7 +78,11 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
     @Autowired
     private ArrivalStockRecordsService arrivalStockRecordsService;
     @Autowired
-    AbnormalInfoService abnormalInfoService;
+    private AbnormalInfoService abnormalInfoService;
+    @Autowired
+    private StockWaitService stockWaitService;
+    @Autowired
+    private PurchaseService purchaseService;
 
     @Override
     public Page<QualityInfoVo> getPage(QualityInfoSelectDto dto) {
@@ -127,6 +136,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         qualityInfoDto.setType(1);//设置为到货质检
         qualityInfoDto.setStatus(2);//部分质检
         ArrivalStockRecords arrivalStockRecords = arrivalStockRecordsService.getById(qualityInfoDto.getArrivalStockRecordsId());
+        Assert.notEmpty(arrivalStockRecords,"查询不到到货信息");
         arrivalStockRecords.setQualityStatus(2);//质检完成
 
         //根据到货编号生成质检编号
@@ -184,8 +194,19 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             abnormalInfo.setStatus(0);
             abnormalInfo.setId(IdWorker.getId());
             abnormalInfo.setType(10);
-            abnormalInfo.setLinkId(qualityInfoDto.getId());
-            abnormalInfo.setLinkCode(qualityInfoDto.getCode());
+//            abnormalInfo.setLinkId(qualityInfoDto.getId());
+//            abnormalInfo.setLinkCode(qualityInfoDto.getCode());
+            //将异常关联详细设置成采购id和采购单号
+            StockWait stockWait = stockWaitService.getById(arrivalStockRecords.getStockWaitId());
+            Assert.notEmpty(stockWait,"查询不到待入库信息");
+            Purchase purchase = purchaseService.getById(stockWait.getBusinessId());
+            Assert.notEmpty(purchase,"查询不到采购信息");
+            String victoriatouristJson = purchase.getVictoriatouristJson();
+            JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
+            //赋值关联信息
+            abnormalInfo.setLinkId(purchase.getId());
+            abnormalInfo.setLinkCode(json.getString("contractCode"));
+
             abnormalInfo.setTitle("质检存在不合格");
             abnormalInfoService.save(abnormalInfo);
         }

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

@@ -208,9 +208,9 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             //更新已入库数量
             BigDecimal receiptQuantity = stockWaitDetail.getReceiptQuantity() == null ? BigDecimal.ZERO : stockWaitDetail.getReceiptQuantity();
             stockWaitDetail.setReceiptQuantity(receiptQuantity.add(temp.getQuantity()));
-            if (stockWaitDetail.getReceiptQuantity().compareTo(stockWaitDetail.getQuantity()) > 0) {
-                throw new ServiceException("入库数量+已入库数量不能大于待采购数量");
-            }
+//            if (stockWaitDetail.getReceiptQuantity().compareTo(stockWaitDetail.getQuantity()) > 0) {
+//                throw new ServiceException("入库数量+已入库数量不能大于待采购数量");
+//            }
 
             //计算已经完全入库的数量
             if (stockWaitDetail.getReceiptQuantity().compareTo(stockWaitDetail.getQuantity()) >= 0) {