修改

pom.xml

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

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

@@ -242,4 +242,8 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     int updateFluStatus(Map<String, Object> approveMap);
 
+    List<Map<String, Object>> getDirectlyList(Map<String, Object> addressMap);
+
+    List<Map<String, Object>> getDirectlyTownList(Map<String, Object> addressMap);
+
 }

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

@@ -219,6 +219,19 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
                     if (shippingAddressId == null) {
                         throw new Exception("您输入的：" + province + district + town + "地址不存在！！");
                     }
+                    addressMap.put("saleRemark",saleRemark);
+                    //根据摘要和地址去匹配
+                    List<Map<String,Object>> directlyList = amsSaleOrderMapper.getDirectlyList(addressMap);
+                    if (directlyList.size() == 0 || directlyList.get(0) == null) {
+                        throw new Exception("您输入的摘要与直发城市不匹配");
+                    }
+                    if (directlyList.size() > 1) {
+                        //大于1说明存在镇,那么带镇进去查询
+                        List<Map<String,Object>> directlyTownList = amsSaleOrderMapper.getDirectlyTownList(addressMap);
+                        if (directlyTownList.size() == 0 || directlyTownList.get(0) == null) {
+                            throw new Exception("您输入的摘要与直发城市不匹配");
+                        }
+                    }
                 }
                 // 车号备注
                 String truckRemark = (String) (map.get("truckRemark"));
@@ -367,11 +380,14 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
 
     public String approveTransPlan(Map<String, Object> map) throws Exception {
         List<Map<String,Object>> mapList = (List<Map<String,Object>>) map.get("mapList");
+        String userName = map.get("userName") + "";
         int j = mapList.size();
         int i = 0 ;
         for (Map<String,Object> approveMap : mapList) {
+            approveMap.put("userName",userName);
             if (DataChange.dataToBigDecimal(approveMap.get("orderStatus")).intValue() == 4) {
                 try {
+
                     i += amsSaleOrderMapper.approveTransPlan(approveMap);
                 } catch (Exception e) {
                     e.printStackTrace();

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

@@ -5100,6 +5100,10 @@
     ORI.METER           "meter",
     a_s_order.INSERT_USERNAME  "insertUserName",
     R_SALER.SALER_NAME  "saler",
+    ASM.UPDATE_USERNAME "deleteUpdateUserName",
+    asm.UPDATE_TIME "deleteUpdateTime",
+    a_s_order.UPDATE_USERNAME "approveUserName",
+    a_s_order.UPDATE_TIME   "approveTime",
     NVL(TT."unloadMaterialNumber",0) "unloadMaterialNumber"
     FROM AMS_SALE_ORDER a_s_order
     LEFT JOIN RMS_SHIPPER r_shipper
@@ -5217,7 +5221,9 @@
   <update id="approveTransPlan" parameterType="java.util.Map">
     UPDATE AMS_SALE_ORDER ASO
     SET ASO.SALE_ORDER_STATUS = #{orderStatus},
-        ASO.DELETED = #{deleted}
+        ASO.DELETED = #{deleted},
+        ASO.UPDATE_TIME = SYSDATE,
+        ASO.UPDATE_USERNAME = #{userName}
     <if test="remark != null">
       ,ASO.INSERT_UPDATE_REMARK = #{remark}
     </if>
@@ -5236,9 +5242,30 @@
   </select>
   <update id="updateFluStatus">
     UPDATE AMS_SALE_MATERIAL ASM
-    SET ASM.DELETED = 1
+    SET ASM.DELETED = 1,
+        ASM.UPDATE_TIME = SYSDATE,
+        ASM.UPDATE_USERNAME = #{userName}
     WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
   </update>
+  <select id="getDirectlyList" resultType="java.util.Map">
+    SELECT DISTINCT RDSC.PROVINCE_CITY,
+           RDSC.DISTRICT_CITY,
+           RDSC.TOWN_CITY
+           FROM RMS_DIRECTLY_SENT_CITY RDSC
+    WHERE RDSC.DIRECTLY_SENT_NAME = #{saleRemark}
+    AND RDSC.PROVINCE_CITY = #{province}
+    AND DISTRICT_CITY = #{district}
+  </select>
+  <select id="getDirectlyTownList" resultType="java.util.Map">
+    SELECT DISTINCT RDSC.PROVINCE_CITY,
+                    RDSC.DISTRICT_CITY,
+                    RDSC.TOWN_CITY
+    FROM RMS_DIRECTLY_SENT_CITY RDSC
+    WHERE RDSC.DIRECTLY_SENT_NAME = #{saleRemark}
+      AND RDSC.PROVINCE_CITY = #{province}
+      AND DISTRICT_CITY = #{district}
+      AND RDSC.TOWN_CITY = #{town}
+  </select>
 
 
 </mapper>