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

demand: 解决非总部账号查询组批次完成的数据报错问题一 oms小程序、oms网页端订单录入/修改订单保存客户地址id

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-08-29 16:49:01 +08:00
parent 761eb86207
commit 23ea86ccb6
5 changed files with 13 additions and 3 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/EmisWaybill.java
View File

@ -160,6 +160,8 @@ public class EmisWaybill extends BaseEntity
private String enterpriseName;
/* 企业税号 */
private String enterpriseTaxId;
/* 寄件人客户地址ID */
private Integer sendCustomerAddressId;
/* 支付方式 : 现金或月结 */
@TableField
@DataAuditField(fieldComment = "支付方式",dictType="emis_payment_type")

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

@ -45,4 +45,6 @@ public class Sender implements Serializable {
private String enterpriseName;
/* 企业税号 */
private String enterpriseTaxId;
/* 寄件人客户地址ID */
private Integer id;
}

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

@ -504,6 +504,7 @@ public class WaybillOrder implements Serializable {
sender.setCompany(dbWaybill.getSendCompany());
sender.setEnterpriseName(dbWaybill.getEnterpriseName());
sender.setEnterpriseTaxId(dbWaybill.getEnterpriseTaxId());
sender.setId(dbWaybill.getSendCustomerAddressId());
voItem.setSender(sender);
// voItem.setId(dbWaybill.getId());
@ -789,6 +790,7 @@ public class WaybillOrder implements Serializable {
dbWaybill.setSendCompany(sender.getCompany());
dbWaybill.setEnterpriseName(sender.getEnterpriseName());
dbWaybill.setEnterpriseTaxId(sender.getEnterpriseTaxId());
dbWaybill.setSendCustomerAddressId(sender.getId());
}
dbWaybill.setPaymentType(this.getPaymentType());

2
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
View File

@ -211,7 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and w.send_date <![CDATA[ <= ]]> #{params.endSendDate}
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode} or m.start_site_code=#{params.privSiteCode} or m.next_site_code=#{params.privSiteCode})
and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode})
</if>
</where>
</when>

8
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -46,6 +46,7 @@
<result property="sendPcd" column="send_pcd" />
<result property="enterpriseName" column="enterprise_name" />
<result property="enterpriseTaxId" column="enterprise_tax_id" />
<result property="sendCustomerAddressId" column="send_customer_address_id" />
<result property="paymentType" column="payment_type" />
<result property="calcFeeType" column="calc_fee_type" />
<result property="custNo" column="cust_no" />
@ -301,7 +302,7 @@
a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city,
a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company,a.start_site_code,
a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address,
a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.send_customer_address_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method,
a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code,
a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone,
@ -402,7 +403,7 @@
a.receive_company, a.receive_mobile, a.receive_tel, a.receive_country, a.receive_province, a.receive_city,
a.receive_county, a.receive_town, a.receive_address, a.receive_postcode, a.receive_pcd, a.send_name, a.send_company,
a.send_mobile, a.send_tel, a.send_country, a.send_province, a.send_city, a.send_county, a.send_town, a.send_address,
a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
a.send_postcode, a.send_pcd, a.enterprise_name, a.enterprise_tax_id, a.send_customer_address_id, a.payment_type, a.calc_fee_type, a.cust_no, a.cust_name, a.trans_line_type, a.product_type,
a.time_type, a.meter_type, a.carry_type, a.customs_clear, a.customs_eclaration, a.estimate_date, a.pack_type, a.dispatch_method,
a.pickup_method, a.pick_start_date, a.pick_finish_date, a.pick_fail_reason, a.into_warehouse_code,
a.into_warehouse_name, a.into_warehouse_address, a.into_warehouse_contact, a.into_warehouse_phone,
@ -2825,6 +2826,7 @@
<if test="sendAddress != null and sendAddress != ''">send_address,</if>
<if test="sendPostcode != null and sendPostcode != ''">send_postcode,</if>
<if test="sendPcd != null and sendPcd != ''">send_pcd,</if>
<if test="sendCustomerAddressId != null and sendCustomerAddressId != ''">send_customer_address_id,</if>
<if test="enterpriseName != null and enterpriseName != ''">enterprise_name,</if>
<if test="enterpriseTaxId != null and enterpriseTaxId != ''">enterprise_tax_id,</if>
<if test="paymentType != null and paymentType != ''">payment_type,</if>
@ -3013,6 +3015,7 @@
<if test="sendAddress != null and sendAddress != ''">#{sendAddress},</if>
<if test="sendPostcode != null and sendPostcode != ''">#{sendPostcode},</if>
<if test="sendPcd != null and sendPcd != ''">#{sendPcd},</if>
<if test="sendCustomerAddressId != null and sendCustomerAddressId != ''">#{sendCustomerAddressId},</if>
<if test="enterpriseName != null and enterpriseName != ''">#{enterpriseName},</if>
<if test="enterpriseTaxId != null and enterpriseTaxId != ''">#{enterpriseTaxId},</if>
<if test="paymentType != null and paymentType != ''">#{paymentType},</if>
@ -3203,6 +3206,7 @@
<if test="sendAddress != null and sendAddress != ''">send_address = #{sendAddress},</if>
<if test="sendPostcode != null and sendPostcode != ''">send_postcode = #{sendPostcode},</if>
<if test="sendPcd != null and sendPcd != ''">send_pcd = #{sendPcd},</if>
<if test="sendCustomerAddressId != null and sendCustomerAddressId != ''">send_customer_address_id = #{sendCustomerAddressId},</if>
<if test="enterpriseName != null and enterpriseName != ''">enterprise_name = #{enterpriseName},</if>
<if test="enterpriseTaxId != null and enterpriseTaxId != ''">enterprise_tax_id = #{enterpriseTaxId},</if>
<if test="paymentType != null and paymentType != ''">payment_type = #{paymentType},</if>