|
@@ -25,20 +25,22 @@
|
|
|
<result column="GROSS_SEGMENT_SQE" jdbcType="DECIMAL" property="grossSegmentSqe" />
|
|
|
<result column="TARE_SEGMENT_SQE" jdbcType="DECIMAL" property="tareSegmentSqe" />
|
|
|
<result column="MATERIAL_NUM" jdbcType="DECIMAL" property="materialNum" />
|
|
|
+ <result column="SALE_MATERIAL_ID" jdbcType="DECIMAL" property="saleMaterialId" />
|
|
|
</resultMap>
|
|
|
<sql id="columns">
|
|
|
WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME,
|
|
|
RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, INSERT_USERNAME,
|
|
|
INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETE_NAME, DELETE_TIME,
|
|
|
RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT, ISQUALITY, GROSS_SEGMENT_SQE,
|
|
|
- TARE_SEGMENT_SQE, MATERIAL_NUM
|
|
|
+ TARE_SEGMENT_SQE, MATERIAL_NUM, SALE_MATERIAL_ID
|
|
|
</sql>
|
|
|
<sql id="columns_alias">
|
|
|
t.WEIGHT_TASK_RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_POUND_NO, t.RESULT_GROSS_WEIGHT,
|
|
|
t.RESULT_GROSS_WEIGHT_TIME, t.RESULT_TARE_WEIGHT, t.RESULT_TARE_WEIGHT_TIME, t.RESULT_NET_WEIGHT,
|
|
|
t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
|
|
|
t.DELETE_NAME, t.DELETE_TIME, t.RESULT_GROSS_PLACE_ID, t.RESULT_TARE_PLACE_ID, t.MATERIAL_ID,
|
|
|
- t.ISDEDUCT, t.ISQUALITY, t.GROSS_SEGMENT_SQE, t.TARE_SEGMENT_SQE, t.MATERIAL_NUM
|
|
|
+ t.ISDEDUCT, t.ISQUALITY, t.GROSS_SEGMENT_SQE, t.TARE_SEGMENT_SQE, t.MATERIAL_NUM,
|
|
|
+ t.SALE_MATERIAL_ID
|
|
|
</sql>
|
|
|
<sql id="select">
|
|
|
SELECT <include refid="columns" /> FROM TMSTRUCK_WEIGHT_RESULT
|
|
@@ -117,6 +119,9 @@
|
|
|
<if test="materialNum != null">
|
|
|
and MATERIAL_NUM = #{materialNum}
|
|
|
</if>
|
|
|
+ <if test="saleMaterialId != null">
|
|
|
+ and SALE_MATERIAL_ID = #{saleMaterialId}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
</sql>
|
|
|
<sql id="whereLike">
|
|
@@ -190,9 +195,12 @@
|
|
|
<if test="materialNum != null">
|
|
|
and MATERIAL_NUM = #{materialNum}
|
|
|
</if>
|
|
|
+ <if test="saleMaterialId != null">
|
|
|
+ and SALE_MATERIAL_ID = #{saleMaterialId}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
</sql>
|
|
|
- <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
|
|
|
+ <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
|
|
|
delete from TMSTRUCK_WEIGHT_RESULT
|
|
|
where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
|
|
|
</delete>
|
|
@@ -265,6 +273,9 @@
|
|
|
<if test="materialNum != null">
|
|
|
or MATERIAL_NUM = #{materialNum}
|
|
|
</if>
|
|
|
+ <if test="saleMaterialId != null">
|
|
|
+ or SALE_MATERIAL_ID = #{saleMaterialId}
|
|
|
+ </if>
|
|
|
</delete>
|
|
|
<insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
|
|
|
insert into TMSTRUCK_WEIGHT_RESULT (WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID,
|
|
@@ -275,7 +286,7 @@
|
|
|
DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
|
|
|
RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT,
|
|
|
ISQUALITY, GROSS_SEGMENT_SQE, TARE_SEGMENT_SQE,
|
|
|
- MATERIAL_NUM)
|
|
|
+ MATERIAL_NUM, SALE_MATERIAL_ID)
|
|
|
values (#{weightTaskResultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
|
|
|
#{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL}, #{resultGrossWeightTime,jdbcType=TIMESTAMP},
|
|
|
#{resultTareWeight,jdbcType=DECIMAL}, #{resultTareWeightTime,jdbcType=TIMESTAMP},
|
|
@@ -284,7 +295,7 @@
|
|
|
#{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{resultGrossPlaceId,jdbcType=DECIMAL},
|
|
|
#{resultTarePlaceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{isdeduct,jdbcType=DECIMAL},
|
|
|
#{isquality,jdbcType=DECIMAL}, #{grossSegmentSqe,jdbcType=DECIMAL}, #{tareSegmentSqe,jdbcType=DECIMAL},
|
|
|
- #{materialNum,jdbcType=DECIMAL})
|
|
|
+ #{materialNum,jdbcType=DECIMAL}, #{saleMaterialId,jdbcType=DECIMAL})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
|
|
|
insert into TMSTRUCK_WEIGHT_RESULT
|
|
@@ -358,6 +369,9 @@
|
|
|
<if test="materialNum != null">
|
|
|
MATERIAL_NUM,
|
|
|
</if>
|
|
|
+ <if test="saleMaterialId != null">
|
|
|
+ SALE_MATERIAL_ID,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="weightTaskResultId != null">
|
|
@@ -429,6 +443,9 @@
|
|
|
<if test="materialNum != null">
|
|
|
#{materialNum,jdbcType=DECIMAL},
|
|
|
</if>
|
|
|
+ <if test="saleMaterialId != null">
|
|
|
+ #{saleMaterialId,jdbcType=DECIMAL},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
|
|
@@ -454,7 +471,8 @@
|
|
|
ISQUALITY = #{isquality,jdbcType=DECIMAL},
|
|
|
GROSS_SEGMENT_SQE = #{grossSegmentSqe,jdbcType=DECIMAL},
|
|
|
TARE_SEGMENT_SQE = #{tareSegmentSqe,jdbcType=DECIMAL},
|
|
|
- MATERIAL_NUM = #{materialNum,jdbcType=DECIMAL}
|
|
|
+ MATERIAL_NUM = #{materialNum,jdbcType=DECIMAL},
|
|
|
+ SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
|
|
|
where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
|
|
|
</update>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
|
|
@@ -526,10 +544,13 @@
|
|
|
<if test="materialNum != null">
|
|
|
MATERIAL_NUM = #{materialNum,jdbcType=DECIMAL},
|
|
|
</if>
|
|
|
+ <if test="saleMaterialId != null">
|
|
|
+ SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
|
|
|
</update>
|
|
|
- <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
|
|
|
+ <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
|
|
|
<include refid="select" />
|
|
|
where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
|
|
|
</select>
|
|
@@ -553,7 +574,8 @@
|
|
|
DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
|
|
|
RESULT_TARE_PLACE_ID, MATERIAL_ID,
|
|
|
ISDEDUCT, ISQUALITY, GROSS_SEGMENT_SQE,
|
|
|
- TARE_SEGMENT_SQE, MATERIAL_NUM)
|
|
|
+ TARE_SEGMENT_SQE, MATERIAL_NUM,
|
|
|
+ SALE_MATERIAL_ID)
|
|
|
( <foreach collection="list" item="item" separator="union all">
|
|
|
select
|
|
|
#{item.weightTaskResultId,jdbcType=DECIMAL},
|
|
@@ -566,7 +588,8 @@
|
|
|
#{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.resultGrossPlaceId,jdbcType=DECIMAL},
|
|
|
#{item.resultTarePlaceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL},
|
|
|
#{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL}, #{item.grossSegmentSqe,jdbcType=DECIMAL},
|
|
|
- #{item.tareSegmentSqe,jdbcType=DECIMAL}, #{item.materialNum,jdbcType=DECIMAL} from dual
|
|
|
+ #{item.tareSegmentSqe,jdbcType=DECIMAL}, #{item.materialNum,jdbcType=DECIMAL},
|
|
|
+ #{item.saleMaterialId,jdbcType=DECIMAL} from dual
|
|
|
</foreach> )
|
|
|
</insert>
|
|
|
<update id="batchUpdate" parameterType="java.util.List">
|
|
@@ -664,6 +687,10 @@
|
|
|
<foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
|
|
|
when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.materialNum,jdbcType=DECIMAL}
|
|
|
</foreach>
|
|
|
+ ,SALE_MATERIAL_ID=
|
|
|
+ <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
|
|
|
+ when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.saleMaterialId,jdbcType=DECIMAL}
|
|
|
+ </foreach>
|
|
|
where WEIGHT_TASK_RESULT_ID in
|
|
|
<foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
|
|
|
#{item.weightTaskResultId,jdbcType=DECIMAL}
|
|
@@ -1015,9 +1042,15 @@
|
|
|
left join AMS_SALE_TRUCKNO_MATERIAL ASTM on ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
|
|
|
left join AMS_SALE_MATERIAL ASM on ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
|
|
|
left join OMSTRUCK_ORDER_MATERIAL OOM on OO.ORDER_ID = OOM.ORDER_ID
|
|
|
+ AND OOM.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID AND OOM.SALE_MATERIAL_ID IS NOT NULL
|
|
|
+ OR (OO.ORDER_ID = OOM.ORDER_ID and OOM.SALE_MATERIAL_ID IS NULL)
|
|
|
where ASM.MATERIAL_ID = #{materialId}
|
|
|
AND OO.ORDER_ID = #{orderId}
|
|
|
AND OOM.MATERIAL_ID = #{materialId}
|
|
|
+ AND ASM.SALE_MATERIAL_ID NOT IN (
|
|
|
+ SELECT nvl(TWR.SALE_MATERIAL_ID,0) FROM TMSTRUCK_TOTAL_RESULT TTR
|
|
|
+ LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
+ WHERE TTR.ORDER_ID = #{orderId})
|
|
|
fetch first 1 row only
|
|
|
</select>
|
|
|
|
|
@@ -1125,7 +1158,8 @@
|
|
|
TWR.RESULT_TARE_WEIGHT_TIME = NULL,
|
|
|
TWR.INSERT_UPDATE_REMARK = '计量联动删除',
|
|
|
TWR.RESULT_POUND_NO = NULL,
|
|
|
- TWR.MATERIAL_ID = NULL
|
|
|
+ TWR.MATERIAL_ID = NULL,
|
|
|
+ TWR.SALE_MATERIAL_ID = NULL
|
|
|
WHERE TWR.WEIGHT_TASK_RESULT_ID = #{weightTaskResultId}
|
|
|
</update>
|
|
|
<update id="updateWeightTareNoGross" parameterType="java.math.BigDecimal">
|
|
@@ -1142,6 +1176,7 @@
|
|
|
SET OO.ORDER_LINE_SEQUENCE = #{orderLineSqe}
|
|
|
WHERE OO.ORDER_ID = #{orderId}
|
|
|
</update>
|
|
|
+
|
|
|
<select id="selectWeightMes" resultType="java.util.Map">
|
|
|
SELECT TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
|
|
|
TWR.TARE_SEGMENT_SQE "tareSqe",
|
|
@@ -1165,4 +1200,51 @@
|
|
|
AND OOM.ORDER_ID = #{orderId}
|
|
|
FETCH FIRST 1 row only
|
|
|
</select>
|
|
|
+ <select id="getIsSelfMention" resultType="java.lang.String" parameterType="map">
|
|
|
+ SELECT ASO.SALE_ORDER_ISSELF_MENTION FROM OMSTRUCK_ORDER OO
|
|
|
+ LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
+ ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
|
|
|
+ LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
|
|
|
+ WHERE OO.ORDER_NUMBER = #{orderNumber}
|
|
|
+ AND OO.ORDER_STATUS = 5
|
|
|
+ </select>
|
|
|
+ <select id="getJlSaleOrderMaterialId" resultType="java.math.BigDecimal">
|
|
|
+ SELECT distinct ASOM.SALE_ORDER_MATERIAL_ID FROM AMS_SALE_MATERIAL ASM
|
|
|
+ LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
+ ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
|
|
|
+ LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
+ ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
|
|
|
+ WHERE ASM.EAS_PRIMARY_ID = #{flId}
|
|
|
+ </select>
|
|
|
+ <select id="getJlSpell" resultType="java.math.BigDecimal" parameterType="decimal">
|
|
|
+ SELECT count(astm.TRUCKNO_MATERIAL_ID) FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
|
|
|
+ WHERE ASTM.SALE_ORDER_MATERIAL_ID = #{jlSaleOrderMaterialId}
|
|
|
+ </select>
|
|
|
+ <select id="getWlSpell" resultType="java.math.BigDecimal" parameterType="map">
|
|
|
+ SELECT count(oom.ORDER_MATERIAL_ID) FROM OMSTRUCK_ORDER OO
|
|
|
+ LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
|
|
|
+ ON OOM.ORDER_ID = OO.ORDER_ID
|
|
|
+ WHERE OO.ORDER_NUMBER = #{orderNumber}
|
|
|
+ and oo.order_status = 5
|
|
|
+ </select>
|
|
|
+ <select id="getJlOrderId" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
|
|
|
+ SELECT OO.ORDER_ID FROM OMSTRUCK_ORDER OO
|
|
|
+ WHERE OO.ORDER_PLAN_ID = #{jlSaleOrderMaterialId}
|
|
|
+ AND OO.ORDER_TYPE = 1
|
|
|
+ </select>
|
|
|
+ <select id="getWlSaleOrderMaterialId" resultType="java.math.BigDecimal" parameterType="map">
|
|
|
+ SELECT OO.ORDER_PLAN_ID FROM OMSTRUCK_ORDER OO
|
|
|
+ WHERE OO.ORDER_NUMBER = #{orderNumber}
|
|
|
+ AND OO.ORDER_STATUS = 5
|
|
|
+ </select>
|
|
|
+ <update id="updateOrderPlanId" >
|
|
|
+ UPDATE OMSTRUCK_ORDER OO
|
|
|
+ SET OO.ORDER_PLAN_ID = #{wlSaleOrderMaterialId}
|
|
|
+ WHERE OO.ORDER_ID = #{jlOrderId}
|
|
|
+ </update>
|
|
|
+ <update id="updateOrderMaterialId">
|
|
|
+ UPDATE OMSTRUCK_ORDER_MATERIAL OOM
|
|
|
+ SET OOM.SALE_MATERIAL_ID = null
|
|
|
+ WHERE OOM.ORDER_ID = #{jlOrderId}
|
|
|
+ </update>
|
|
|
</mapper>
|