no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/stock/WebsitSalesGoodsVO.java

@@ -1,5 +1,6 @@
 package com.gree.mall.manager.bean.material.stock;
 
+import com.gree.mall.manager.annotation.ZfireField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,15 +11,21 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class WebsitSalesGoodsVO {
 
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "商品编号")
+    private String id;
+
     @ApiModelProperty(value = "商品编号")
     private String goodsId;
 
     @ApiModelProperty(value = "商品名称")
     private String goodsName;
 
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "配件编号")
     private String partsNumber;
 
+    @ZfireField(hide = true)
     @ApiModelProperty(value = "配件名称")
     private String partsName;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/worker/OldRefundManageVO.java

@@ -33,7 +33,7 @@ public class OldRefundManageVO {
     @ApiModelProperty(value = "返还方式")
     private PartsRefundModeEnum refundMode;
 
-    @ApiModelProperty(value = "维修标识 INNER=保内 OUTSIDE=保外")
+    @ApiModelProperty(value = "维修标识")
     private PartsRepairFlagEnum repairFlag;
 
     @ApiModelProperty(value = "快递单号")

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsOldOutLogic.java

@@ -238,7 +238,7 @@ public class WebsitPartsOldOutLogic {
                     .setVoucherNo(voucherNo)
                     .setApplyNo(applyNo)
                     .setRemark(remark)
-                    .setObjectType(objectTypeEnum.toString())
+                    .setObjectType(objectType)
                     .setPartsNumber(partsNumber)
                     .setPartsName(parts.getGoodsName())
                     .setGoodsStockUnit(parts.getGoodsStockUnit())

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WebsitStockLogic.java

@@ -180,6 +180,7 @@ public class WebsitStockLogic {
             websitStockAcc.setChangeQty(websitStock.getQty());
             websitStockAcc.setCloseQty(websitStock.getQty());
             websitStockAcc.setRef("system");
+            websitStockAcc.setRefType("期初导入");
             websitStockAcc.setObj("system");
             websitStockAcc.setOperateBy(adminUser.getNickName());
             websitStockAcc.setOperateTime(new Date());

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -206,6 +206,7 @@
 
     <select id="existStockGoods" resultType="com.gree.mall.manager.bean.material.stock.WebsitSalesGoodsVO">
         SELECT
+            a.id,
             a.goods_id,
             b.goods_name,
         <if test="goodsType=='M'.toString()">