Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml

@@ -655,8 +655,7 @@
         where equipment_id = #{equipmentId}
     </update>
 
-    <select id="selectAuxiliaryEquipmentList" parameterType="com.op.wms.domain.EquBindAuxiliaryEquipment"
-            resultType="BaseEquipment">
+    <select id="selectAuxiliaryEquipmentList" parameterType="com.op.wms.domain.EquBindAuxiliaryEquipment" resultType="BaseEquipment">
 		select
 		    ebac.auxiliary_equipment_code AS equipmentCode,
 		    be.equipment_name AS equipmentName,
@@ -664,11 +663,10 @@
 		from equ_bind_auxiliary_equipment ebac
 		left join base_equipment be on ebac.auxiliary_equipment_code = be.equipment_code
 		where ebac.equipment_code = #{equipmentCode}
+		order by ebac.auxiliary_equipment_code asc
 	</select>
 
-
-    <select id="selectWXRecordsList" parameterType="com.op.wms.domain.BaseEquipment"
-            resultType="com.op.wms.domain.BaseEquipment">
+    <select id="selectWXRecordsList" parameterType="com.op.wms.domain.BaseEquipment" resultType="com.op.wms.domain.BaseEquipment">
 		select
 			work_code AS workCode,
 			work_person AS workPerson,
@@ -684,8 +682,7 @@
 		and del_flag = '0'
 	</select>
 
-    <select id="selectBYRecordsList" parameterType="com.op.wms.domain.BaseEquipment"
-            resultType="com.op.wms.domain.BaseEquipment">
+    <select id="selectBYRecordsList" parameterType="com.op.wms.domain.BaseEquipment" resultType="com.op.wms.domain.BaseEquipment">
 		select
         	order_code AS orderCode,
             CONCAT(plan_loop, plan_loop_type) AS planLoop,

op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml

@@ -73,19 +73,13 @@
     <select id="selectBaseProductList" parameterType="BaseProduct" resultMap="BaseProductResult">
         <include refid="selectBaseProductVo"/>
         <where>
-            <if test="productCode != null  and productCode != ''">and product_code like concat('%', #{productCode},
-                '%')
-            </if>
-            <if test="productDescZh != null  and productDescZh != ''">and product_desc_zh like concat('%',
-                #{productDescZh}, '%')
-            </if>
+            <if test="productCode != null  and productCode != ''">and product_code like concat('%', #{productCode},'%')</if>
+            <if test="productDescZh != null  and productDescZh != ''">and product_desc_zh like concat('%',#{productDescZh}, '%')</if>
             <if test="productModel != null  and productModel != ''">and product_model = #{productModel}</if>
             <if test="productDescEn != null  and productDescEn != ''">and product_desc_en = #{productDescEn}</if>
             <if test="ruleCode != null  and ruleCode != ''">and rule_code = #{ruleCode}</if>
             <if test="oldProductCode != null  and oldProductCode != ''">and old_product_code = #{oldProductCode}</if>
-            <if test="partsProductCode != null  and partsProductCode != ''">and parts_product_code =
-                #{partsProductCode}
-            </if>
+            <if test="partsProductCode != null  and partsProductCode != ''">and parts_product_code = #{partsProductCode}</if>
             <if test="skuBarcode != null  and skuBarcode != ''">and sku_barcode = #{skuBarcode}</if>
             <if test="length != null ">and length = #{length}</if>
             <if test="width != null ">and width = #{width}</if>
@@ -96,9 +90,7 @@
             <if test="volume != null ">and volume = #{volume}</if>
             <if test="unitPrice != null ">and unit_price = #{unitPrice}</if>
             <if test="productGroup != null  and productGroup != ''">and product_group = #{productGroup}</if>
-            <if test="productGroupName != null  and productGroupName != ''">and product_group_name like concat('%',
-                #{productGroupName}, '%')
-            </if>
+            <if test="productGroupName != null  and productGroupName != ''">and product_group_name like concat('%',#{productGroupName}, '%')</if>
             <if test="userDefined1 != null  and userDefined1 != ''">and user_defined1 = #{userDefined1}</if>
             <if test="userDefined2 != null  and userDefined2 != ''">and user_defined2 = #{userDefined2}</if>
             <if test="userDefined3 != null  and userDefined3 != ''">and user_defined3 = #{userDefined3}</if>
@@ -120,6 +112,7 @@
             <if test="mtart != null  and mtart != ''">and mtart = #{mtart}</if>
             and del_flag = '0'
         </where>
+        order by product_code asc
     </select>
 
     <select id="selectBaseProductByProductId" parameterType="String" resultMap="BaseProductResult">