Merge branch 'dev_qinhongzhanWMS' into wms_dev

mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml

@@ -75,6 +75,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="totalArea"    column="TOTAL_AREA"    />
         <result property="totalAmount"    column="TOTAL_AMOUNT"    />
         <result property="unit"    column="UNIT"    />
+        <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"    />
     </resultMap>
 
 
@@ -109,7 +116,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.TOTAL_VOLUME,
         a.TOTAL_AREA,
         a.TOTAL_AMOUNT,
-        a.UNIT
+        a.UNIT,
+        a.EXT_ATTR_1,
+        a.EXT_ATTR_2,
+        a.PRODUCTION_DATE,
+        a.EXPIRY_DATE,
+        a.INVENTORY_DATE,
+        a.EXT_ATTR_3,
+        a.EXT_ATTR_4
     </sql>
 
     <sql id="selectMaterialDetailPo1">

mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml

@@ -69,7 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.storage_section_id, a.storage_code, a.storage_name, a.storage_location_id, a.storage_location_code, a.storage_location_name, a.material_base_info_id,a.material_detail_id,
         a.batch_number,a.material_status_code,a.material_status_name,a.container_id,a.container_code,a.container_type,a.container_type_name,IFNULL(a.freeze_quantity,0) freeze_quantity,a.is_able,
         IFNULL(a.inventory_quantity,0) inventory_quantity, IFNULL(a.allocation_quantity,0) allocation_quantity, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name,
-        a.del_flag,a.unit,a.area,a.NET_WEIGHT,a.GROSS_WEIGHT,a.VOLUME
+        a.del_flag,a.unit,a.area,a.NET_WEIGHT,a.GROSS_WEIGHT,a.VOLUME,
+        a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO
     </sql>
 
     <sql id="selectMaterialInventoryPo1">
@@ -162,6 +163,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="storageInfo != null  and storageInfo != ''">
             and (a.storage_location_code = #{storageInfo} or material_code = #{storageInfo} or material_name like concat('%', #{storageInfo}, '%') or bar_code = #{storageInfo})
         </if>
+        <if test="batchRefNo != null  and batchRefNo != ''">
+            and a.BATCH_REF_NO like concat('%', #{batchRefNo}, '%')
+        </if>
+        <if test="sheetRefNo != null  and sheetRefNo != ''">
+            and a.SHEET_REF_NO like concat('%', #{sheetRefNo}, '%')
+        </if>
+        <if test="boxPalletNo != null  and boxPalletNo != ''">
+            and a.BOX_PALLET_NO like concat('%', #{boxPalletNo}, '%')
+        </if>
     </sql>
 
     <select id="queryList" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">

mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml

@@ -37,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="storageLocationCode"    column="storage_location_code"    />
         <result property="storageLocationName"    column="storage_location_name"    />
         <result property="remark"    column="remark"    />
-        <result property="invoiceNo"    column="INVOICE_NO"    />
         <result property="batchRefNo"    column="BATCH_REF_NO"    />
         <result property="sheetRefNo"    column="SHEET_REF_NO"    />
         <result property="boxPalletNo"    column="BOX_PALLET_NO"    />
@@ -66,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.material_inventory_id, a.batch_number, a.container_id, a.container_code, a.container_type, a.container_type_name, a.material_status_code, a.material_status_name,
         a.warehouse_id, a.warehouse_code, a.warehouse_name, a.storage_section_id, a.storage_code, a.storage_name,
         a.storage_location_id, a.storage_location_code, a.storage_location_name, a.remark,
-        a.INVOICE_NO, a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO, a.EXT_ATTR_1, a.EXT_ATTR_2,
+        a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO, a.EXT_ATTR_1, a.EXT_ATTR_2,
         a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_3, a.EXT_ATTR_4,
         a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag
     </sql>

mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml

@@ -277,6 +277,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <include refid="selectStockOutOrderPo1"/>
         </where>
-        order by a.create_time desc
+        order by a.create_time desc nulls last
     </select>
 </mapper>