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-12-18 15:28:38 +08:00
parent 2eb1fff509
commit 90ce2d07c8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1299,10 +1299,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消"); throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消");
} }
if(!"2".equals(emisWaybillOld.getPickupMethod()) ){ if(!"2".equals(emisWaybillOld.getPickupMethod()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"非上门取件不需要指派取件员"); throw new EmisBizError(EmisBizErrorType.FAIL,"非上门取件不需要指派取件员");
} }
// 同时修改网点为取件员所在的网点
SysUser sysUser = getEmisStaffByCode(emisWaybillOld.getTakePieceEmployeeCode());
emisWaybill.setSendSiteCode(sysUser.getOwnerSiteCode());
emisWaybill.setBillCode(emisWaybillOld.getBillCode()); emisWaybill.setBillCode(emisWaybillOld.getBillCode());
return emisWaybillMapper.assignTakeMan(emisWaybill); return emisWaybillMapper.assignTakeMan(emisWaybill);

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

@ -2631,7 +2631,7 @@
<!-- 分配取件员 --> <!-- 分配取件员 -->
<update id="assignTakeMan" parameterType="EmisWaybill"> <update id="assignTakeMan" parameterType="EmisWaybill">
update emis_waybill set update emis_waybill set
take_piece_employee_code = #{takePieceEmployeeCode} take_piece_employee_code = #{takePieceEmployeeCode},send_site_code=#{sendSiteCode}
<if test="updateBy != null and updateBy != ''">,update_by = #{updateBy}</if> <if test="updateBy != null and updateBy != ''">,update_by = #{updateBy}</if>
<if test="updateSite != null and updateSite != ''">,update_site = #{updateSite}</if> <if test="updateSite != null and updateSite != ''">,update_site = #{updateSite}</if>
where order_sn=#{orderSn} where order_sn=#{orderSn}