修改

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/service/impl/OyeWarehouseServiceImpl.java

@@ -401,6 +401,7 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
             }
             if(DataChange.dataToBigDecimal(approveMap.get("deleted")).intValue() == 1) {
                 //删除
+                //
                 i += amsSaleOrderMapper.updateFluStatus(approveMap);
                 //i += amsSaleOrderMapper.approveTransPlan(approveMap);
             }

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

@@ -1005,15 +1005,13 @@
       AND ORI.material_Id = #{materialId}
       AND ORI.sale_area = #{saleArea}
       AND ORI.CONSIGNEE_ID = #{receiveId}
+      AND ORI.inbound_Warehouse = #{inboundWarehouse}
       <if test="meter != null">
         AND NVL(ORI.METER,0) = NVL(#{meter},0)
       </if>
       <if test="singleWeight != null">
         AND ORI.single_Weight = #{singleWeight}
       </if>
-      <if test="inboundWarehouse != null">
-        AND ORI.inbound_Warehouse = #{inboundWarehouse}
-      </if>
     </where>
     ORDER BY ORI.MATERIAL_NUMBER desc
     FETCH NEXT 1 ROW ONLY

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

@@ -5246,6 +5246,7 @@
         ASM.UPDATE_TIME = SYSDATE,
         ASM.UPDATE_USERNAME = #{userName}
     WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialId}
+    AND ASM.SALE_MAKE_DATE IS NULL
   </update>
   <select id="getDirectlyList" resultType="java.util.Map">
     SELECT DISTINCT RDSC.PROVINCE_CITY,