aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-04-29 11:44:42 +08:00
parent a252c469bd
commit db7d883c1a
4 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
View File

@ -114,6 +114,6 @@ public class EmisQuotePrice extends BaseEntity
/* 产品类型名称 */
private String prodName;
private List<EmisQuoteExpression> quoteExpressions;
private List<EmisQuoteExpression> exprList;
}

18
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -32,10 +32,7 @@ package com.xdadan.erp.emis.service;
import org.springframework.util.CollectionUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* 运单列表Service业务层处理
@ -102,11 +99,16 @@ public class EmisBaseService {
* @param code
* @return
*/
public List<EmisQuotePrice> getQuotePriceList(String code) {
public List<EmisQuotePrice> getQuotePriceList(String prodCode) {
EmisQuotePrice queryEmisQuotePrice = new EmisQuotePrice();
queryEmisQuotePrice.setProdCode(prodCode);
queryEmisQuotePrice.setStatus(1);
queryEmisQuotePrice.setStartDate(new Date());
// 有效报价
queryEmisQuotePrice.getParams().put("quoteStatus",4);
emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
QueryWrapper<EmisTransProduct> queryWrapper = new QueryWrapper();
queryWrapper.eq("prod_code", code);
// return emisTransProductMapper.selectOne(queryWrapper);
return null;
}

37
emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
View File

@ -52,6 +52,26 @@
<association property="transLine" column="trans_line_code" select="selectLineNameByCode"/>
<association property="useSiteName" column="use_site_code" select="selectSiteNameByCode"/>
<association property="exprList" column="quote_id" select="selectExprListByQuoteId"/>
</resultMap>
<resultMap type="EmisQuoteExpression" id="EmisQuoteExpressionResult">
<result property="id" column="id" />
<result property="quoteId" column="quote_id" />
<result property="quoteSequence" column="quote_sequence" />
<result property="useSiteCode" column="use_site_code" />
<result property="useSite" column="use_site" />
<result property="startWeight" column="start_weight" />
<result property="endWeight" column="end_weight" />
<result property="initialWeight" column="initial_weight" />
<result property="additionalWeight" column="additional_weight" />
<result property="conditionExpression" column="condition_expression" />
<result property="calculateExpression" column="calculate_expression" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="tenantId" column="tenant_id" />
</resultMap>
@ -71,6 +91,13 @@
select a.site_name from emis_site a where a.site_code = #{code} limit 1
</select>
<select id="selectExprListByQuoteId" parameterType="integer" resultMap="EmisQuoteExpressionResult">
select id, quote_id, quote_sequence, start_weight, end_weight, initial_weight, additional_weight, condition_expression, calculate_expression, status, remark
from emis_quote_expression a
where a.quote_id = #{quoteId} and a.del_flag!='1'
</select>
<select id="selectEmisQuotePriceList" parameterType="EmisQuotePrice" resultMap="EmisQuotePriceResult">
<include refid="selectEmisQuotePriceVo"/>
<where>
@ -93,12 +120,16 @@
<if test="dispAreaId != null "> and disp_area_id like concat('%', #{dispAreaId}, '%')</if>
<if test="dispAreaName != null and dispAreaName != ''"> and disp_area_name like concat('%', #{dispAreaName}, '%')</if>
<if test="dispAreaSite != null and dispAreaSite != ''"> and disp_area_site like concat('%', #{dispAreaSite}, '%')</if>
<if test="dispAreaSiteCode != null and dispAreaSiteCode != ''"> and disp_area_site_code like concat('%', #{dispAreaSiteCode}, '%')</if>
<if test="dispAreaSiteCode != null and dispAreaSiteCode != ''">and ( find_in_set(#{dispAreaSiteCode},disp_area_site_code) or disp_area_site_code='-1' ) </if>
<if test="dispAreaSiteId != null and dispAreaSiteId != ''"> and disp_area_site_id like concat('%', #{dispAreaSiteId}, '%')</if>
<if test="sendAreaId != null "> and send_area_id like concat('%', #{sendAreaId}, '%')</if>
<if test="sendAreaId != null "> and send_area_id = #{sendAreaId} </if>
<if test="sendAreaName != null and sendAreaName != ''"> and send_area_name like concat('%', #{sendAreaName}, '%')</if>
<if test="sendAreaSite != null and sendAreaSite != ''"> and send_area_site like concat('%', #{sendAreaSite}, '%')</if>
<if test="sendAreaSiteCode != null and sendAreaSiteCode != ''"> and find_in_set(#{sendAreaSiteCode},send_area_site_code)</if>
<if test="sendAreaSiteCode != null and sendAreaSiteCode != ''"> and ( find_in_set(#{sendAreaSiteCode},send_area_site_code) or send_area_site_code='-1')</if>
<if test="sendAreaSiteId != null and sendAreaSiteId != ''"> and send_area_site_id like concat('%', #{sendAreaSiteId}, '%')</if>
<if test="carriesNumber != null and carriesNumber != ''"> and carries_number like concat('%', #{carriesNumber}, '%')</if>
<if test="discardsNumber != null and discardsNumber != ''"> and discards_number like concat('%', #{discardsNumber}, '%')</if>

1
emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
View File

@ -42,6 +42,7 @@
select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
</select>
<select id="selectEmisTransProductList" parameterType="EmisTransProduct" resultMap="EmisTransProductResult">
<include refid="selectEmisTransProductVo"/>
<where>