adasd

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Mapper
 public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigDecimal> {
@@ -24,4 +25,7 @@ public interface AmsSaleMaterialMapper extends IBaseMapper<AmsSaleMaterial, BigD
     int closeAllSaleMaterial(BigDecimal saleOrderId);
 
     int unCloseSaleMaterial(BigDecimal saleMaterialId);
+
+    List<String> getMaterialEasList(String saleNumber);
+
 }

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

@@ -371,6 +371,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     amsSaleOrder.setSaleHistoricalOrderAmount(new BigDecimal(saleHistoricalOrderAmount));
                 }
                 amsSaleOrder.setSaleOrderStatus(new BigDecimal(orderStatus));
+                //查询该销售订单下的所有物资分录
                 for (Map<String, Object> materialMap : mapList) {
                     // 得到中间表主键id
                     String saleMaterialId = (String) materialMap.get("saleMaterialId");

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

@@ -691,6 +691,12 @@
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_ID = #{materialId}
     </select>
+    <select id="getMaterialEasList" resultType="java.lang.String" parameterType="string">
+        SELECT ASM.EAS_PRIMARY_ID FROM AMS_SALE_MATERIAL ASM
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        WHERE ASO.SALE_NUMBER = #{saleNumber}
+    </select>
 
 
     <update id="openAllSaleMaterial" parameterType="DECIMAL" >

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

@@ -896,7 +896,8 @@
            ASM.SALE_MATERIAL_ID AS "stEntryId",
            ASM.IS_POUND_SALE    AS "isPoundSale",
            ASM.STEEL_METER      AS "forChangdu",
-           ASM.EAS_PRIMARY_ID   AS "easPrimatyId"
+           ASM.EAS_PRIMARY_ID   AS "easPrimatyId",
+           ASM.EAS_PRIMARY_ID   AS "easPrimaryId"
     FROM AMS_SALE_MATERIAL ASM
            LEFT JOIN RMS_MATERIAL RM
                      ON RM.MATERIAL_ID = ASM.MATERIAL_ID