绑定逻辑 作业完成逻辑修改
This commit is contained in:
@@ -488,9 +488,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
pd_detail_id,pd_product_name,pd_model,pd_unit,pd_unit_price,pd_aux_unit,pd_attr1,pd_attr2,pd_quantity,pd_in_qty,pd_aux_quantity,pd_total_price,pd_cost_unit_price,pd_total_price_2,pd_account_cost_total,pd_account_quantity,pd_account_status,pd_batch_no,pd_serial_no,pd_prod_date,pd_valid_date,pd_arrival_date,pd_remark,pd_custom1,pd_custom2,pd_custom3,pd_custom4,pd_custom5,pd_custom6,pd_loader)
|
||||
VALUES
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
(#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.productId}
|
||||
,#{item.productName},/*#{item.voltage},#{item.netWeight},#{item.grossWeight},#{item.distribution},*/#{item.orderId},
|
||||
#{item.pdDetailId},#{item.pdProductName},#{item.pdModel},#{item.pdUnit},#{item.pdUnitPrice},#{item.pdAuxUnit},#{item.pdAttr1},#{item.pdAttr2},#{item.pdQuantity},#{item.pdInQty},#{item.pdAuxQuantity},#{item.pdTotalPrice},#{item.pdCostUnitPrice},#{item.pdTotalPrice2},#{item.pdAccountCostTotal},#{item.pdAccountQuantity},#{item.pdAccountStatus},#{item.pdBatchNo},#{item.pdSerialNo},#{item.pdProdDate},#{item.pdValidDate},#{item.pdArrivalDate},#{item.pdRemark},#{item.pdCustom1},#{item.pdCustom2},#{item.pdCustom3},#{item.pdCustom4},#{item.pdCustom5},#{item.pdCustom6},#{item.pdLoader})
|
||||
(#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate, jdbcType=VARCHAR},#{item.backDate, jdbcType=VARCHAR},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.productId}
|
||||
,#{item.productName},#{item.orderId},
|
||||
#{item.pdDetailId},#{item.pdProductName},#{item.pdModel},#{item.pdUnit},#{item.pdUnitPrice},#{item.pdAuxUnit},#{item.pdAttr1},#{item.pdAttr2},#{item.pdQuantity},#{item.pdInQty},#{item.pdAuxQuantity},#{item.pdTotalPrice},#{item.pdCostUnitPrice},#{item.pdTotalPrice2},#{item.pdAccountCostTotal},#{item.pdAccountQuantity},#{item.pdAccountStatus},#{item.pdBatchNo},#{item.pdSerialNo},#{item.pdProdDate, jdbcType=VARCHAR},#{item.pdValidDate, jdbcType=VARCHAR},#{item.pdArrivalDate, jdbcType=VARCHAR},#{item.pdRemark},#{item.pdCustom1},#{item.pdCustom2},#{item.pdCustom3},#{item.pdCustom4},#{item.pdCustom5},#{item.pdCustom6},#{item.pdLoader})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<select id="selectInStockinDetailNList" parameterType="InStockinDetailN" resultMap="InStockinDetailNResult">
|
||||
<include refid="selectInStockinDetailNVo"/>
|
||||
<where>
|
||||
<if test="erpDetailId != null "> and erp_detail_id = #{erpDetailId}</if>
|
||||
<if test="erpDetailId != null and erpDetailId!=0"> and erp_detail_id = #{erpDetailId}</if>
|
||||
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
|
||||
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
|
||||
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
|
||||
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<insert id="insertInStockinDetailN" parameterType="InStockinDetailN">
|
||||
insert into in_stockin_detail_n
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="erpDetailId != null">erp_detail_id,</if>
|
||||
<if test="erpDetailId != null and erpDetailId!=0">erp_detail_id,</if>
|
||||
<if test="stockinGuid != null">stockin_guid,</if>
|
||||
<if test="stockinId != null">stockin_id,</if>
|
||||
<if test="productName != null">product_name,</if>
|
||||
@@ -128,6 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="custom4 != null">custom4,</if>
|
||||
<if test="custom5 != null">custom5,</if>
|
||||
<if test="custom6 != null">custom6,</if>
|
||||
<if test="smNum != null">sm_num,</if>
|
||||
<if test="finishNum != null">finish_num,</if>
|
||||
<if test="stevedore != null">stevedore,</if>
|
||||
<if test="orderSrc != null">order_src,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
@@ -135,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="stockinDetailId != null">stockin_detail_id,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="erpDetailId != null">#{erpDetailId},</if>
|
||||
<if test="erpDetailId != null and erpDetailId!=0">#{erpDetailId},</if>
|
||||
<if test="stockinGuid != null">#{stockinGuid},</if>
|
||||
<if test="stockinId != null">#{stockinId},</if>
|
||||
<if test="productName != null">#{productName},</if>
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.system.mapper.InStockinNMapper">
|
||||
|
||||
<resultMap type="InStockinN" id="InStockinNResult">
|
||||
<result property="stockinGuid" column="stockin_guid" />
|
||||
<result property="stockinId" column="stockin_id" />
|
||||
<result property="subject" column="subject" />
|
||||
<result property="erpStockinId" column="erp_stockin_id" />
|
||||
<result property="orderNum" column="order_num" />
|
||||
<result property="finishNum" column="finish_num" />
|
||||
<result property="status" column="status" />
|
||||
<result property="applicant" column="applicant" />
|
||||
<result property="applyDate" column="apply_date" />
|
||||
<result property="confirmDate" column="confirm_date" />
|
||||
<result property="approver" column="approver" />
|
||||
<result property="approvalComment" column="approval_comment" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="relatedDocId" column="related_doc_id" />
|
||||
<result property="createdAt" column="created_at" />
|
||||
<result property="keeperId" column="keeper_id" />
|
||||
<result property="category" column="category" />
|
||||
<result property="entryCode" column="entry_code" />
|
||||
<result property="approvalStatus" column="approval_status" />
|
||||
<result property="productDetails" column="product_details" />
|
||||
<result property="customerName" column="customer_name" />
|
||||
<result property="weighbillNo" column="weighbill_no" />
|
||||
<result property="vehicleNo" column="vehicle_no" />
|
||||
<result property="erpStatus" column="erp_status" />
|
||||
<result property="orderSrc" column="order_src" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectInStockinNVo">
|
||||
select stockin_guid, stockin_id,subject, erp_stockin_id, order_num, finish_num, status, applicant, apply_date, confirm_date, approver, approval_comment, remark, related_doc_id, created_at, keeper_id, category, entry_code, approval_status, product_details, customer_name, weighbill_no, vehicle_no, erp_status, order_src, create_time, update_time from in_stockin_n
|
||||
</sql>
|
||||
|
||||
<select id="selectInStockinNList" parameterType="InStockinN" resultMap="InStockinNResult">
|
||||
<include refid="selectInStockinNVo"/>
|
||||
<where>
|
||||
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
|
||||
<if test="subject != null and subject != ''"> and subject = #{subject}</if>
|
||||
<if test="erpStockinId != null and erpStockinId != ''"> and erp_stockin_id = #{erpStockinId}</if>
|
||||
<if test="orderNum != null "> and order_num = #{orderNum}</if>
|
||||
<if test="finishNum != null "> and finish_num = #{finishNum}</if>
|
||||
<if test="status != null and status != 0"> and status = #{status}</if>
|
||||
<if test="applicant != null and applicant != ''"> and applicant = #{applicant}</if>
|
||||
<if test="applyDate != null and applyDate != ''"> and apply_date = #{applyDate}</if>
|
||||
<if test="confirmDate != null and confirmDate != ''"> and confirm_date = #{confirmDate}</if>
|
||||
<if test="approver != null and approver != ''"> and approver = #{approver}</if>
|
||||
<if test="approvalComment != null and approvalComment != ''"> and approval_comment = #{approvalComment}</if>
|
||||
<if test="relatedDocId != null and relatedDocId != ''"> and related_doc_id = #{relatedDocId}</if>
|
||||
<if test="createdAt != null and createdAt != ''"> and created_at = #{createdAt}</if>
|
||||
<if test="keeperId != null "> and keeper_id = #{keeperId}</if>
|
||||
<if test="category != null and category != ''"> and category = #{category}</if>
|
||||
<if test="entryCode != null and entryCode != ''"> and entry_code = #{entryCode}</if>
|
||||
<if test="approvalStatus != null "> and approval_status = #{approvalStatus}</if>
|
||||
<if test="productDetails != null and productDetails != ''"> and product_details = #{productDetails}</if>
|
||||
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
|
||||
<if test="weighbillNo != null and weighbillNo != ''"> and weighbill_no = #{weighbillNo}</if>
|
||||
<if test="vehicleNo != null and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
|
||||
<if test="erpStatus != null and erpStatus != ''"> and erp_status = #{erpStatus}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectInStockinNByStockinGuid" parameterType="String" resultMap="InStockinNResult">
|
||||
<include refid="selectInStockinNVo"/>
|
||||
where stockin_guid = #{stockinGuid}
|
||||
</select>
|
||||
|
||||
<insert id="insertInStockinN" parameterType="InStockinN">
|
||||
insert into in_stockin_n
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="stockinGuid != null">stockin_guid,</if>
|
||||
<if test="stockinId != null and stockinId != ''">stockin_id,</if>
|
||||
<if test="subject != null">subject,</if>
|
||||
<if test="erpStockinId != null">erp_stockin_id,</if>
|
||||
<if test="orderNum != null">order_num,</if>
|
||||
<if test="finishNum != null">finish_num,</if>
|
||||
<if test="status != null">status,</if>
|
||||
<if test="applicant != null">applicant,</if>
|
||||
<if test="applyDate != null">apply_date,</if>
|
||||
<if test="confirmDate != null">confirm_date,</if>
|
||||
<if test="approver != null">approver,</if>
|
||||
<if test="approvalComment != null">approval_comment,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="relatedDocId != null">related_doc_id,</if>
|
||||
<if test="createdAt != null and createdAt != ''">created_at,</if>
|
||||
<if test="keeperId != null">keeper_id,</if>
|
||||
<if test="category != null">category,</if>
|
||||
<if test="entryCode != null">entry_code,</if>
|
||||
<if test="approvalStatus != null">approval_status,</if>
|
||||
<if test="productDetails != null">product_details,</if>
|
||||
<if test="customerName != null">customer_name,</if>
|
||||
<if test="weighbillNo != null">weighbill_no,</if>
|
||||
<if test="vehicleNo != null">vehicle_no,</if>
|
||||
<if test="erpStatus != null">erp_status,</if>
|
||||
<if test="orderSrc != null">order_Src,</if>
|
||||
create_time
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="stockinGuid != null">#{stockinGuid},</if>
|
||||
<if test="stockinId != null and stockinId != ''">#{stockinId},</if>
|
||||
<if test="subject != null">#{subject},</if>
|
||||
<if test="erpStockinId != null">#{erpStockinId},</if>
|
||||
<if test="orderNum != null">#{orderNum},</if>
|
||||
<if test="finishNum != null">#{finishNum},</if>
|
||||
<if test="status != null">#{status},</if>
|
||||
<if test="applicant != null">#{applicant},</if>
|
||||
<if test="applyDate != null">#{applyDate},</if>
|
||||
<if test="confirmDate != null">#{confirmDate},</if>
|
||||
<if test="approver != null">#{approver},</if>
|
||||
<if test="approvalComment != null">#{approvalComment},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="relatedDocId != null">#{relatedDocId},</if>
|
||||
<if test="createdAt != null and createdAt != ''">#{createdAt},</if>
|
||||
<if test="keeperId != null">#{keeperId},</if>
|
||||
<if test="category != null">#{category},</if>
|
||||
<if test="entryCode != null">#{entryCode},</if>
|
||||
<if test="approvalStatus != null">#{approvalStatus},</if>
|
||||
<if test="productDetails != null">#{productDetails},</if>
|
||||
<if test="customerName != null">#{customerName},</if>
|
||||
<if test="weighbillNo != null">#{weighbillNo},</if>
|
||||
<if test="vehicleNo != null">#{vehicleNo},</if>
|
||||
<if test="erpStatus != null">#{erpStatus},</if>
|
||||
<if test="orderSrc != null">#{orderSrc},</if>
|
||||
GETDATE()
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateInStockinN" parameterType="InStockinN">
|
||||
update in_stockin_n
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
|
||||
<if test="subject != null">subject = #{subject},</if>
|
||||
<if test="erpStockinId != null">erp_stockin_id = #{erpStockinId},</if>
|
||||
<if test="orderNum != null">order_num = #{orderNum},</if>
|
||||
<if test="finishNum != null">finish_num = #{finishNum},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
<if test="applicant != null">applicant = #{applicant},</if>
|
||||
<if test="applyDate != null">apply_date = #{applyDate},</if>
|
||||
<if test="confirmDate != null">confirm_date = #{confirmDate},</if>
|
||||
<if test="approver != null">approver = #{approver},</if>
|
||||
<if test="approvalComment != null">approval_comment = #{approvalComment},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="relatedDocId != null">related_doc_id = #{relatedDocId},</if>
|
||||
<if test="createdAt != null and createdAt != ''">created_at = #{createdAt},</if>
|
||||
<if test="keeperId != null">keeper_id = #{keeperId},</if>
|
||||
<if test="category != null">category = #{category},</if>
|
||||
<if test="entryCode != null">entry_code = #{entryCode},</if>
|
||||
<if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
|
||||
<if test="productDetails != null">product_details = #{productDetails},</if>
|
||||
<if test="customerName != null">customer_name = #{customerName},</if>
|
||||
<if test="weighbillNo != null">weighbill_no = #{weighbillNo},</if>
|
||||
<if test="vehicleNo != null">vehicle_no = #{vehicleNo},</if>
|
||||
<if test="erpStatus != null">erp_status = #{erpStatus},</if>
|
||||
<if test="orderSrc != null">order_src = #{orderSrc},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where stockin_guid = #{stockinGuid}
|
||||
</update>
|
||||
|
||||
<delete id="deleteInStockinNByStockinGuid" parameterType="String">
|
||||
delete from in_stockin_n where stockin_guid = #{stockinGuid}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteInStockinNByStockinGuids" parameterType="String">
|
||||
delete from in_stockin_n where stockin_guid in
|
||||
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
|
||||
#{stockinGuid}
|
||||
</foreach>
|
||||
</delete>
|
||||
<select id="selectInStockinNByStockinIdAndDate" resultMap="InStockinNResult">
|
||||
<include refid="selectInStockinNVo"/>
|
||||
where erp_stockin_id = #{stockinId} and created_at like concat(#{date}, '%')
|
||||
</select>
|
||||
<select id="selectInStockinNByStockinId" parameterType="String" resultMap="InStockinNResult">
|
||||
<include refid="selectInStockinNVo"/>
|
||||
where stockin_id = #{stockinGuid}
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user