diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 6f27eec5e..cf044a520 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -89,6 +89,9 @@ public class EmisWaybillController extends EmisBaseController @Autowired private IEmisTmsScanRecordService emisTmsScanRecordService; + @Autowired + private IEmisWaybillChangeToService emisWaybillChangeToService; + @Autowired RedissonService redissonService; @@ -315,11 +318,22 @@ public class EmisWaybillController extends EmisBaseController return AjaxResult.error("取件员不能为空"); } + EmisWaybill oldWayBill=emisWaybillService.selectEmisWaybillByOrderSn(waybillOrder.getOrderSn()); + if(oldWayBill==null){ + return AjaxResult.error("订单不存在"); + } + EmisWaybill emisWaybill = new EmisWaybill(); emisWaybill.setOrderSn(waybillOrder.getOrderSn()); emisWaybill.setTakePieceEmployeeCode(waybillOrder.getTakePieceEmployeeCode()); emisWaybillService.assignTakeMan(emisWaybill); + // 记录转单信息 + EmisWaybillChangeTo emisWaybillChangeTo=new EmisWaybillChangeTo(); + emisWaybillChangeTo.setChangeFrom(oldWayBill.getTakePieceEmployeeCode()); + emisWaybillChangeTo.setChangeTo(waybillOrder.getTakePieceEmployeeCode()); + emisWaybillChangeToService.insertEmisWaybillChangeTo(emisWaybillChangeTo); + return AjaxResult.success("指派成功"); }catch(EmisBizError ex){ ex.printStackTrace(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillChangeTo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillChangeTo.java new file mode 100644 index 000000000..8be26b2a6 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillChangeTo.java @@ -0,0 +1,47 @@ +/** + * @Project: emis + * @Title: EmisWaybillChangeTo.java + * @author linfso + * @date 2025-01-05 10:15:43 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

转单记录表 实体类

+ */ + +package com.xdadan.erp.emis.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.xdadan.erp.common.annotation.Excel; +import com.xdadan.erp.common.core.domain.BaseEntity; +import com.xdadan.erp.common.core.domain.TreeEntity; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + + +/** + * @ClassName EmisWaybillChangeTo + * @Description 转单记录表 + * @author linfso + * @date 2025-01-05 10:15:43 + */ + @Data +public class EmisWaybillChangeTo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + /* 运单号 */ + private String billCode; + /* 改变来源 */ + private String changeFrom; + /* 改到目标 */ + private String changeTo; + /* 数据来源 */ + private String dataFrom; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillChangeToMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillChangeToMapper.java new file mode 100644 index 000000000..5fa801ba2 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillChangeToMapper.java @@ -0,0 +1,80 @@ +/** + * @Project: emis + * @Title: EmisWaybillChangeToMapper.java + * @author linfso + * @date 2025-01-05 10:15:43 + * @Copyright: ShangHai Doitinfo 2022 All rights reserved. + * @version v1.0 + * @Description:

转单记录表 Mapper 接口

+ * Warning : This file is generate by ai tools,don't edit!!! + */ +package com.xdadan.erp.emis.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xdadan.erp.emis.domain.EmisWaybillChangeTo; +/** + * @ClassName EmisWaybillChangeToMapper + * @Description

转单记录表 Mapper 接口

+ * @author linfso + * @date 2025-01-05 10:15:43 + */ +public interface EmisWaybillChangeToMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisWaybillChangeTo selectEmisWaybillChangeToById(Long id); + + /** + * 查询列表 + * + * @param emisWaybillChangeTo + * @return 集合 + */ + public List selectEmisWaybillChangeToList(EmisWaybillChangeTo emisWaybillChangeTo); + + + /** + * 检查是否重复 + * + * @param emisWaybillChangeTo + * @return 数量 + */ + public int checkUnique(EmisWaybillChangeTo emisWaybillChangeTo); + + + /** + * 新增 + * + * @param emisWaybillChangeTo + * @return + */ + public int insertEmisWaybillChangeTo(EmisWaybillChangeTo emisWaybillChangeTo); + + /** + * 修改 + * + * @param emisWaybillChangeTo + * @return + */ + public int updateEmisWaybillChangeTo(EmisWaybillChangeTo emisWaybillChangeTo); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + public int deleteEmisWaybillChangeToById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmisWaybillChangeToByIds(Long[] ids); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 4a9c7107f..1d1935db9 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -362,6 +362,7 @@ public class EmisBaseService { int waitDoNum=0; int hasDoNum=0; int hasCancelNum=0; + int hasChangeToCount=0; int statType_1_num=0; int statType_2_num=0; @@ -374,10 +375,12 @@ public class EmisBaseService { waitDoNum=MapUtils.getIntValue(item0,"waitGotCount",0); hasDoNum=MapUtils.getIntValue(item0,"hasDoCount",0); hasCancelNum=MapUtils.getIntValue(item0,"hasCancelCount",0); + hasChangeToCount=MapUtils.getIntValue(item0,"hasChangeToCount",0); statType_1_num=waitDoNum; statType_2_num=hasDoNum; statType_3_num=hasCancelNum; + statType_4_num=hasChangeToCount; } List statNumList = new ArrayList<>(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillChangeToService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillChangeToService.java new file mode 100644 index 000000000..63e291625 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillChangeToService.java @@ -0,0 +1,78 @@ + /** + * @Project: emis + * @Title: EmisWaybillChangeToService.java + * @author linfso + * @date 2025-01-05 10:15:43 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

转单记录表 服务类接口

+ */ +package com.xdadan.erp.emis.service; + +import java.util.List; +import com.xdadan.erp.emis.domain.EmisWaybillChangeTo; + +/** + * @ClassName EmisWaybillChangeToService + * @Description 转单记录表 + * @author linfso + * @date 2025-01-05 10:15:43 + */ +public interface IEmisWaybillChangeToService +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisWaybillChangeTo selectEmisWaybillChangeToById(Long id); + + /** + * 查询转单记录表列表 + * + * @param emisWaybillChangeTo 转单记录表 + * @return 转单记录表集合 + */ + public List selectEmisWaybillChangeToList(EmisWaybillChangeTo emisWaybillChangeTo); + + + /** + * 检查是否重复 + * + * @param emisWaybillChangeTo + * @return 数量 + */ + public int checkUnique(EmisWaybillChangeTo emisWaybillChangeTo); + + /** + * 新增转单记录表 + * + * @param emisWaybillChangeTo 转单记录表 + * @return 结果 + */ + public int insertEmisWaybillChangeTo(EmisWaybillChangeTo emisWaybillChangeTo); + + /** + * 修改转单记录表 + * + * @param emisWaybillChangeTo 转单记录表 + * @return 结果 + */ + public int updateEmisWaybillChangeTo(EmisWaybillChangeTo emisWaybillChangeTo); + + /** + * 批量删除转单记录表 + * + * @param ids 需要删除的转单记录表主键集合 + * @return 结果 + */ + public int deleteEmisWaybillChangeToByIds(Long[] ids); + + /** + * 删除转单记录表信息 + * + * @param id 转单记录表主键 + * @return 结果 + */ + public int deleteEmisWaybillChangeToById(Long id); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillChangeToServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillChangeToServiceImpl.java new file mode 100644 index 000000000..2a3639882 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillChangeToServiceImpl.java @@ -0,0 +1,117 @@ + /** + * @Project: emis + * @Title: EmisWaybillChangeToServiceImpl.java + * @author linfso + * @date 2025-01-05 10:15:43 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

转单记录表 实体类

+ */ + +package com.xdadan.erp.emis.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.xdadan.erp.emis.domain.EmisWaybillChangeTo; +import com.xdadan.erp.emis.mapper.EmisWaybillChangeToMapper; +import com.xdadan.erp.emis.service.IEmisWaybillChangeToService; + +/** + * 转单记录表Service业务层处理 + * + * @author linfso + * @date 2025-01-05 10:15:43 + */ +@Service +public class EmisWaybillChangeToServiceImpl implements IEmisWaybillChangeToService +{ + @Autowired + private EmisWaybillChangeToMapper emisWaybillChangeToMapper; + + /** + * 查询转单记录表 + * + * @param id 转单记录表主键 + * @return 转单记录表 + */ + @Override + public EmisWaybillChangeTo selectEmisWaybillChangeToById(Long id) + { + return emisWaybillChangeToMapper.selectEmisWaybillChangeToById(id); + } + + + /** + * 查询转单记录表列表 + * + * @param emisWaybillChangeTo 转单记录表 + * @return 转单记录表 + */ + @Override + public List selectEmisWaybillChangeToList(EmisWaybillChangeTo emisWaybillChangeTo) + { + return emisWaybillChangeToMapper.selectEmisWaybillChangeToList(emisWaybillChangeTo); + } + + /** + * 检查是否重复 + * + * @param emisWaybillChangeTo + * @return 数量 + */ + @Override + public int checkUnique(EmisWaybillChangeTo emisWaybillChangeTo) + { + return emisWaybillChangeToMapper.checkUnique(emisWaybillChangeTo); + } + + /** + * 新增转单记录表 + * + * @param emisWaybillChangeTo 转单记录表 + * @return 结果 + */ + @Override + public int insertEmisWaybillChangeTo(EmisWaybillChangeTo emisWaybillChangeTo) + { + return emisWaybillChangeToMapper.insertEmisWaybillChangeTo(emisWaybillChangeTo); + } + + /** + * 修改转单记录表 + * + * @param emisWaybillChangeTo 转单记录表 + * @return 结果 + */ + @Override + public int updateEmisWaybillChangeTo(EmisWaybillChangeTo emisWaybillChangeTo) + { + return emisWaybillChangeToMapper.updateEmisWaybillChangeTo(emisWaybillChangeTo); + } + + /** + * 批量删除转单记录表 + * + * @param ids 需要删除的转单记录表主键 + * @return 结果 + */ + @Override + public int deleteEmisWaybillChangeToByIds(Long[] ids) + { + return emisWaybillChangeToMapper.deleteEmisWaybillChangeToByIds(ids); + } + + /** + * 删除转单记录表信息 + * + * @param id 转单记录表主键 + * @return 结果 + */ + @Override + public int deleteEmisWaybillChangeToById(Long id) + { + return emisWaybillChangeToMapper.deleteEmisWaybillChangeToById(id); + } + +} diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillChangeToMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillChangeToMapper.xml new file mode 100644 index 000000000..3e08bb9e1 --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisWaybillChangeToMapper.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + select id, bill_code, change_from, change_to, data_from, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_waybill_change_to + + + + + + + + + + insert into emis_waybill_change_to + + id, + bill_code, + change_from, + change_to, + data_from, + remark, + del_flag, + create_by, + create_time, + update_by, + update_time, + create_site, + update_site, + + + #{id}, + #{billCode}, + #{changeFrom}, + #{changeTo}, + #{dataFrom}, + #{remark}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{createSite}, + #{updateSite}, + + + + + update emis_waybill_change_to + + bill_code = #{billCode}, + change_from = #{changeFrom}, + change_to = #{changeTo}, + data_from = #{dataFrom}, + remark = #{remark}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + create_site = #{createSite}, + update_site = #{updateSite}, + + where id = #{id} + + + + delete from emis_waybill_change_to where id = #{id} + + + + delete from emis_waybill_change_to where id in + + #{id} + + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index cd84d7439..f9511e2ac 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1178,7 +1178,6 @@ and a.update_site=#{updateSite} - and a.bill_code in ( select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) @@ -1199,14 +1198,26 @@ and a.waybill_status!='0' and a.order_status!='2' + and ( + a.operate_employee_code=#{params.privEmpCode} + or a.take_piece_employee_code=#{params.privEmpCode} + or a.register_man_code=#{params.privEmpCode} + ) and a.order_status='2' + and ( + a.operate_employee_code=#{params.privEmpCode} + or a.take_piece_employee_code=#{params.privEmpCode} + ) + - and a.order_status='3' + and a.order_status='3'and exists ( + select 1 from emis_waybill_change_to ewcto where a.bill_code=ewcto.bill_code and ewcto.change_from=#{params.privEmpCode} + ) @@ -2020,7 +2031,7 @@