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

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service

Browse Source
This commit is contained in:
linfso 2025-07-12 15:42:16 +08:00
commit 3f0d6cde0b
4 changed files with 15 additions and 10 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

@ -208,7 +208,7 @@ public class EmisWaybill extends BaseEntity
@TableField @TableField
@DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method") @DataAuditField(fieldComment = "派件方式",dictType="emis_dispatch_method")
private String dispatchMethod; private String dispatchMethod;
/* 取件方式:1-上门取件 2-仓库收货 3-整柜提货 */ /* 取件方式:1-仓库收货 2-上门取件 3-整柜提货 */
@TableField @TableField
@DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi") @DataAuditField(fieldComment = "取件方式",dictType="emis_qujian_fangshi")
private String pickupMethod; private String pickupMethod;

14
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -474,7 +474,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode()); emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode());
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
@ -607,7 +607,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode()); emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode());
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
@ -747,7 +747,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName()); emisCommissionQuote.setEmpName(empUser.getEmpName());
@ -895,7 +895,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName()); emisCommissionQuote.setEmpName(empUser.getEmpName());
@ -1041,7 +1041,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(empUser.getEmpName()); emisCommissionQuote.setEmpName(empUser.getEmpName());
@ -1157,7 +1157,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());
emisCommissionQuote.setEmpName(salesmen); emisCommissionQuote.setEmpName(salesmen);
@ -1293,7 +1293,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote(); EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setCountry(waybill.getReceiveCountry()); emisCommissionQuote.setCountry(waybill.getReceiveCountry());
emisCommissionQuote.setFromCountry(waybill.getSendCountry()); emisCommissionQuote.setFromCountry(waybill.getSendCountry());
emisCommissionQuote.setTransLine(waybill.getTransLineType()); emisCommissionQuote.setTransLineCode(waybill.getTransLineType());
emisCommissionQuote.setProdCode(waybill.getProductType()); emisCommissionQuote.setProdCode(waybill.getProductType());
emisCommissionQuote.setTransType(transLine.getTransType()); emisCommissionQuote.setTransType(transLine.getTransType());

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -2071,6 +2071,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setPackType("2"); emisWaybillSave.setPackType("2");
} }
if ("1".equals(emisWaybillSave.getPickupMethod()) || "3".equals(emisWaybillSave.getPickupMethod())) {
emisWaybillSave.setTakePieceEmployeeCode(null);
}
// 如果专属业务员不为空，则寄件网点使用业务员的网点 // 如果专属业务员不为空，则寄件网点使用业务员的网点
if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){ if(!StringUtils.isEmpty(emisWaybillSave.getTakePieceEmployeeCode()) && "2".equals(emisWaybillSave.getPickupMethod()) ){
SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode()); SysUser empUser = getEmisStaffByCode(emisWaybillSave.getTakePieceEmployeeCode());

6
emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
View File

@ -92,8 +92,10 @@
<if test="blOpen != null and blOpen != ''"> and bl_open=#{blOpen}</if> <if test="blOpen != null and blOpen != ''"> and bl_open=#{blOpen}</if>
<if test="empCode != null and empCode != ''"> and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1')</if> <if test="empCode != null and empCode != ''"> and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1')</if>
<if test="empName != null and empName != ''"> and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') </if> <if test="empName != null and empName != ''"> and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') </if>
<if test="transLineCode != null and transLineCode != ''">and (
<if test="transLineCode != null and transLineCode != ''"> and ( trans_line_code=#{transLineCode} or trans_line_code is null or trans_line_code='') </if> FIND_IN_SET(#{transLineCode},trans_line_code)
or trans_line_code is null or trans_line_code='')
</if>
<if test="prodCode != null and prodCode != ''"> and ( FIND_IN_SET(#{prodCode},prod_code) or prod_code is null or prod_code='') </if> <if test="prodCode != null and prodCode != ''"> and ( FIND_IN_SET(#{prodCode},prod_code) or prod_code is null or prod_code='') </if>
</where> </where>