|
|
@@ -32,59 +32,6 @@
|
|
|
<result column="INVALID" property="invalid"/>
|
|
|
</resultMap>
|
|
|
|
|
|
- <resultMap type="com.abi.qms.platform.dao.vo.result.QrPackageVO" id="QrPackageResult">
|
|
|
- <result property="id" column="id"/>
|
|
|
- <result property="materialId" column="material_id"/>
|
|
|
- <result property="materialCode" column="material_code"/>
|
|
|
- <result property="factoryCoverId" column="factory_cover_id"/>
|
|
|
- <result property="factoryBeerId" column="factory_beer_id"/>
|
|
|
- <result property="standbyRatio" column="standby_ratio"/>
|
|
|
- <result property="reasonApply" column="reason_apply"/>
|
|
|
- <result property="boxCodeFormatId" column="box_code_format_id"/>
|
|
|
- <result property="sapOrderNo" column="sap_order_no"/>
|
|
|
- <result property="bookingOrder" column="booking_order"/>
|
|
|
- <result property="qrNumber" column="qr_number"/>
|
|
|
- <result property="applyStatus" column="apply_status"/>
|
|
|
- <result property="generateStatus" column="generate_status"/>
|
|
|
- <result property="downloadPath" column="download_path"/>
|
|
|
- <result property="isDownload" column="is_download"/>
|
|
|
- <result property="createTime" column="create_time"/>
|
|
|
- <result property="createBy" column="create_by"/>
|
|
|
- <result property="qrType" column="qr_type"/>
|
|
|
- <result property="updateTime" column="update_time"/>
|
|
|
- <result property="updateBy" column="update_by"/>
|
|
|
- <result property="purchaseCount" column="purchase_count"/>
|
|
|
-
|
|
|
- <!-- 包材厂 -->
|
|
|
- <result property="factoryCoverName" column="factory_cover_name"/>
|
|
|
- <!-- 啤酒厂 -->
|
|
|
- <result property="factoryBeerName" column="factory_beer_name"/>
|
|
|
- <!-- 二级包材厂 -->
|
|
|
- <result property="factoryCoverLevelTwoName" column="factory_cover_level_two_name"/>
|
|
|
-
|
|
|
- <!-- 物料名称 -->
|
|
|
- <result property="materialName" column="material_name"/>
|
|
|
- <!-- 码库 -->
|
|
|
- <result property="qrRepertoryId" column="qr_repertory_id"/>
|
|
|
- <result property="qrRepertoryName" column="qr_repertory_name"/>
|
|
|
- <result property="qrRepertoryType" column="qr_repertory_type"/>
|
|
|
- <result property="boxCodeFormatName" column="box_code_format_name"/>
|
|
|
- <!-- 码包下载记录 -->
|
|
|
- <collection property="qrPackageDownloadRecordList" javaType="java.util.List"
|
|
|
- ofType="com.abi.qms.platform.dao.vo.result.QrPackageDownloadRecordVO">
|
|
|
- <result property="createTime" column="download_time"/>
|
|
|
- <result property="createByName" column="download_user_name"/>
|
|
|
- </collection>
|
|
|
- <!-- 码包批次列表 -->
|
|
|
- <collection property="qrPackageBatchVOList" javaType="java.util.List"
|
|
|
- ofType="com.abi.qms.platform.dao.vo.result.QrPackageBatchVO">
|
|
|
- <result property="id" column="batch_id"/>
|
|
|
- <result property="packageId" column="package_id"/>
|
|
|
- <result property="batchNumber" column="batch_number"/>
|
|
|
- <result property="batchQrNumber" column="batch_qr_number"/>
|
|
|
- </collection>
|
|
|
- </resultMap>
|
|
|
-
|
|
|
<select id="listQrPackage" resultType="com.abi.qms.platform.dao.vo.result.QrPackageVO">
|
|
|
SELECT
|
|
|
qp.id,
|
|
|
@@ -136,7 +83,7 @@
|
|
|
|
|
|
</select>
|
|
|
|
|
|
- <select id="selectQrPackageDetailById" resultMap="QrPackageResult">
|
|
|
+ <select id="selectQrPackageDetailById" resultType="com.abi.qms.platform.dao.vo.result.QrPackageVO">
|
|
|
SELECT
|
|
|
qp.id,
|
|
|
qp.material_id,
|
|
|
@@ -158,36 +105,58 @@
|
|
|
qp.update_time,
|
|
|
qp.update_by,
|
|
|
qp.qr_type,
|
|
|
- bm.material_name,
|
|
|
+ material.material_name,
|
|
|
bcf.name as box_code_format_name,
|
|
|
- bfc.factory_name as factory_cover_name,
|
|
|
- bfb.factory_name as factory_beer_name,
|
|
|
- bfc_l2.factory_name as factory_cover_level_two_name,
|
|
|
+ f_cover.factory_name as factory_cover_name,
|
|
|
+ f_cover.is_first_factory,
|
|
|
+ f_beer.factory_name as factory_beer_name,
|
|
|
+ f_cover_l2.factory_name as factory_cover_level_two_name,
|
|
|
+ f_cover_l2.id as factory_cover_level_two_id,
|
|
|
qr.id AS qr_repertory_id,
|
|
|
qr.name AS qr_repertory_name,
|
|
|
qr.type AS qr_repertory_type,
|
|
|
- qpdr.create_time AS download_time,
|
|
|
- ui.user_name AS download_user_name,
|
|
|
- qpb.id as batch_id,
|
|
|
- qpb.package_id,
|
|
|
- qpb.batch_number,
|
|
|
- qpb.batch_qr_number,
|
|
|
sap_item.purchase_count
|
|
|
FROM
|
|
|
qr_package qp
|
|
|
LEFT JOIN qr_box_code_format bcf ON qp.box_code_format_id = bcf.id
|
|
|
LEFT JOIN qr_repertory qr ON bcf.qr_repertory_id = qr.id
|
|
|
- LEFT JOIN base_material bm ON qp.material_id = bm.id
|
|
|
- LEFT JOIN base_factory bfc ON qp.factory_cover_id = bfc.id
|
|
|
- LEFT JOIN base_factory bfb ON qp.factory_beer_id = bfb.id
|
|
|
- LEFT JOIN base_factory bfc_l2 ON qp.factory_cover_level_two_id = bfc_l2.id and bfc_l2.factory_type=3
|
|
|
- LEFT JOIN qr_package_sap_order_item sap_item on sap_item.sap_order_no=qp.sap_order_no and sap_item.sap_material_id=bm.material_code and sap_item.is_delete=0
|
|
|
- LEFT JOIN qr_package_download_record qpdr ON qpdr.qr_package_id = qp.id
|
|
|
- LEFT JOIN qr_package_batch qpb ON qpb.package_id = qp.id
|
|
|
- LEFT JOIN user_info ui ON ui.id = qpdr.create_by
|
|
|
+ LEFT JOIN base_material material ON qp.material_id = material.id
|
|
|
+ LEFT JOIN base_factory f_cover ON qp.factory_cover_id = f_cover.id
|
|
|
+ LEFT JOIN base_factory f_beer ON qp.factory_beer_id = f_beer.id
|
|
|
+ LEFT JOIN base_factory f_cover_l2 ON qp.factory_cover_level_two_id = f_cover_l2.id and f_cover_l2.factory_type=3
|
|
|
+ LEFT JOIN qr_package_sap_order_item sap_item on sap_item.sap_order_no=qp.sap_order_no and sap_item.sap_material_id=material.material_code and sap_item.is_delete=0
|
|
|
+
|
|
|
WHERE qp.id = #{id}
|
|
|
+
|
|
|
</select>
|
|
|
|
|
|
+ <select id="listQrPackageDownloadRecord" resultType="com.abi.qms.platform.dao.vo.result.QrPackageDownloadRecordVO">
|
|
|
+ select
|
|
|
+ d.create_time,
|
|
|
+ ui.user_name AS create_by_name
|
|
|
+
|
|
|
+ FROM qr_package_download_record d
|
|
|
+ LEFT JOIN user_info ui ON ui.id = d.create_by
|
|
|
+
|
|
|
+ WHERE
|
|
|
+ d.qr_package_id = #{qrPackageId}
|
|
|
+ and is_delete = 0
|
|
|
+ </select>
|
|
|
+
|
|
|
+ <select id="listQrBatch" resultType="com.abi.qms.platform.dao.vo.result.QrPackageBatchVO">
|
|
|
+ SELECT
|
|
|
+ batch.id,
|
|
|
+ batch.package_id,
|
|
|
+ batch.batch_number,
|
|
|
+ batch.batch_qr_number
|
|
|
+ FROM
|
|
|
+ qr_package_batch batch
|
|
|
+ WHERE
|
|
|
+ batch.package_id = #{qrPackageId}
|
|
|
+ and is_delete = 0
|
|
|
+ </select>
|
|
|
+
|
|
|
+
|
|
|
<select id="getQrSingleCheckDetailById" resultType="com.abi.qms.platform.dao.vo.result.QrSingleCheckVO">
|
|
|
SELECT
|
|
|
qp.id,
|
tanzhongran