weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PDA容器移位修改bug

Browse Source
This commit is contained in:
秦鸿展
2026-03-13 19:46:06 +08:00
parent d7dd8a4567
commit 6db8a47b4c
10 changed files with 604 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+46 -6
View File
@@ -85,6 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<sql id="selectMaterialInventoryPo1">
<if test="materialInventoryId != null ">
and a.material_inventory_id = #{materialInventoryId}
</if>
<if test="organizationId != null ">
and a.organization_id = #{organizationId}
</if>
@@ -130,9 +133,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialDetailId != null ">
and a.material_detail_id, = #{materialDetailId}
</if>
<if test="batchNumber != null and batchNumber != ''">
and a.batch_number = #{batchNumber}
</if>
<!-- 容器号或批次号：containerOrBatch 优先；若 batchNumber 与 containerCode 相同则按 OR 查（PDA 单输入框传两个相同值） -->
<choose>
<when test="containerOrBatch != null and containerOrBatch != ''">
and (a.container_code like concat('%', #{containerOrBatch}, '%') or a.batch_number like concat('%', #{containerOrBatch}, '%'))
</when>
<when test="batchNumber != null and batchNumber != '' and containerCode != null and containerCode != '' and batchNumber == containerCode">
and (a.batch_number like concat('%', #{batchNumber}, '%') or a.container_code like concat('%', #{containerCode}, '%'))
</when>
<otherwise>
<if test="batchNumber != null and batchNumber != ''">
and a.batch_number like concat('%', #{batchNumber}, '%')
</if>
<if test="containerCode != null and containerCode != ''">
and a.container_code like concat('%', #{containerCode}, '%')
</if>
</otherwise>
</choose>
<if test="materialStatusCode != null and materialStatusCode != ''">
and a.material_status_code like concat('%', #{materialStatusCode}, '%')
</if>
@@ -142,9 +159,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="containerId != null ">
and a.container_id = #{containerId}
</if>
<if test="containerCode != null and containerCode != ''">
and a.container_code like concat('%', #{containerCode}, '%')
</if>
<if test="containerType != null and containerType != ''">
and a.container_type like concat('%', #{containerType}, '%')
</if>
@@ -256,6 +270,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="organizationName" column="organization_name" />
<result property="topOrganizationId" column="top_organization_id" />
<result property="shipperId" column="shipper_id" />
<result property="shipperCode" column="shipper_code" />
<result property="shipperName" column="shipper_name" />
<result property="materialCode" column="material_code" />
<result property="materialName" column="material_name" />
@@ -270,8 +285,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="storageLocationCode" column="storage_location_code" />
<result property="storageLocationName" column="storage_location_name" />
<result property="materialBaseInfoId" column="material_base_info_id" />
<result property="batchNumber" column="batch_number" />
<result property="materialStatusCode" column="material_status_code" />
<result property="materialStatusName" column="material_status_name" />
<result property="containerId" column="container_id" />
<result property="containerCode" column="container_code" />
<result property="containerType" column="container_type" />
<result property="containerTypeName" column="container_type_name" />
<result property="inventoryQuantity" column="inventory_quantity" />
<result property="allocationQuantity" column="allocation_quantity" />
<result property="freezeQuantity" column="freeze_quantity" />
<result property="isAble" column="is_able" />
<result property="unit" column="unit" />
<result property="unitName" column="unit_name" />
<result property="netWeight" column="NET_WEIGHT" />
<result property="grossWeight" column="GROSS_WEIGHT" />
<result property="volume" column="VOLUME" />
<result property="area" column="area" />
<result property="batchRefNo" column="BATCH_REF_NO" />
<result property="sheetRefNo" column="SHEET_REF_NO" />
<result property="boxPalletNo" column="BOX_PALLET_NO" />
<result property="extAttr1" column="ext_attr_1" />
<result property="extAttr2" column="ext_attr_2" />
<result property="productionDate" column="production_date" />
<result property="expiryDate" column="expiry_date" />
<result property="inventoryDate" column="inventory_date" />
<result property="extAttr3" column="ext_attr_3" />
<result property="extAttr4" column="ext_attr_4" />
<result property="remark" column="remark" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />