zengyf il y a 2 ans
Parent
commit
9db9f323bc

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java

@@ -188,6 +188,8 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
 
     int updatePlace(Map<String, Object> mapValue);
 
+    BigDecimal getsaleShippingAddressId(Map<String, Object> mapValue);
+
     int updateDetailsStatus(Integer orderId);
 
     int getSaleOrderStatus(BigDecimal orderId);

+ 6 - 1
src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -570,10 +570,15 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             e.printStackTrace();
         }
         if(DataChange.dataToBigDecimal(mapValue.get("updatePlace")).intValue() == 1) {
+            BigDecimal bigDecimal = bmstruckDetailsOrderMapper.getsaleShippingAddressId(mapValue);
+            if (bigDecimal!=null){
+                mapValue.put("historyPlaceId",bigDecimal);
+            }else {
+                mapValue.put("historyPlaceId",0);
+            }
             //修改地址
             bmstruckDetailsOrderMapper.updatePlace(mapValue);
         }
-
         return result;
     }
 

+ 10 - 1
src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml

@@ -2324,12 +2324,21 @@
     </select>
     <update id="updatePlace" parameterType="map">
         update AMS_SALE_ORDER_MATERIAL ASOM
-        set asom.SALE_SHIPPING_ADDRESS_ID = #{placeId}
+        set asom.SALE_SHIPPING_ADDRESS_ID = #{placeId},
+            asom.HISTORY_SHIPPING_ADDRESS_ID=#{historyPlaceId}
         where ASOM.SALE_ORDER_MATERIAL_ID = (SELECT oo.order_plan_id FROM
         OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID = #{orderId}
         )
     </update>
+    <select id="getsaleShippingAddressId" resultType="java.math.BigDecimal">
+        select asom.SALE_SHIPPING_ADDRESS_ID from AMS_SALE_ORDER_MATERIAL ASOM
+        where ASOM.SALE_ORDER_MATERIAL_ID = (SELECT oo.order_plan_id FROM
+            OMSTRUCK_ORDER OO
+                                             WHERE OO.ORDER_ID = #{orderId}
+        )
+    </select>
+
     <update id="updateDetailsStatus" parameterType="java.lang.Integer">
         UPDATE BMSTRUCK_DETAILS_ORDER BDO
         SET BDO.WETHER_TO_STATEMENT = 1