修改

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

@@ -213,4 +213,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     String selectSaleGroupCode(String saleGroup);
 
     int selectOutFactoryResult(String orderNo);
+
+    int updateOldSaleOrderUploadByNo(String saleOrderNo);
+
 }

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

@@ -94,4 +94,6 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
 
     BigDecimal getDispatchedOrderWeight(BigDecimal saleOrderId);
 
+    int selectSaleOrdeNoIsUpload(String saleOrderNo);
+
 }

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

@@ -2787,11 +2787,19 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         //如果前端传输过来的销售订单id不是空,则改变为已上传
         if (mapValue.get("saleOrderId") != null) {
             //先判断该销售订单有没有被上传,如果传了则不允许重复上传
-            int count = amsSaleOrderMaterialMapper.selectSaleOrderIdIsUpload(DataChange.dataToBigDecimal(mapValue.get("saleOrderId")));
-            if(count != 0) {
-                return 0;
+            if (mapValue.get("saleOrderNo") != null) {
+                int count1 = amsSaleOrderMaterialMapper.selectSaleOrdeNoIsUpload(mapValue.get("saleOrderNo").toString());
+                if(count1 != 0) {
+                    return 0;
+                }
+                amsSaleOrderMapper.updateOldSaleOrderUploadByNo(mapValue.get("saleOrderNo").toString());
+            }else{
+                int count = amsSaleOrderMaterialMapper.selectSaleOrderIdIsUpload(DataChange.dataToBigDecimal(mapValue.get("saleOrderId")));
+                if(count != 0) {
+                    return 0;
+                }
+                amsSaleOrderMapper.updateOldSaleOrderUpload(DataChange.dataToBigDecimal(mapValue.get("saleOrderId")));
             }
-            amsSaleOrderMapper.updateOldSaleOrderUpload(DataChange.dataToBigDecimal(mapValue.get("saleOrderId")));
         }
         // 得到发货单位
         BigDecimal shipperId = DataChange.dataToBigDecimal(mapValue.get("shipperId"));

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

@@ -4659,8 +4659,12 @@
     SET ASO.INSERT_UPDATE_REMARK = '物流上传金蝶成功'
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </update>
-
-  <delete id="delectQueueS">
+  <update id="updateOldSaleOrderUploadByNo">
+    update AMS_SALE_ORDER ASO
+    SET ASO.INSERT_UPDATE_REMARK = '物流上传金蝶成功'
+    WHERE ASO.SALE_NUMBER = #{saleOrderNo}
+  </update>
+    <delete id="delectQueueS">
         delete from QMS_QUEUE_LIST qql
         where qql.LIST_ID=#{capacityIdM}
     </delete>

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

@@ -1020,4 +1020,11 @@
     AND TWR.RESULT_NET_WEIGHT IS NULL
     and OO.ORDER_STATUS IN (4,5)
   </select>
+  <select id="selectSaleOrdeNoIsUpload" resultType="java.lang.Integer" parameterType="string">
+    SELECT COUNT(aso.SALE_ORDER_ID) FROM AMS_SALE_ORDER ASO
+    WHERE
+      ASO.INSERT_UPDATE_REMARK = '物流上传金蝶成功'
+      AND
+      ASO.SALE_NUMBER = #{saleOrderNo}
+  </select>
 </mapper>