luobang 2 years ago
parent
commit
b3cad05606

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/AmsDispatchSaleOrderMapper.java

@@ -52,4 +52,7 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
 
 
     //查询出相应的ID
     //查询出相应的ID
     BigDecimal queryMaterial(String Specification,String materialName);
     BigDecimal queryMaterial(String Specification,String materialName);
+
+    List<BigDecimal> getDispatchCarriers(BigDecimal saleOrderMaterialId);
+
 }
 }

+ 6 - 0
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1232,6 +1232,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             // 得到车序号表主键
             // 得到车序号表主键
             BigDecimal saleOrderMaterialId =DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
             BigDecimal saleOrderMaterialId =DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
             //判断该车序号有没有被授权
             //判断该车序号有没有被授权
+            List<BigDecimal> dispatchCarriers = amsDispatchSaleOrderMapper.getDispatchCarriers(saleOrderMaterialId);
+            //如果有的话删除授权,重新新增
+            for(BigDecimal dispatchId : dispatchCarriers) {
+                amsDispatchSaleOrderMapper.deleteByPrimaryKey(dispatchId);
+            }
+            //判断该车序号有没有被授权
             AmsDispatchSaleOrder amsDispatchSaleOrder = new AmsDispatchSaleOrder();
             AmsDispatchSaleOrder amsDispatchSaleOrder = new AmsDispatchSaleOrder();
             BigDecimal dispatchId = amsDispatchSaleOrderMapper.selectOtherId();
             BigDecimal dispatchId = amsDispatchSaleOrderMapper.selectOtherId();
             amsDispatchSaleOrder.setDispatchId(dispatchId);
             amsDispatchSaleOrder.setDispatchId(dispatchId);

+ 4 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsDispatchSaleOrderMapper.xml

@@ -699,4 +699,8 @@
         and RM.Material_Name=#{materialName}
         and RM.Material_Name=#{materialName}
         fetch next 1 row only
         fetch next 1 row only
     </select>
     </select>
+    <select id="getDispatchCarriers" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+        SELECT ADSO.DISPATCH_ID "dispatchId" FROM AMS_DISPATCH_SALE_ORDER ADSO
+        WHERE ADSO.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
 </mapper>
 </mapper>

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

@@ -4674,7 +4674,7 @@
       </if>
       </if>
     </select>
     </select>
   <select id="getNextCarrier" resultType="java.util.Map" parameterType="java.math.BigDecimal">
   <select id="getNextCarrier" resultType="java.util.Map" parameterType="java.math.BigDecimal">
-    select adso.CARRIER_ID from AMS_SALE_ORDER_MATERIAL asom
+    select adso.CARRIER_ID "carrierId" from AMS_SALE_ORDER_MATERIAL asom
     left join RMS_RECEIVE_PLACE rrp
     left join RMS_RECEIVE_PLACE rrp
     on rrp.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
     on rrp.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
     left join AMS_DISPATCH_SALE_ORDER adso
     left join AMS_DISPATCH_SALE_ORDER adso