|
|
|
|
@ -118,6 +118,11 @@
|
|
|
|
|
`incoming_batch` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次号（库存品）', |
|
|
|
|
`material_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物料名称(库存品)', |
|
|
|
|
`waybill_number` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '运单号', |
|
|
|
|
`send_warehouse_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发站仓名称', |
|
|
|
|
`tray_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '托盘名称', |
|
|
|
|
`brand_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '品牌名称', |
|
|
|
|
`inventory_time` datetime(0) NULL DEFAULT NULL COMMENT '盘点时间', |
|
|
|
|
`inventory_user` bigint(20) NULL DEFAULT NULL COMMENT '盘点人', |
|
|
|
|
PRIMARY KEY (`id`) USING BTREE, |
|
|
|
|
INDEX `quest_id_index`(`quest_id`,`tenant_id`) USING BTREE COMMENT '任务id', |
|
|
|
|
INDEX `order_id_index`(`order_id`) USING BTREE COMMENT '订单id', |
|
|
|
|
@ -133,14 +138,14 @@
|
|
|
|
|
`is_deleted`, `status`, `reserve1`, `reserve2`, `reserve3`, `reserve4`, `reserve5`, `order_code`, `quest_id`, `order_id`, `quest_type`, `quest_target`, |
|
|
|
|
`order_package_code`, `order_package_id`, `category_name`, `stock_id`, `quest_status`, `stock_num`, `warehouse_id`, `position_code`, `tray_code`, `tray_id`, |
|
|
|
|
`allocation_id`, `grounding_allocation_id`, `is_new`, `grounding_position_code`, `material_code`, `market_name`, `firsts`, `second`, |
|
|
|
|
`third_product`, `incoming_batch`, `material_name`, `waybill_number`) VALUES |
|
|
|
|
`third_product`, `incoming_batch`, `material_name`, `waybill_number`,`send_warehouse_name`,`tray_name`,`brand_name`) VALUES |
|
|
|
|
<foreach collection="list" item="item" separator=","> |
|
|
|
|
(#{item.id}, #{item.tenantId}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}, #{item.createDept}, #{item.isDeleted} |
|
|
|
|
, #{item.status}, #{item.reserve1}, #{item.reserve2}, #{item.reserve3}, #{item.reserve4}, #{item.reserve5}, #{item.orderCode}, #{item.questId}, #{item.orderId} |
|
|
|
|
, #{item.questType}, #{item.questTarget}, #{item.orderPackageCode}, #{item.orderPackageId}, #{item.categoryName}, #{item.stockId}, #{item.questStatus}, |
|
|
|
|
#{item.stockNum}, #{item.warehouseId} , #{item.positionCode}, #{item.trayCode}, #{item.trayId}, #{item.allocationId}, #{item.groundingAllocationId}, |
|
|
|
|
#{item.isNew}, #{item.groundingPositionCode}, #{item.materialCode}, #{item.marketName} , #{item.firsts} , #{item.second} , |
|
|
|
|
#{item.thirdProduct} , #{item.incomingBatch}, #{item.materialName}, #{item.waybillNumber} |
|
|
|
|
#{item.thirdProduct} , #{item.incomingBatch}, #{item.materialName}, #{item.waybillNumber}, #{item.sendWarehouseName},#{item.trayName},#{item.brandName} |
|
|
|
|
) |
|
|
|
|
</foreach> |
|
|
|
|
|
|
|
|
|
@ -235,11 +240,17 @@
|
|
|
|
|
<if test="param.allocationId != null and param.allocationId != ''">and allocation_id =#{param.allocationId } </if> |
|
|
|
|
<if test="param.trayId != null and param.trayId != ''">and tray_id =#{param.trayId } </if> |
|
|
|
|
<if test="param.orderCode != null and param.orderCode != ''">and order_code like concat('%',#{param.orderCode },'%') </if> |
|
|
|
|
<if test="param.categoryName != null and param.categoryName != ''">and category_name like concat('%'#{param.categoryName },'%') </if> |
|
|
|
|
<if test="param.categoryName != null and param.categoryName != ''">and category_name like concat('%',#{param.categoryName },'%') </if> |
|
|
|
|
<if test="param.materialCode != null and param.materialCode != ''">and material_code like concat('%',#{param.materialCode },'%') </if> |
|
|
|
|
<if test="param.trayCode != null and param.trayCode != ''">and tray_code like concat('%',#{param.trayCode },'%') </if> |
|
|
|
|
<if test="param.trayName != null and param.trayName != ''">and tray_name like concat('%',#{param.trayName },'%') </if> |
|
|
|
|
<if test="param.brandName != null and param.brandName != ''">and brand_name like concat('%',#{param.brandName },'%') </if> |
|
|
|
|
<if test="param.marketName != null and param.marketName != ''">and market_name like concat('%',#{param.marketName},'%') </if> |
|
|
|
|
<if test="param.materialName != null and param.materialName != ''">and material_name like concat('%',#{param.materialName},'%') </if> |
|
|
|
|
<if test="param.positionCode != null and param.positionCode != ''">and position_code like concat('%',#{param.positionCode},'%') </if> |
|
|
|
|
<if test="param.orderPackageCode != null and param.orderPackageCode != ''">and order_package_code =#{param.orderPackageCode } </if> |
|
|
|
|
<if test="param.inventoryUser != null and param.inventoryUser != ''">and inventory_user like concat('%',#{param.inventoryUser },'%') </if> |
|
|
|
|
<if test="param.startTime != null and param.startTime != ''"> and inventory_time BETWEEN #{param.startTime } and #{param.endTime}</if> |
|
|
|
|
<if test="param.marketNames != null"> |
|
|
|
|
and material_name in |
|
|
|
|
<foreach collection="param.marketNames" item="a" open="(" close=")" separator=","> |
|
|
|
|
@ -304,6 +315,8 @@
|
|
|
|
|
<if test="item.allocationId != null and item.allocationId != null">allocation_id = #{item.allocationId },</if> |
|
|
|
|
<if test="item.updateUser != null and item.updateUser != null">update_user = #{item.updateUser },</if> |
|
|
|
|
<if test="item.updateTime != null and item.updateTime != null">update_time = #{item.updateTime },</if> |
|
|
|
|
<if test="item.inventoryUser != null and item.inventoryUser != null">inventory_user = #{item.inventoryUser },</if> |
|
|
|
|
<if test="item.inventoryTime != null ">inventory_time = #{item.inventoryTime }, </if> |
|
|
|
|
<!-- <if test="item. != null and item. != null"> = #{item. }</if> |
|
|
|
|
<if test="item. != null and item. != null"> = #{item. }</if> |
|
|
|
|
<if test="item. != null and item. != null"> = #{item. }</if> |
|
|
|
|
|
caoyizhong
1 year ago