待采购添加产品规格

到货质检添加物流单号搜索

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -131,6 +131,7 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
             s.setProductUnit(productInfo.getUnit());
             s.setProductDefinition(productInfo.getDefinition());
             s.setProductCustomCode(productInfo.getCustomCode());
+            s.setProductSpec(productInfo.getSpec());
 
             String victoriatouristJson = productInfo.getVictoriatouristJson();
             JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();

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

@@ -105,8 +105,10 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         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.and(q -> q
+                            .like("json_unquote(p.victoriatourist_json -> '$.contractCode')", dto.getKeyword())
+                            .or().in("p.supply_id", suppIds))
+                    .or().like("dg.code", dto.getKeyword());
         }
         wrapper.orderByDesc("asr", QualityInfo::getCreateTime);
         Page<QualityInfoVo> page = this.baseMapper.getPage1(dto.getPage(), wrapper);