修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-ams-api</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -65,6 +65,8 @@ public class OyeWarehouseController extends BaseRESTfulController {
                                          Integer pageSize,
                                          Integer apiId) {
 
+
+
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> mapList = rmsReceivePlaceMapper.getOyeWarehouse(mapValue);
@@ -148,6 +150,14 @@ public class OyeWarehouseController extends BaseRESTfulController {
                                       String startTime,
                                       String endTime){
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        if (mapValue.containsKey("saler")) {
+            String saler = mapValue.get("saler").toString();
+            List<String> saleAreaRemark = amsSaleMaterialMapper.getSaleAreaRemark(saler);
+            if(saleAreaRemark.size() > 0) {
+                mapValue.put("saleAreaRemark",saleAreaRemark);
+            }
+            mapValue.put("salers",saler);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> mapList = oyeWarehouseService.getTransPlan(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,mapList);

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

@@ -66,4 +66,6 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
 
     int updateSaleStatus(int saleOrderId);
 
+    List<String> getSaleAreaRemark(String saler);
+
 }

src/main/java/com/steerinfo/dil/service/impl/OyeWarehouseServiceImpl.java

@@ -94,6 +94,7 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
         String isSelfMention = (String) mapValue.get("isSelfMention");
         // 摘要
         String saleRemark = (String) mapValue.get("saleRemark");
+        //String userName = (String) mapValue.get("userName");
         if (saleRemark == null) {
             throw new Exception("片区不能为空");
         }
@@ -132,7 +133,7 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
         amsSaleOrder.setSaleNumber(DataChange.generateEightDigitsNumber("WOYDD",saleOrderId.intValue(),"-"));
         amsSaleOrder.setInsertTime(new Date());
         amsSaleOrder.setInsertUpdateRemark("新增欧冶转运计划");
-        amsSaleOrder.setInsertUsername("物流");
+        amsSaleOrder.setInsertUsername( mapValue.get("userName") + "");
         amsSaleOrder.setUpdateTime(new Date());
         amsSaleOrder.setDeleted(new BigDecimal(0));
         amsSaleOrder.setSaleOrderStatus(new BigDecimal(0));

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

@@ -1046,4 +1046,8 @@
         ASO.INSERT_UPDATE_REMARK = '超出实时库存数量,系统自动删除'
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </update>
+  <select id="getSaleAreaRemark" resultType="java.lang.String">
+    SELECT RSR.SALE_REMARK FROM RMS_SALER_REMAR RSR
+    WHERE RSR.SALER_NAME = #{saler}
+  </select>
 </mapper>

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

@@ -5098,6 +5098,8 @@
     ORI.THEORY_WEIGHT   "inventoryTheoryWeight",
     ORI.SINGLE_WEIGHT   "singleWeight",
     ORI.METER           "meter",
+    a_s_order.INSERT_USERNAME  "insertUserName",
+    R_SALER.SALER_NAME  "saler",
     NVL(TT."unloadMaterialNumber",0) "unloadMaterialNumber"
     FROM AMS_SALE_ORDER a_s_order
     LEFT JOIN RMS_SHIPPER r_shipper
@@ -5143,18 +5145,20 @@
     <if test="consigneeSsoId != null" >
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
-    <if test="saler != null " >
-      and  R_SALER.INSERT_UPDATE_REMARK like  #{saler}
-    </if>
     <if test="consigneeName != null">
       and r_consignee.CONSIGNEE_COMPANY_NAME = #{consigneeName}
     </if>
+    <if test="saleAreaRemark != null">
+      and <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
+      a_s_order.SALE_REMARK  like '%${item}%'
+    </foreach>
+    </if>
     <if test="oneDate != null">
-      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.insert_time
     </if>
     <if test="startDate != null">
-      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
-      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.insert_time
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.insert_time
     </if>
     ORDER BY a_s_order.SALE_ORDER_ID DESC ,ASOM.SALE_ORDER_MATERIAL_TRUCK_NO asc
     )