no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsBean.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.bean.material.base;
 
 import com.gree.mall.manager.plus.entity.WorkerGoods;
-import com.gree.mall.manager.plus.entity.WorkerGoodsRela;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +14,6 @@ import java.util.List;
 public class WorkerGoodsBean extends WorkerGoods {
 
     @ApiModelProperty(value = "明细")
-    private List<WorkerGoodsRela> items;
+    private List<WorkerGoodsRelaBean> items;
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsRelaBean.java

@@ -0,0 +1,16 @@
+package com.gree.mall.manager.bean.material.base;
+
+import com.gree.mall.manager.plus.entity.WorkerGoodsRela;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class WorkerGoodsRelaBean extends WorkerGoodsRela {
+
+    @ApiModelProperty(value = "是否入师傅库存")
+    private String manageWorkerStock;
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WorkerGoodsLogic.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.material.base.WorkerGoodsBean;
+import com.gree.mall.manager.bean.material.base.WorkerGoodsRelaBean;
 import com.gree.mall.manager.bean.material.base.WorkerGoodsRelaExportBean;
 import com.gree.mall.manager.bean.material.base.WorkerGoodsVO;
 import com.gree.mall.manager.commonmapper.MaterialMapper;
@@ -14,14 +15,8 @@ import com.gree.mall.manager.enums.base.BaseEnum;
 import com.gree.mall.manager.enums.material.StateEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.MaterialConfig;
-import com.gree.mall.manager.plus.entity.WebsitGoodsCategory;
-import com.gree.mall.manager.plus.entity.WorkerGoods;
-import com.gree.mall.manager.plus.entity.WorkerGoodsRela;
-import com.gree.mall.manager.plus.service.MaterialConfigService;
-import com.gree.mall.manager.plus.service.WebsitGoodsCategoryService;
-import com.gree.mall.manager.plus.service.WorkerGoodsRelaService;
-import com.gree.mall.manager.plus.service.WorkerGoodsService;
+import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import lombok.RequiredArgsConstructor;
@@ -48,6 +43,7 @@ public class WorkerGoodsLogic {
     private final WorkerGoodsRelaService workerGoodsRelaService;
     private final MaterialConfigService materialConfigService;
     private final WebsitGoodsCategoryService websitGoodsCategoryService;
+    private final WebsitGoodsService websitGoodsService;
 
     public IPage<WorkerGoodsVO> page(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
@@ -63,7 +59,15 @@ public class WorkerGoodsLogic {
         List<WorkerGoodsRela> goodsRelas = workerGoodsRelaService.lambdaQuery()
                 .eq(WorkerGoodsRela::getWorkerGoodsId, id)
                 .list();
-        bean.setItems(goodsRelas);
+        List<WorkerGoodsRelaBean> beanList = new ArrayList<>();
+        for (WorkerGoodsRela rela : goodsRelas) {
+            WorkerGoodsRelaBean relaBean = new WorkerGoodsRelaBean();
+            BeanUtils.copyProperties(rela, relaBean);
+            final WebsitGoods goods = websitGoodsService.getById(rela.getWebsitGoodsId());
+            relaBean.setManageWorkerStock(BaseEnum.keyToValue(IsYesNoEnum.class, goods.getManageWorkerStock()));
+            beanList.add(relaBean);
+        }
+        bean.setItems(beanList);
         return bean;
     }
 
@@ -93,8 +97,9 @@ public class WorkerGoodsLogic {
                 .updateById();
 
         if (CollectionUtil.isNotEmpty(bean.getItems())) {
+            List<WorkerGoodsRela> items = new ArrayList<>();
             // 检查是否已有绑定关系
-            for (WorkerGoodsRela item : bean.getItems()) {
+            for (WorkerGoodsRelaBean item : bean.getItems()) {
                 final Integer count = workerGoodsRelaService.lambdaQuery()
                         .eq(WorkerGoodsRela::getCompanyWechatId, workerGoods.getCompanyWechatId())
                         .eq(WorkerGoodsRela::getWebsitGoodsId, item.getWebsitGoodsId())
@@ -105,8 +110,9 @@ public class WorkerGoodsLogic {
                 item.setCompanyWechatId(workerGoods.getCompanyWechatId())
                     .setWorkerGoodsId(workerGoods.getGoodsId())
                     .setWorkerGoodsName(workerGoods.getGoodsName());
+                items.add(item);
             }
-            workerGoodsRelaService.saveBatch(bean.getItems());
+            workerGoodsRelaService.saveBatch(items);
         }
     }
 
@@ -130,6 +136,7 @@ public class WorkerGoodsLogic {
                     .eq(WorkerGoodsRela::getCompanyWechatId, workerGoods.getCompanyWechatId())
                     .eq(WorkerGoodsRela::getWorkerGoodsId, workerGoods.getGoodsId())
                     .remove();
+            List<WorkerGoodsRela> items = new ArrayList<>();
             for (WorkerGoodsRela item : bean.getItems()) {
                 final Integer count = workerGoodsRelaService.lambdaQuery()
                         .eq(WorkerGoodsRela::getCompanyWechatId, workerGoods.getCompanyWechatId())
@@ -140,8 +147,9 @@ public class WorkerGoodsLogic {
                 }
                 item.setCompanyWechatId(workerGoods.getCompanyWechatId())
                         .setWorkerGoodsId(workerGoods.getGoodsId());
+                items.add(item);
             }
-            workerGoodsRelaService.saveBatch(bean.getItems());
+            workerGoodsRelaService.saveBatch(items);
         }
     }