Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -57,6 +57,8 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      */
     List<Map<String, Object>> getDataKind(Map param);
 
+
+
     /**
      * @desc : 获取组织部门
      * @author : 姜宁

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -154,8 +154,12 @@
             AND kind_code =any(#{kindCodeList,typeHandler=StringListTypeHandler})
         </if>
         order by display_no
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
     </select>
 
+
     <!-- 获取组织部门 -->
     <select id="getOrg" resultType="java.util.Map">
         select org_Id     AS "orgId",

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -589,8 +589,8 @@
         <include refid="Base_Column_List_Response"/>
         ,tpid.into_no as "intoNo"
         ,tmgs.sku_code  as "skuCode"
-        ,tmgs.sku_model as "skuModel"
-        ,tmgs.sku_name  as "skuName"
+        ,tpii.sku_model as "skuModel"
+        ,tpii.sku_name  as "skuName"
         ,tmgs.sku_spec  as "skuSpec"
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -10,7 +10,7 @@
         sys.f_remove_zero(item_qty) as item_qty, price_std, amt_std, price_sale, item_amt, price_discount, non_std_code, out_status,
         sys.f_remove_zero(outing_qty) as outing_qty, outing_amt, sys.f_remove_zero(out_qty) as out_qty, out_amt,
         sys.f_remove_zero(return_qty) as return_qty, return_amt, remarks, flg_valid, cp_id, wh_id,
-        fact_price,fact_amt,disc_amt,use_place,discount
+        fact_price,fact_amt,use_place,discount
     </sql>
 
     <sql id="Base_Column_List_Response">
@@ -18,7 +18,7 @@
         t.out_status, sys.f_remove_zero(t.outing_qty) as outing_qty, t.outing_amt, sys.f_remove_zero(t.out_qty) as out_qty, t.out_amt,
         sys.f_remove_zero(t.return_qty) as return_qty, t.return_amt, t.remarks, t.flg_valid, t.cp_id, t.wh_id
         ,t.box,t.piece,t.sub_unit_id,t.unit_id,t.pack_box,
-        t.fact_price,t.fact_amt,t.disc_amt,t,use_place,t.discount
+        t.fact_price,t.fact_amt,t,use_place,t.discount
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -53,7 +53,6 @@
         <result column="decimalPlaces" property="decimalPlaces"/>
         <result column="fact_price" property="factPrice"/>
         <result column="fact_amt" property="factAmt"/>
-        <result column="disc_amt" property="discAmt"/>
         <result column="use_place" property="usePlace"/>
         <result column="discount" property="discount"/>
     </resultMap>
@@ -95,7 +94,6 @@
         <result column="decimalPlaces" property="decimalPlaces"/>
         <result column="fact_price" property="factPrice"/>
         <result column="fact_amt" property="factAmt"/>
-        <result column="disc_amt" property="discAmt"/>
         <result column="use_place" property="usePlace"/>
         <result column="discount" property="discount"/>
     </resultMap>
@@ -198,7 +196,6 @@
                t.price_discount,
                t.fact_price,
                t.fact_amt,
-               t.disc_amt,
                t.use_place,
                t.discount,
                t.non_std_code,
@@ -519,9 +516,6 @@
             <if test=" et!=null and et.cpId != null">
                 fact_amt = #{et.factAmt,jdbcType=NUMERIC},
             </if>
-            <if test=" et!=null and et.cpId != null">
-                disc_amt = #{et.discAmt,jdbcType=NUMERIC},
-            </if>
             <if test=" et!=null and et.usePlace != null">
                 use_place = #{et.usePlace,jdbcType=VARCHAR},
             </if>
@@ -635,7 +629,6 @@
         t.price_discount,
         t.fact_price,
         t.fact_amt,
-        t.disc_amt,
         t.use_place,
         t.discount,
         t.non_std_code,

src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -261,12 +261,6 @@ public class OrderItem extends PageInfo<OrderItem> implements Serializable {
     @ApiModelProperty(value = "优惠后金额")
     private BigDecimal factAmt;
 
-    /**
-     * 优惠金额
-     */
-    @Excel(name = "优惠金额")
-    @ApiModelProperty(value = "优惠金额")
-    private BigDecimal discAmt;
 
     /**
      * 使用位置

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -398,13 +398,6 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     private BigDecimal factAmt;
 
     /**
-     * 优惠金额
-     */
-    @Excel(name = "优惠金额")
-    @ApiModelProperty(value = "优惠金额")
-    private BigDecimal discAmt;
-
-    /**
      * 使用位置
      */
     @Excel(name = "使用位置")

src/main/java/com/dk/mdm/model/vo/sale/OrderItemVO.java

@@ -267,13 +267,6 @@ public class OrderItemVO extends PageInfo<OrderItemVO> implements Serializable {
     private BigDecimal factAmt;
 
     /**
-     * 优惠金额
-     */
-    @ApiModelProperty(value = "优惠金额")
-    private BigDecimal discAmt;
-
-
-    /**
      * 使用位置
      */
     @ApiModelProperty(value = "使用位置")

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

@@ -163,6 +163,7 @@ public class CommonService extends BaseService<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getDataKind(Map<String, Object> param) {
         // 获取系统基础数据
         List<Map<String, Object>> list = commonMapper.getDataKind(param);
+
         return ResponseResultUtil.success(list);
     }