到货质检 采购单号 供应商过滤

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

@@ -14,6 +14,7 @@ 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.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
 import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
 import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoDto;
@@ -101,6 +102,13 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         IWrapper<QualityInfo> wrapper = getWrapper();
         wrapper.orderByDesc("asr", QualityInfo::getId);
         wrapper.eq("asr", QualityInfoVo::getQualityStatus, dto.getQualityStatus());
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            //根据采购单号 供应商
+            List<Long> suppIds = supplierInfoService.listObject(SupplierInfo::getId, q -> q.like(SupplierInfo::getName, dto.getKeyword()));
+            wrapper.and(q -> q.like("json_unquote(p.victoriatourist_json -> '$.contractCode')", dto.getKeyword())
+                    .or().in("p.supply_id", suppIds));
+        }
+        wrapper.orderByDesc("asr", QualityInfo::getCreateTime);
         Page<QualityInfoVo> page = this.baseMapper.getPage1(dto.getPage(), wrapper);
         List<QualityInfoVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {
@@ -139,7 +147,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         qualityInfoDto.setType(1);//设置为到货质检
         qualityInfoDto.setStatus(2);//部分质检
         ArrivalStockRecords arrivalStockRecords = arrivalStockRecordsService.getById(qualityInfoDto.getArrivalStockRecordsId());
-        Assert.notEmpty(arrivalStockRecords,"查询不到到货信息");
+        Assert.notEmpty(arrivalStockRecords, "查询不到到货信息");
         arrivalStockRecords.setQualityStatus(2);//质检完成
 
         //根据到货编号生成质检编号
@@ -201,9 +209,9 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
 //            abnormalInfo.setLinkCode(qualityInfoDto.getCode());
             //将异常关联详细设置成采购id和采购单号
             StockWait stockWait = stockWaitService.getById(arrivalStockRecords.getStockWaitId());
-            Assert.notEmpty(stockWait,"查询不到待入库信息");
+            Assert.notEmpty(stockWait, "查询不到待入库信息");
             Purchase purchase = purchaseService.getById(stockWait.getBusinessId());
-            Assert.notEmpty(purchase,"查询不到采购信息");
+            Assert.notEmpty(purchase, "查询不到采购信息");
             String victoriatouristJson = purchase.getVictoriatouristJson();
             JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
             //赋值关联信息
@@ -259,7 +267,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
             }
             json.put("frozenQuantity", frozenQuantity);
 
-            stock.setVictoriatouristJson(JSONObject.toJSONString(json,JSONWriter.Feature.WriteLongAsString));
+            stock.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
             stockList.add(stock);
 
             StockJournalDetails stockJournalDetails = new StockJournalDetails();