zx 2 years ago
parent
commit
1bdfb78812

+ 1 - 0
src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -45,6 +45,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     //查找销售订单所有实绩id,没有下游单据的
     List<Map<String,Object>> selectAmssaleOrderId(String saleNumber);
 
+
     //判断数据是否于AMS_SALE_ORDER_MATERIAL
     BigDecimal selectAreadyUse(String saleNumber);
 

+ 5 - 7
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -676,18 +676,16 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             //此处判断订单状态为反审核
             if (closeStatus.equals("0")&&orderStatus.equals("5")) {
                 //删除销售订单以及销售订单分录(没有下游单据的)
+                int i=0;
                 List<Map<String, Object>> mapList = amsSaleOrderMapper.selectAmssaleOrderId(saleNumber);
                 BigDecimal selectAreadyUse = amsSaleOrderMapper.selectAreadyUse(saleNumber);
                 if (selectAreadyUse==null) {
                     for (Map<String, Object> IdMap : mapList) {
-                        BigDecimal saleOrderId = DataChange.dataToBigDecimal(IdMap.get("saleOrderId"));
-                        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(IdMap.get("saleOrderMaterialId"));
-                        //删除销售订单id
-                        int i = amsSaleOrderMapper.deleteByPrimaryKey(saleOrderId);
-                        //删除销售订单
-                        i += amsSaleMaterialMapper.deleteByPrimaryKey(saleOrderMaterialId);
-                        return i;
+                        BigDecimal saleMaterialId = DataChange.dataToBigDecimal(IdMap.get("saleMaterialId"));
+                        i+= amsSaleMaterialMapper.deleteByPrimaryKey(saleMaterialId);
                     }
+                   i+= amsSaleOrderMapper.deleteByPrimaryKey(saleOrderNumber);
+                   return i;
                 }else {
                     return -1;
                 }

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

@@ -1032,13 +1032,14 @@
 
 <!--查找销售订单没有销售订单下游单机-->
   <select id="selectAmssaleOrderId" resultType="java.util.Map" parameterType="java.lang.String">
-   select ASO.SALE_ORDER_ID "saleOrderId",
-          ASM.SALE_MATERIAL_ID "saleOrderMaterialId"
+   select ASM.SALE_MATERIAL_ID "saleMaterialId"
    from AMS_SALE_ORDER ASO
    LEFT JOIN AMS_SALE_MATERIAL ASM
    on ASM.SALE_ORDER_ID =ASO.SALE_ORDER_ID
    where ASO.SALE_NUMBER=#{saleNumber}
   </select>
+
+
   
   <select id="selectAreadyUse" parameterType="java.lang.String" resultType="java.math.BigDecimal">
     select distinct ASO.SALE_ORDER_ID