修改

pom.xml

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

src/main/java/com/steerinfo/dil/controller/OyeResultController.java

@@ -62,6 +62,13 @@ public class OyeResultController extends BaseRESTfulController {
         if (con != null && !"null".equals(con)){
             mapValue.put("con","%" + con + "%");
         }
+        if (mapValue.containsKey("saler")) {
+            String saler = mapValue.get("saler").toString();
+            List<String> saleAreaRemark = oyeRealtimeInventoryMapper.getSaleAreaRemark(saler);
+            if(saleAreaRemark.size() > 0) {
+                mapValue.put("saleAreaRemark",saleAreaRemark);
+            }
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = oyeResultService.getOyeInboundResult(mapValue);
@@ -86,6 +93,13 @@ public class OyeResultController extends BaseRESTfulController {
         if (con != null && !"null".equals(con)){
             mapValue.put("con","%" + con + "%");
         }
+        if (mapValue.containsKey("saler")) {
+            String saler = mapValue.get("saler").toString();
+            List<String> saleAreaRemark = oyeRealtimeInventoryMapper.getSaleAreaRemark(saler);
+            if(saleAreaRemark.size() > 0) {
+                mapValue.put("saleAreaRemark",saleAreaRemark);
+            }
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = oyeResultService.getOyeOutboundResult(mapValue);
@@ -110,6 +124,13 @@ public class OyeResultController extends BaseRESTfulController {
         if (con != null && !"null".equals(con)){
             mapValue.put("con","%" + con + "%");
         }
+        if (mapValue.containsKey("saler")) {
+            String saler = mapValue.get("saler").toString();
+            List<String> saleAreaRemark = oyeRealtimeInventoryMapper.getSaleAreaRemark(saler);
+            if(saleAreaRemark.size() > 0) {
+                mapValue.put("saleAreaRemark",saleAreaRemark);
+            }
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = oyeResultService.getOyeRealTimeResult(mapValue);
@@ -181,9 +202,15 @@ public class OyeResultController extends BaseRESTfulController {
         String startTime =  map.get("startTime").toString();
         String endTime =  map.get("endTime").toString();
         DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        if (map.containsKey("saler")) {
+            String saler = map.get("saler").toString();
+            List<String> saleAreaRemark = oyeRealtimeInventoryMapper.getSaleAreaRemark(saler);
+            if(saleAreaRemark.size() > 0) {
+                map.put("saleAreaRemark",saleAreaRemark);
+            }
+        }
         //分页查询数据
         List<Map<String, Object>> columnList = oyeResultService.receiveSendReport(map);
-
         return success(columnList);
     }
 

src/main/java/com/steerinfo/dil/mapper/OyeRealtimeInventoryMapper.java

@@ -26,4 +26,6 @@ public interface OyeRealtimeInventoryMapper extends IBaseMapper<OyeRealtimeInven
 
     List<Map<String,Object>> receiveSendReport(Map<String, Object> map);
 
+    List<String> getSaleAreaRemark(String saler);
+
 }

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

@@ -888,10 +888,16 @@
            <if test="materialSpe != null and materialSpe != ''">
               AND RM.MATERIAL_SPECIFICATION LIKE '%${materialSpe}%'
            </if>
+           <if test="saleAreaRemark != null">
+               and
+               <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
+                 OIR.SALE_AREA like '%${item}%'
+               </foreach>
+           </if>
            </where>
            ORDER BY OIR.INSERT_TIME DESC
   </select>
-    <select id="selectSaleMaterialID" resultType="java.lang.Integer">
+    <select id="selectSaleMaterialID" resultType="java.math.BigDecimal">
       SELECT OIR.SALE_MATERIAL_ID FROM OYE_INBOUND_RESULT OIR
       WHERE OIR.SALE_MATERIAL_ID = #{saleMaterialId}
     </select>

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

@@ -859,6 +859,12 @@
       <if test="materialSpe != null and materialSpe != ''">
         AND RM.MATERIAL_SPECIFICATION LIKE '%${materialSpe}%'
       </if>
+      <if test="saleAreaRemark != null">
+        and
+        <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
+          OOR.SALE_AREA like '%${item}%'
+        </foreach>
+      </if>
     </where>
     ORDER BY OOR.INSERT_TIME DESC
   </select>

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

@@ -729,6 +729,12 @@
       <if test="receiveCompanyId != null and receiveCompanyId != ''">
         AND RC.CONSIGNEE_ID LIKE '%${receiveCompanyId}%'
       </if>
+      <if test="saleAreaRemark != null">
+        and
+        <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
+          ORI.SALE_AREA like '%${item}%'
+        </foreach>
+      </if>
     </where>
     ORDER BY ORI.INSERT_TIME DESC
   </select>
@@ -878,6 +884,12 @@
       <if test="materialModel != null and materialModel != ''">
         AND "materialModel" LIKE '%${materialModel}%'
       </if>
+      <if test="saleAreaRemark != null">
+        and
+        <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
+          "saleArea" like '%${item}%'
+        </foreach>
+      </if>
     </where>
     GROUP BY
       TT."companyName",
@@ -887,5 +899,9 @@
       "materialSpe",
       "materialModel"
   </select>
+  <select id="getSaleAreaRemark" resultType="java.lang.String">
+    SELECT RSR.SALE_REMARK FROM RMS_SALER_REMAR RSR
+    WHERE RSR.SALER_NAME = #{saler}
+  </select>
 
 </mapper>