|
|
@@ -51,7 +51,7 @@
|
|
|
<result column="apply_no" jdbcType="VARCHAR" property="applyNo"/>
|
|
|
<result column="sales_Id" jdbcType="VARCHAR" property="salesId"/>
|
|
|
<result column="parts_number" jdbcType="VARCHAR" property="partsNumber"/>
|
|
|
- <result column="parts_nName" jdbcType="VARCHAR" property="partsName"/>
|
|
|
+ <result column="parts_name" jdbcType="VARCHAR" property="partsName"/>
|
|
|
<result column="material_group_name" jdbcType="VARCHAR" property="materialGroupName"/>
|
|
|
<result column="goods_stock_unit" jdbcType="VARCHAR" property="goodsStockUnit"/>
|
|
|
<result column="qty" jdbcType="DECIMAL" property="qty"/>
|
|
|
@@ -411,7 +411,7 @@
|
|
|
<if test="status != null and status != ''">
|
|
|
<!-- and 1 = 0 -->
|
|
|
<if test="status == 'SAVE'.toString() or status == 'SUBMIT'.toString() or status == 'END'.toString() or status == 'CANCEL'.toString()">
|
|
|
- AND a.status = #{state}
|
|
|
+ AND a.status = #{status}
|
|
|
</if>
|
|
|
<if test="status == 'PAYED'.toString()">
|
|
|
AND a.status = 'PAYED' AND (a.worker_confirm_date is null and a.websit_confirm_date is null)
|
