|
@@ -123,6 +123,11 @@
|
|
|
<result property="fDismountStatus" column="f_dismount_status" />
|
|
|
<result property="fFeeStatus" column="f_fee_status" />
|
|
|
<result property="fServiceitemsNew" column="f_serviceitems_new" />
|
|
|
+ <result property="fReceivable" column="f_receivable" />
|
|
|
+ <result property="fRecycle" column="f_recycle" />
|
|
|
+ <result property="fDue" column="f_due" />
|
|
|
+ <result property="fPay" column="f_pay" />
|
|
|
+ <result property="fCaregoStatus" column="f_carego_status" />
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="WarehouseBillsVO" id="WarehousebillsVOResult">
|
|
@@ -147,7 +152,7 @@
|
|
|
free_container_date, f_business_attribution, f_fee_status, f_supervision_unit, f_declaration_elements, f_part_number, f_ifinspection, f_value, f_weighing_date,
|
|
|
f_ifsampling, send_sample_date, f_ifweight_recovery, weight_recovery_date, warehouse_status, f_times ,f_date_changed, f_chargetype,f_weigh_weight,
|
|
|
f_predict_branch,f_grade,f_delivery_details,f_salesman_id,f_itemstatus,f_updete_status, f_submit_update, f_delete_status,f_remarks_fees,f_cargo_planning,
|
|
|
- f_arrival_status,f_dismount_status,f_serviceitems_new from t_warehousebills
|
|
|
+ f_arrival_status,f_dismount_status,f_serviceitems_new,f_receivable,f_recycle,f_due,f_pay,f_carego_status from t_warehousebills
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
|
|
@@ -1076,6 +1081,11 @@
|
|
|
<if test="fArrivalStatus != null">f_arrival_status,</if>
|
|
|
<if test="fDismountStatus != null">f_dismount_status,</if>
|
|
|
<if test="fServiceitemsNew != null">f_serviceitems_new,</if>
|
|
|
+ <if test="fReceivable != null">f_receivable,</if>
|
|
|
+ <if test="fRecycle != null">f_recycle,</if>
|
|
|
+ <if test="fDue != null">f_due,</if>
|
|
|
+ <if test="fPay != null">f_pay,</if>
|
|
|
+ <if test="fCaregoStatus != null">f_carego_status,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="fBillno != null">#{fBillno},</if>
|
|
@@ -1195,6 +1205,11 @@
|
|
|
<if test="fArrivalStatus != null">#{fArrivalStatus},</if>
|
|
|
<if test="fDismountStatus != null">#{fDismountStatus},</if>
|
|
|
<if test="fServiceitemsNew != null">#{fServiceitemsNew},</if>
|
|
|
+ <if test="fReceivable != null">#{fReceivable},</if>
|
|
|
+ <if test="fRecycle != null">#{fRecycle},</if>
|
|
|
+ <if test="fDue != null">#{fDue},</if>
|
|
|
+ <if test="fPay != null">#{fPay},</if>
|
|
|
+ <if test="fCaregoStatus != null">#{fCaregoStatus},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
@@ -1318,6 +1333,11 @@
|
|
|
<if test="fArrivalStatus != null">f_arrival_status = #{fArrivalStatus},</if>
|
|
|
<if test="fDismountStatus != null">f_dismount_status = #{fDismountStatus},</if>
|
|
|
<if test="fServiceitemsNew != null">f_serviceitems_new = #{fServiceitemsNew},</if>
|
|
|
+ <if test="fReceivable != null">f_receivable = #{fReceivable},</if>
|
|
|
+ <if test="fRecycle != null">f_recycle = #{fRecycle},</if>
|
|
|
+ <if test="fDue != null">f_due = #{fDue},</if>
|
|
|
+ <if test="fPay != null">f_pay = #{fPay},</if>
|
|
|
+ <if test="fCaregoStatus != null">f_carego_status = #{fCaregoStatus},</if>
|
|
|
</trim>
|
|
|
where f_id = #{fId}
|
|
|
</update>
|
|
@@ -1443,6 +1463,11 @@
|
|
|
<if test="fArrivalStatus != null">f_arrival_status = #{fArrivalStatus},</if>
|
|
|
<if test="fDismountStatus != null">f_dismount_status = #{fDismountStatus},</if>
|
|
|
<if test="fServiceitemsNew != null">f_serviceitems_new = #{fServiceitemsNew},</if>
|
|
|
+ <if test="fReceivable != null">f_receivable = #{fReceivable},</if>
|
|
|
+ <if test="fRecycle != null">f_recycle = #{fRecycle},</if>
|
|
|
+ <if test="fDue != null">f_due = #{fDue},</if>
|
|
|
+ <if test="fPay != null">f_pay = #{fPay},</if>
|
|
|
+ <if test="fCaregoStatus != null">f_carego_status = #{fCaregoStatus},</if>
|
|
|
</trim>
|
|
|
where f_id = #{fId}
|
|
|
</update>
|
|
@@ -1950,7 +1975,18 @@
|
|
|
tw.f_voyid fVoyid,
|
|
|
tw.remark remark,
|
|
|
IFNULL(tcntr.loadCntr,0) AS loadCntr,
|
|
|
- tw.f_serviceitems_new AS fServiceitemsNew
|
|
|
+ tw.f_serviceitems_new AS fServiceitemsNew,
|
|
|
+ tw.f_receivable AS fReceivable,
|
|
|
+ tw.f_recycle AS fRecycle,
|
|
|
+ tw.f_due AS fDue,
|
|
|
+ tw.f_pay AS fPay,
|
|
|
+ CASE
|
|
|
+ WHEN tp.f_name = '青岛凯和志诚物流有限公司' AND tw.f_receivable = '0' AND tw.f_carego_status != '3' THEN '放货'
|
|
|
+ WHEN tw.f_receivable = '0' THEN '录入'
|
|
|
+ WHEN tw.f_receivable > '0' AND tw.f_receivable > tw.f_recycle THEN '未放货'
|
|
|
+ WHEN tw.f_receivable > '0' AND tw.f_receivable = tw.f_recycle AND tw.f_carego_status != '3' THEN '放货'
|
|
|
+ WHEN tw.f_carego_status = '3' THEN '扣货'
|
|
|
+ END AS fCaregoStatus
|
|
|
FROM
|
|
|
t_warehousebills tw
|
|
|
LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
|
|
@@ -2501,7 +2537,18 @@
|
|
|
tw.f_cargo_planning,
|
|
|
tw.f_arrival_status,
|
|
|
tw.f_dismount_status,
|
|
|
- tw.f_serviceitems_new
|
|
|
+ tw.f_serviceitems_new,
|
|
|
+ tw.f_receivable,
|
|
|
+ tw.f_recycle,
|
|
|
+ tw.f_due,
|
|
|
+ tw.f_pay,
|
|
|
+ CASE
|
|
|
+ WHEN tc.f_name = '青岛凯和志诚物流有限公司' AND tw.f_receivable = '0' AND tw.f_carego_status != '3' THEN '放货'
|
|
|
+ WHEN tw.f_receivable = '0' THEN '录入'
|
|
|
+ WHEN tw.f_receivable > '0' AND tw.f_receivable > tw.f_recycle THEN '未放货'
|
|
|
+ WHEN tw.f_receivable > '0' AND tw.f_receivable = tw.f_recycle AND tw.f_carego_status != '3' THEN '放货'
|
|
|
+ WHEN tw.f_carego_status = '3' THEN '扣货'
|
|
|
+ END AS fCaregoStatus
|
|
|
FROM t_warehousebills tw
|
|
|
LEFT JOIN t_address address ON address.f_id = tw.f_loadportid
|
|
|
LEFT JOIN t_address ta ON ta.f_id = tw.f_loadportid
|