供应商

src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.xml

@@ -45,7 +45,7 @@
     <sql id="Base_Column_List_JOIN">
         tmgs.price_other,tmgs.sku_id, tmgs.sku_code, tmgs.sku_name, tmgs.sku_model, tmgs.brand_id, tmgs.category_id, tmgs.unit_id, tmgs.sub_unit_id,
               tmgs.conversion_factor, tmgs.series_id, tmgs.sku_spec, tmgs.price_purchase, tmgs.price_standard,
-              tmgs.price_wholesale, tmgs.price_limited, tmgs.price_other,tmgs.sku_images, tmgs.remarks, tmgs.flg_valid, tmgs.cp_id
+           tmgs.pack_box,   tmgs.price_wholesale, tmgs.price_limited, tmgs.price_other,tmgs.sku_images, tmgs.remarks, tmgs.flg_valid, tmgs.cp_id
     </sql>
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.mst.GoodsSkuResponse">
         <id column="sku_id" property="skuId"/>
@@ -65,6 +65,7 @@
         <result column="price_other" property="priceOther"/>
         <result column="price_limited" property="priceLimited"/>
         <result column="price_other" property="priceOther"/>
+        <result column="pack_box" property="packBox"/>
 
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="remarks" property="remarks"/>

src/main/java/com/dk/mdm/model/pojo/mst/GoodsSku.java

@@ -47,7 +47,12 @@ public class GoodsSku extends PageInfo<GoodsSku> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
 
-
+    /**
+     * 包装
+     */
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
     /**
      * 商品编号
      */

src/main/java/com/dk/mdm/model/response/mst/GoodsSkuResponse.java

@@ -38,7 +38,12 @@ public class GoodsSkuResponse implements Serializable {
     /*
      * 数据库字段
      */
-
+    /**
+     * 包装
+     */
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
     /**
      * 商品ID
      */

src/main/java/com/dk/mdm/model/vo/mst/GoodsSkuVO.java

@@ -76,7 +76,12 @@ public class GoodsSkuVO implements Serializable {
     @ApiModelProperty(value = "入库数量 (流入为正数，流出为负数)")
     private BigDecimal intoQty;
 
-
+    /**
+     * 包装
+     */
+    @Excel(name = "包装")
+    @ApiModelProperty(value = "包装")
+    private Integer packBox;
     /**
      * 成本价格
      */

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -778,6 +778,12 @@ public class CommonService extends BaseService<Map<String, Object>> {
             map.put("kindType","跟进方式");
             list = commonMapper.getDataKind(map);
         }
+        //供应商类别
+        if (dataSourceCode.equals("supType")) {
+            map.put("kindType","供应商类别");
+            list = commonMapper.getDataKind(map);
+        }
+
         return ResponseResultUtil.success(list);
     }
 

src/main/java/com/dk/mdm/service/mac/AccountService.java

@@ -696,7 +696,7 @@ public class AccountService extends BaseService<Account> {
             inboundMapper.update(null, updateWrapper);
         }
         // 其他支出单
-        else if ("".equals(biznisType)) {
+        else if ("t_mac_other_payable".equals(biznisType)) {
             OtherPayable otherPayable = otherPayableMapper.selectByIdForUpdate(invoiceId);
             objectId = otherPayable.getObjectId();