no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/MaterialMapper.java

@@ -171,7 +171,8 @@ public interface MaterialMapper {
                                                     @Param("partsAttr") String partsAttr,
                                                     @Param("partsNumber") String partsNumber,
                                                     @Param("partsName") String partsName,
-                                                    @Param("materialGroupName") String materialGroupName);
+                                                    @Param("materialGroupName") String materialGroupName,
+                                                    @Param("productRelaId") String productRelaId);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<WebsitPartsSalesItem> querySalesEndTimeByIdentity(@Param("companyWechatId") String companyWechatId,

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/WorkerPartsStockController.java

@@ -55,9 +55,10 @@ public class WorkerPartsStockController {
             @ApiParam(value = "配件属性 NEW=新件 OLD=旧件 WAY=在途 OLD=旧件 WAY=在途 TEMPNEW=临占新件 TEMPOLD=临占旧件",required = true) @RequestParam String partsAttr,
             @ApiParam(value = "配件编码") @RequestParam(required = false) String partsNumber,
             @ApiParam(value = "配件名称") @RequestParam(required = false) String partsName,
-            @ApiParam(value = "物料组id") @RequestParam(required = false) String materialGroupName
+            @ApiParam(value = "物料组") @RequestParam(required = false) String materialGroupName,
+            @ApiParam(value = "产品大类") @RequestParam(required = false) String productRelaId
     ) throws RemoteServiceException {
-        return ResponseHelper.success(workerPartsStockLogic.existWorkerStockList(identity, websitId, partsWebsitId, partsAttr, partsNumber, partsName, materialGroupName));
+        return ResponseHelper.success(workerPartsStockLogic.existWorkerStockList(identity, websitId, partsWebsitId, partsAttr, partsNumber, partsName, materialGroupName, productRelaId));
     }
     
     @ApiOperation(value = "统计查询师傅库存相关")

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/parts/WorkerPartsStockLogic.java

@@ -53,10 +53,10 @@ public class WorkerPartsStockLogic {
 
     public List<PartsWorkerStockBean> existWorkerStockList(String identity, String websitId, String partsWebsitId,
                                                            String partsAttr, String partsNumber, String partsName,
-                                                           String materialGroupName) {
+                                                           String materialGroupName, String productRelaId) {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat();
         List<PartsWorkerStockBean> stockList = materialMapper.existWorkerStockList(wechat.getCompanyWechatId(), identity,
-                websitId, partsWebsitId, partsAttr, partsNumber, partsName, materialGroupName);
+                websitId, partsWebsitId, partsAttr, partsNumber, partsName, materialGroupName, productRelaId);
         // 过期天数
         if (partsAttr.equals(PartsAttrEnum.NEW.getKey())) {
             // 第一步 查询配件网点

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -289,7 +289,7 @@ public class PayOrderLogic {
         AdminWebsit adminWebsit = adminWebsitService.getById(workerOrderBuy.getWebsitId());
 
         List<PartsWorkerStockBean> partsWorkerStockBeans = workerPartsStockLogic.existWorkerStockList(workerOrderBuy.getIdentity(), workerOrderBuy.getWebsitId(),
-                adminWebsit.getPartsWebsitId(), "NEW", workerOrderItem.getGoodsCode(), null, null);
+                adminWebsit.getPartsWebsitId(), "NEW", workerOrderItem.getGoodsCode(), null, null, null);
 
         if (CollectionUtils.isEmpty(partsWorkerStockBeans))
             throw new RemoteServiceException("传参有误");

mall-miniapp-service/src/main/resources/mapper/MaterialMapper.xml

@@ -586,6 +586,9 @@
             <if test="materialGroupName != null and materialGroupName != ''">
                 AND a.material_group_name = #{materialGroupName}
             </if>
+            <if test="productRelaId != null and productRelaId != ''">
+                AND b.product_rela_id LIKE CONCAT('%',#{productRelaId},'%')
+            </if>
             <choose>
                 <when test="partsAttr != null and partsAttr == 'NEW'">
                     AND a.qty > 0