luobang před 2 roky
rodič
revize
6c2edc1747

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

@@ -69,4 +69,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
 
     void insertIntoNoticeUser(BigDecimal noticeId,String capacityNo);
     void insertIntoNoticeUser(BigDecimal noticeId,String capacityNo);
     int reverseApprovalOrder(BigDecimal saleOrderId);
     int reverseApprovalOrder(BigDecimal saleOrderId);
+
+    String selectSaleGroupCode(String saleGroup);
+
 }
 }

+ 13 - 1
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -11,6 +11,7 @@ import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.MyException;
 import com.steerinfo.dil.util.MyException;
+import com.steerinfo.framework.utils.base.StringUtils;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import io.swagger.models.auth.In;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.executor.loader.ResultLoader;
 import org.apache.ibatis.executor.loader.ResultLoader;
@@ -84,7 +85,18 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public Map<String, Object> getSaleOrder(BigDecimal saleOrderId) {
     public Map<String, Object> getSaleOrder(BigDecimal saleOrderId) {
         List<Map<String,Object>> entries = amsSaleOrderMapper.getMaterialMessages(saleOrderId);
         List<Map<String,Object>> entries = amsSaleOrderMapper.getMaterialMessages(saleOrderId);
         Map<String,Object> head = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
         Map<String,Object> head = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
-        // 单价
+        String saleRemark = head.get("remark").toString();
+        String saleGroupCode = null;
+        try {
+            String saleGroup = "钢" + StringUtils.substringBetween(saleRemark,"钢","组") + "组";
+            saleGroupCode = amsSaleOrderMapper.selectSaleGroupCode(saleGroup);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if(saleGroupCode != null) {
+            head.put("saleGroup",saleGroupCode);
+        }
+        // 单价 
         BigDecimal taxPrice = (BigDecimal) head.get("unitPrice");
         BigDecimal taxPrice = (BigDecimal) head.get("unitPrice");
         // 税率
         // 税率
         String taxRate = (String) head.get("tax");
         String taxRate = (String) head.get("tax");

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

@@ -1147,6 +1147,10 @@
                       and ASO.SALE_ORDER_ID=#{saleOrderId}
                       and ASO.SALE_ORDER_ID=#{saleOrderId}
                       and rownum =1)
                       and rownum =1)
   </select>
   </select>
+  <select id="selectSaleGroupCode" resultType="java.lang.String">
+    SELECT rsa.AREA_CODE from RMS_SALE_AREA RSA
+    where rsa.AREA_NAME = #{saleGroup}
+  </select>
 
 
   <insert id="insertDilNotice">
   <insert id="insertDilNotice">
     insert into DIL_NOTICE(NOTICE_ID,NOTICE_TITLE,NOTICE_CONTENT,INSERT_USERNAME,INSERT_TIME,DELETED,PERMISSION)
     insert into DIL_NOTICE(NOTICE_ID,NOTICE_TITLE,NOTICE_CONTENT,INSERT_USERNAME,INSERT_TIME,DELETED,PERMISSION)