dongke 2 rokov pred
rodič
commit
667989eb29

+ 2 - 2
src/main/java/com/dk/mdm/controller/ivt/InboundController.java

@@ -91,7 +91,7 @@ public class InboundController{
             value = "采购入库新建",
             notes = "采购入库新建"
     )
-    @PostMapping({"purchase_inbound_insert"})
+    @PostMapping({"purchase_inbound/insert"})
     public ResponseResultVO<?> purchaseInboundInsert(@Valid @RequestBody InboundVO inboundVO) {
         return inheritedPurchaseService.purchaseInboundInsert(inboundVO);
     }
@@ -104,7 +104,7 @@ public class InboundController{
             value = "采购入库办理",
             notes = "采购入库办理"
     )
-    @PostMapping({"purchase_handle_inbound"})
+    @PostMapping({"purchase_handle_inbound/insert"})
     public ResponseResultVO<?> purchaseHandleInbound(@RequestBody InboundVO inboundVO) {
         return inheritedPurchaseService.purchaseHandleInbound(inboundVO);
     }

+ 1 - 0
src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.xml

@@ -147,6 +147,7 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_JOIN"/>
+        ,tmgb.short_name AS "shorName"
         ,tmgb.brand_name AS "brandName",tmgsr.series_name AS "seriesName",tpi.usable_qty AS "usableQty"
         FROM dkic_b.t_mst_goods_sku  tmgs
         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id

+ 6 - 1
src/main/java/com/dk/mdm/model/response/mst/GoodsSkuResponse.java

@@ -62,7 +62,12 @@ public class GoodsSkuResponse implements Serializable {
     @ApiModelProperty(value = "商品名称")
     private String skuName;
 
-
+    /**
+     * 品牌简称
+     */
+    @Excel(name = "品牌简称")
+    @ApiModelProperty(value = "品牌简称")
+    private String shortName;
     /**
      * 商品型号
      */