1.辅材收费标准下单时检查库存数量

2.辅材收费标准支付成功减库存

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WorkerNormStockBean.java

@@ -0,0 +1,31 @@
+package com.gree.mall.miniapp.bean.material.stock;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class WorkerNormStockBean {
+
+    @ApiModelProperty("收费标准编号")
+    private String normId;
+    @ApiModelProperty("师傅辅材编号")
+    private String workerGoodsId;
+    @ApiModelProperty("定义1比N扣减数量")
+    private BigDecimal qty;
+    @ApiModelProperty("师傅辅材名称")
+    private String goodsName;
+    @ApiModelProperty("师傅辅材名称")
+    private String salesUnit;
+    @ApiModelProperty("是否小件")
+    private Boolean isSmall;
+    @ApiModelProperty("库存数量")
+    private BigDecimal stockQty;
+    @ApiModelProperty("实际要扣减数量")
+    private BigDecimal realQty;
+    @ApiModelProperty("收费标准单价")
+    private BigDecimal normPrice;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.miniapp.bean.material.*;
+import com.gree.mall.miniapp.bean.material.stock.WorkerNormStockBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -92,4 +93,11 @@ public interface MaterialMapper {
                                                        @Param("websitId") String websitId,
                                                        @Param("goodsType") String goodsType);
 
+    /**
+     * 收费标准师傅库存
+     * @param goodsId
+     * @param workerId
+     * @return
+     */
+    List<WorkerNormStockBean> queryWorkerStockQty(@Param("goodsId") String goodsId, @Param("workerId") String workerId);
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/PayOrderController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.miniapp.bean.order.OrderCount;
 import com.gree.mall.miniapp.bean.order.WorkerOrderBuy;
 import com.gree.mall.miniapp.bean.order.WorkerOrderDetail;
-import com.gree.mall.miniapp.bean.order.WorkerOrderVO;
 import com.gree.mall.miniapp.constant.Constant;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.helper.ResponseHelper;
@@ -27,7 +26,7 @@ import java.util.concurrent.locks.Lock;
 
 @Slf4j
 @RestController
-@Api(value = "辅材配件销售", tags ={"辅材配件销售"} )
+@Api(value = "辅材配件销售", tags = {"辅材配件销售"})
 @RequestMapping(value = "/pay", produces = "application/json; charset=utf-8")
 public class PayOrderController {
 
@@ -44,10 +43,10 @@ public class PayOrderController {
             @ApiParam(required = false, value = "商品名称") @RequestParam(required = false) String name,
             @ApiParam(required = false, value = "分类id") @RequestParam(required = false) String categoryId,
             @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
+            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
+            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws Exception {
-        Page<WebsitNormCharge> websitNormChargePage = payOrderLogic.pageCharge(name,categoryId,orderId,pageNum,pageSize);
+        Page<WebsitNormCharge> websitNormChargePage = payOrderLogic.pageCharge(name, categoryId, orderId, pageNum, pageSize);
         return ResponseHelper.success(websitNormChargePage);
     }
 
@@ -61,10 +60,10 @@ public class PayOrderController {
             @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime,
             @ApiParam(required = false, value = "年月") @RequestParam(required = false) String yearMonth,
             @ApiParam(required = false, value = "支付状态CANEL 取消 WAIT 待支付 PAID 已支付") @RequestParam(required = false) String payStatus,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
+            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
+            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws Exception {
-        Page<WorkerOrder> workerOrderVOPage = payOrderLogic.orderPage(yearMonth,settlementType,goodsType,orderId,startTime,endTime,payStatus,pageNum,pageSize);
+        Page<WorkerOrder> workerOrderVOPage = payOrderLogic.orderPage(yearMonth, settlementType, goodsType, orderId, startTime, endTime, payStatus, pageNum, pageSize);
         return ResponseHelper.success(workerOrderVOPage);
     }
 
@@ -80,12 +79,11 @@ public class PayOrderController {
             @ApiParam(required = false, value = "支付状态CANEL 取消 WAIT 待支付 PAID 已支付") @RequestParam(required = false) String payStatus
 
     ) throws Exception {
-        OrderCount workerOrderVOPage = payOrderLogic.orderCount(settlementType,goodsType,orderId,startTime,endTime,payStatus);
+        OrderCount workerOrderVOPage = payOrderLogic.orderCount(settlementType, goodsType, orderId, startTime, endTime, payStatus);
         return ResponseHelper.success(workerOrderVOPage);
     }
 
 
-
     @PostMapping("/buy")
     @ApiOperation(value = "提交订单,返回订单号")
     public ResponseHelper<String> buy(
@@ -93,7 +91,7 @@ public class PayOrderController {
             HttpServletRequest request
     ) throws Exception {
         String ip = IpUtil.getIpAddr(request);
-        String workerOrderDetail = payOrderLogic.buy(workerOrderBuy,ip,request);
+        String workerOrderDetail = payOrderLogic.buy(workerOrderBuy, ip, request);
         return ResponseHelper.success(workerOrderDetail);
     }
 
@@ -113,7 +111,7 @@ public class PayOrderController {
             @ApiParam(required = true, value = "订单号") @RequestParam(required = true) String orderId
 
     ) throws Exception {
-         payOrderLogic.cancel(orderId);
+        payOrderLogic.cancel(orderId);
         return ResponseHelper.success();
     }
 
@@ -132,7 +130,7 @@ public class PayOrderController {
                 throw new RemoteServiceException("系统繁忙，请稍后再试");
             }
             String ip = IpUtil.getIpAddr(request);
-            Boolean payStatus = payOrderLogic.paid(orderId,authCode,ip,payType);
+            Boolean payStatus = payOrderLogic.paid(orderId, authCode, ip, payType);
             return ResponseHelper.success(payStatus);
         } finally {
             obtain.unlock();
@@ -148,10 +146,10 @@ public class PayOrderController {
             @ApiParam(required = false, value = "品牌") @RequestParam(required = false) String brand,
             @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId,
             @ApiParam(required = false, value = "收费类型 M=物料收费 S=服务收费") @RequestParam(required = false) String normType,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
+            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
+            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws Exception {
-        Page<WebsitGoods> websitGoodsList = payOrderLogic.websitGoodsList(normType,brand,name,orderId,categoryName,pageNum,pageSize);
+        Page<WebsitGoods> websitGoodsList = payOrderLogic.websitGoodsList(normType, brand, name, orderId, categoryName, pageNum, pageSize);
         return ResponseHelper.success(websitGoodsList);
     }
 
@@ -160,15 +158,14 @@ public class PayOrderController {
     @ApiOperation(value = "分类")
     public ResponseHelper<Page<WebsitGoodsCategory>> websitCategoryList(
 
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
+            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
+            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws Exception {
-        Page<WebsitGoodsCategory> websitGoodsList = payOrderLogic.websitCategoryList(pageNum,pageSize);
+        Page<WebsitGoodsCategory> websitGoodsList = payOrderLogic.websitCategoryList(pageNum, pageSize);
         return ResponseHelper.success(websitGoodsList);
     }
 
 
-
     @PostMapping("/sysDict")
     @ApiOperation(value = "获得字典值")
     public ResponseHelper<List<SysDictCompany>> sysDict(

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

@@ -8,14 +8,17 @@ import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.miniapp.bean.material.stock.WorkerNormStockBean;
 import com.gree.mall.miniapp.bean.material.stock.WorkerStockDTO;
 import com.gree.mall.miniapp.bean.order.OrderCount;
 import com.gree.mall.miniapp.bean.order.SettlementOrderDetail;
 import com.gree.mall.miniapp.bean.order.WorkerOrderBuy;
 import com.gree.mall.miniapp.bean.order.WorkerOrderDetail;
 import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
+import com.gree.mall.miniapp.commonmapper.MaterialMapper;
 import com.gree.mall.miniapp.enums.*;
 import com.gree.mall.miniapp.enums.material.PartsAttrEnum;
+import com.gree.mall.miniapp.enums.material.WebsitGoodsTypeEnum;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.logic.common.CommonLogic;
 import com.gree.mall.miniapp.logic.common.outside.WechatLogic;
@@ -26,6 +29,7 @@ import com.gree.mall.miniapp.utils.DateUtils;
 import com.gree.mall.miniapp.utils.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -109,6 +113,9 @@ public class PayOrderLogic {
     @Autowired
     AdminWebsitService adminWebsitService;
 
+    @Autowired
+    MaterialMapper materialMapper;
+
     public Page<WebsitNormCharge> pageCharge(String name, String categoryId, String orderId,Integer pageNum, Integer pageSize) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         Page<WebsitNormCharge> list = websitNormChargeService.lambdaQuery()
@@ -159,7 +166,7 @@ public class PayOrderLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         workerOrderBuy.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
         workerOrderBuy.setCompanyWechatName(currentCompanyWechat.getCompanyName());
-        workerOrderBuy.setWorkerId(currentCompanyWechat.getUser().getUserId());
+        workerOrderBuy.setWorkerId(currentCompanyWechat.getUser().getWorkerNumber());
         workerOrderBuy.setWorkerName(currentCompanyWechat.getUser().getNickName());
         workerOrderBuy.setWorkerMobile(currentCompanyWechat.getUser().getMobile());
         workerOrderBuy.setCreateBy(currentCompanyWechat.getUser().getNickName());
@@ -182,13 +189,14 @@ public class PayOrderLogic {
 
         BigDecimal num = new BigDecimal("0");
 
+        Map<String, WorkerNormStockBean> workerStockMap = new HashMap<>();
         for (WorkerOrderItem workerOrderItem : workerOrderBuy.getWorkerOrderItems()) {
 
             workerOrderItem.setOrderId(workerOrderBuy.getOrderId());
             workerOrderItem.setSettlementType(workerOrderBuy.getSettlementType());
 
             if (StringUtil.isEmpty(workerOrderBuy.getCategoryId()))
-                this.addFuCai(workerOrderItem);
+                this.addFuCai(workerStockMap, workerOrderItem, workerOrderBuy);
             else
                 this.addPeiJian(workerOrderItem);
 
@@ -201,6 +209,18 @@ public class PayOrderLogic {
             num = num.add(workerOrderItem.getNum());
         }
 
+        if (CollectionUtil.isNotEmpty(workerStockMap)) {
+            // 检查辅材物料收费类型的库存是否够扣
+            for (Map.Entry<String, WorkerNormStockBean> entry : workerStockMap.entrySet()) {
+                final WorkerNormStockBean stockBean = entry.getValue();
+                if (!stockBean.getIsSmall()
+                        && (Objects.isNull(stockBean.getStockQty()) || stockBean.getRealQty().compareTo(stockBean.getStockQty()) > 0)) {
+                    WebsitNormCharge websitNormCharge = websitNormChargeService.getById(stockBean.getNormId());
+                    throw new RemoteServiceException("”" + websitNormCharge.getNormName() + "“收费标准关联的" +  stockBean.getGoodsName() + "库存数量不够使用");
+                }
+            }
+        }
+
 
         if (workerProceAmount.doubleValue() > 0.01) {
             workerOrderBuy.setWorkerProceAmount(workerProceAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
@@ -268,8 +288,47 @@ public class PayOrderLogic {
         }
     }
 
-    private void addFuCai(WorkerOrderItem workerOrderItem) {
+    private void addFuCai(Map<String, WorkerNormStockBean> workerStockMap, WorkerOrderItem workerOrderItem, WorkerOrderBuy workerOrderBuy) {
         WebsitNormCharge websitNormCharge = websitNormChargeService.getById(workerOrderItem.getGoodsId());
+        if (websitNormCharge.getNormType().equals("M")) {
+            // 获取当前关联师傅库存记录
+            List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(workerOrderItem.getGoodsId(), workerOrderBuy.getWorkerId());
+            if (CollectionUtil.isNotEmpty(stockBeanList)) {
+                // 获取待支付的师傅收费订单
+                final List<WorkerOrder> workerOrderList = workerOrderService.lambdaQuery()
+                        .eq(WorkerOrder::getCompanyWechatId, workerOrderBuy.getCompanyWechatId())
+                        .eq(WorkerOrder::getWorkerId, workerOrderBuy.getWorkerId())
+                        .eq(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey())
+                        .list();
+                final List<WorkerOrderItem> orderItemList = workerOrderItemService.lambdaQuery()
+                        .in(WorkerOrderItem::getOrderId, workerOrderList.stream().map(WorkerOrder::getOrderId).collect(Collectors.toList()))
+                        .eq(WorkerOrderItem::getGoodsId, workerOrderItem.getGoodsId())
+                        .list();
+
+                BigDecimal totalNum = workerOrderItem.getNum();
+                if (CollectionUtil.isNotEmpty(orderItemList)) {
+                    for (WorkerOrderItem orderItem : orderItemList) {
+                        totalNum = totalNum.add(orderItem.getNum());
+                    }
+                }
+
+                for (WorkerNormStockBean stockBean : stockBeanList) {
+                    // 当前订单收费标准扣总数量
+                    BigDecimal useTotalQty = totalNum.multiply(stockBean.getQty());
+                    if (!workerStockMap.containsKey(stockBean.getWorkerGoodsId())) {
+                        WorkerNormStockBean bean = new WorkerNormStockBean();
+                        BeanUtils.copyProperties(stockBean, bean);
+                        bean.setRealQty(BigDecimal.ZERO);
+                        workerStockMap.put(bean.getWorkerGoodsId(), bean);
+                    }
+                    WorkerNormStockBean stock = workerStockMap.get(stockBean.getWorkerGoodsId());
+                    stock.setRealQty(stock.getRealQty().add(useTotalQty));
+                }
+            }
+        }
+
+
+
         workerOrderItem.setTotalAmount(websitNormCharge.getNormAmount().multiply(Convert.toBigDecimal(workerOrderItem.getNum())));
         workerOrderItem.setGoodsAmount(websitNormCharge.getNormAmount());
         workerOrderItem.setGoodsCode(websitNormCharge.getNormCode());
@@ -451,6 +510,22 @@ public class PayOrderLogic {
             log.error(workerOrder.getOrderId() + " 师傅配件扣自有库存失败: ", e);
         }
 
+        // 辅材扣库存
+        try {
+            if (workerOrder.getGoodsType().equals(WebsitGoodsTypeEnum.M.toString())) {
+                List<WorkerStockDTO> workerStockDTOS = new ArrayList<>();
+                this.makeSubStockData(workerOrder, workerOrderItems, workerStockDTOS);
+
+                if (CollectionUtil.isNotEmpty(workerStockDTOS)) {
+                    // 开始处理库存
+                    workerStockLogic.handleWorkerStock(workerStockDTOS);
+                }
+            }
+        } catch (Exception e) {
+            log.error(workerOrder.getOrderId() + " 师傅辅材扣库存失败: ", e);
+        }
+
+
         if (payType.equals(PayTypeEnum.WECHAT.getKey())) {
             String transcationId = wechatLogic.paymentFkm(workerOrder.getOrderId(), workerOrder.getTotalAmount(), authCode, "Y", ip,
                     adminWebsit.getPayWorkerCodeId(),workerOrder.getSource());
@@ -468,6 +543,67 @@ public class PayOrderLogic {
         return true;
     }
 
+    private void makeSubStockData(WorkerOrder workerOrder, List<WorkerOrderItem> workerOrderItems, List<WorkerStockDTO> workerStockDTOS) {
+        Map<String, WorkerNormStockBean> workerStockMap = new HashMap<>();
+        for (WorkerOrderItem item : workerOrderItems) {
+            WebsitNormCharge websitNormCharge = websitNormChargeService.getById(item.getGoodsId());
+            if (websitNormCharge.getNormType().equals("M")) {
+                // 获取当前关联师傅库存记录
+                List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(item.getGoodsId(), workerOrder.getWorkerId());
+                if (CollectionUtil.isNotEmpty(stockBeanList)) {
+                    BigDecimal totalNum = item.getNum();
+                    for (WorkerNormStockBean stockBean : stockBeanList) {
+                        // 当前订单收费标准扣总数量
+                        BigDecimal useTotalQty = totalNum.multiply(stockBean.getQty());
+                        if (!workerStockMap.containsKey(stockBean.getWorkerGoodsId())) {
+                            WorkerNormStockBean bean = new WorkerNormStockBean();
+                            BeanUtils.copyProperties(stockBean, bean);
+                            bean.setRealQty(BigDecimal.ZERO);
+                            workerStockMap.put(bean.getWorkerGoodsId() + item.getGoodsAmount(), bean);
+                        }
+                        WorkerNormStockBean stock = workerStockMap.get(stockBean.getWorkerGoodsId() + item.getGoodsAmount());
+                        stock.setRealQty(stock.getRealQty().add(useTotalQty));
+                        stock.setNormPrice(item.getGoodsAmount());
+                    }
+                }
+            }
+        }
+
+        for (Map.Entry<String, WorkerNormStockBean> entry : workerStockMap.entrySet()) {
+            final WorkerNormStockBean bean = entry.getValue();
+            // 库存减少
+            WorkerStockDTO workerStockDTO = new WorkerStockDTO();
+            workerStockDTO.setCompanyWechatId(workerOrder.getCompanyWechatId());
+            workerStockDTO.setCompanyWechatName(workerOrder.getCompanyWechatName());
+            workerStockDTO.setIdentity(workerOrder.getIdentity());
+            workerStockDTO.setWorkerId(workerOrder.getWorkerId());
+            workerStockDTO.setWorkerName(workerOrder.getWorkerName());
+            workerStockDTO.setWebsitId(workerOrder.getWebsitId());
+            workerStockDTO.setWebsitName(workerOrder.getWebsitName());
+            workerStockDTO.setSdate(workerOrder.getCreateTime());
+            workerStockDTO.setWorkerWebsitId(workerOrder.getWebsitId());
+            workerStockDTO.setWorkerWebsitName(workerOrder.getWebsitName());
+            workerStockDTO.setGoodsId(bean.getWorkerGoodsId());
+            workerStockDTO.setGoodsName(bean.getGoodsName());
+            workerStockDTO.setGoodsType(WebsitGoodsTypeEnum.M.toString());
+            workerStockDTO.setPrice(bean.getNormPrice());
+            workerStockDTO.setUnitName(bean.getSalesUnit());
+            workerStockDTO.setRef(workerOrder.getOrderId());
+            workerStockDTO.setRefType("辅材销售");
+            workerStockDTO.setPartsAttr(PartsAttrEnum.NEW.toString());
+            workerStockDTO.setChangeQty(bean.getRealQty());
+            workerStockDTO.setDirectFlag("SUB");
+            workerStockDTO.setFlag("USED");
+            workerStockDTO.setObj("客户");
+            workerStockDTO.setWorkerOrderNo(workerOrder.getWorkerOrderId());
+            workerStockDTO.setRemark(workerOrder.getRemark());
+            workerStockDTO.setOperateBy(workerOrder.getWorkerName());
+            workerStockDTO.setOperateTime(DateUtil.date());
+
+            workerStockDTOS.add(workerStockDTO);
+        }
+    }
+
     private void addSettlementManaulWorker(WorkerOrder workerOrder, List<WorkerOrderItem> workerOrderItems) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         WorkerSettlementManual one = workerSettlementManualService.lambdaQuery()

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

@@ -153,4 +153,25 @@
           AND a.websit_id = #{websitId}
           AND a.goods_type = #{goodsType}
     </select>
+    <select id="queryWorkerStockQty"
+            resultType="com.gree.mall.miniapp.bean.material.stock.WorkerNormStockBean">
+        SELECT
+            a.norm_id,
+            a.worker_goods_id,
+            a.qty,
+            b.goods_name,
+            b.is_small,
+            b.sales_unit,
+            c.qty AS stock_qty
+        FROM
+            websit_norm_rela a
+                JOIN
+            worker_goods b
+            ON a.company_wechat_id = b.company_wechat_id AND a.worker_goods_id = b.goods_id
+                LEFT JOIN
+            worker_stock c
+            ON c.worker_id = #{workerId} AND a.company_wechat_id = c.company_wechat_id AND a.worker_goods_id = c.goods_id
+        WHERE
+            a.norm_id = #{goodsId}
+    </select>
 </mapper>

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

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.bean.material.base;
 
 import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.material.JudgeEnum;
 import com.gree.mall.manager.enums.material.StateEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -75,8 +76,9 @@ public class WebsitGoodsMVO {
     @ApiModelProperty(value = "状态")
     private StateEnum status;
 
-//    @ApiModelProperty(value = "是否入师傅库存 NO=否 YES=是")
-//    private JudgeEnum manageWorkerStock;
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "是否入师傅库存 NO=否 YES=是")
+    private JudgeEnum manageWorkerStock;
 
     @ApiModelProperty(value = "备注")
     private String remark;