修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-wms-api</artifactId>
-    <version>1.11</version>
+    <version>1.1</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/resources/com/steerinfo/dil/mapper/OyeInboundResultMapper.xml

@@ -852,7 +852,8 @@
            RM.MATERIAL_MODEL    "materialModel",
            OO.ORDER_ID          "orderId",
            OO.ORDER_NUMBER      "orderNumber",
-           OO.CAPACITY_ID       "capacityId"
+           OO.CAPACITY_ID       "capacityId",
+           ASM.EAS_PRIMARY_ID   "easPrimaryId"
            FROM OYE_INBOUND_RESULT OIR
            LEFT JOIN RMS_MATERIAL RM on OIR.MATERIAL_ID = RM.MATERIAL_ID
            LEFT JOIN RMS_CONSIGNEE RC on OIR.CONSIGNEE_ID = RC.CONSIGNEE_ID

src/main/resources/com/steerinfo/dil/mapper/OyeRealtimeInventoryMapper.xml

@@ -883,27 +883,27 @@
     LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ORI.MATERIAL_ID
     <where>
       <if test="companyName != null and companyName != ''">
-        AND  "companyName" LIKE '%${companyName}%'
+        AND RC.CONSIGNEE_COMPANY_NAME LIKE '%${companyName}%'
       </if>
       <if test="saleArea != null and saleArea != ''">
-        AND "saleArea" LIKE '%${saleArea}%'
+        AND ORI.SALE_AREA LIKE '%${saleArea}%'
       </if>
       <if test="inboundWarehouse != null and inboundWarehouse != ''">
-        AND "inboundWarehouse" LIKE '%${inboundWarehouse}%'
+        AND ORI.INBOUND_WAREHOUSE LIKE '%${inboundWarehouse}%'
       </if>
       <if test="materialName != null and materialName != ''">
-        AND "materialName" LIKE '%${materialName}%'
+        AND RM.MATERIAL_NAME LIKE '%${materialName}%'
       </if>
       <if test="materialSpe != null and materialSpe != ''">
-        AND "materialSpe" LIKE '%${materialSpe}%'
+        AND RM.MATERIAL_SPECIFICATION LIKE '%${materialSpe}%'
       </if>
       <if test="materialModel != null and materialModel != ''">
-        AND "materialModel" LIKE '%${materialModel}%'
+        AND RM.MATERIAL_MODEL LIKE '%${materialModel}%'
       </if>
       <if test="saleAreaRemark != null">
         and
         <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
-          "saleArea" like '%${item}%'
+          ORI.SALE_AREA like '%${item}%'
         </foreach>
       </if>
     </where>