From 95cb313ff26b52468f89ab0e72e58ab5e44d2218 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 22 Jul 2025 14:43:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-?= =?UTF-8?q?=20=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=20-=20=E6=9C=88?= =?UTF-8?q?=E7=BB=93=E5=AE=A2=E6=88=B7=E7=95=8C=E9=9D=A2=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=20=20=20=E6=9C=88?= =?UTF-8?q?=E7=BB=93=E5=AE=A2=E6=88=B7=E5=AF=BC=E5=85=A5=E9=AA=8C=E9=87=8D?= =?UTF-8?q?=E9=80=BB=E8=BE=91bug=E4=BF=AE=E5=A4=8D=20=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BF=90=E5=8D=95selectOne=20bug=E4=BF=AE=E5=A4=8D=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7phone=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=9C=AA=E5=AF=BC=E5=85=A5=E6=98=BE=E7=A4=BA=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=88=90=E5=8A=9F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20=20=E6=9C=89=E8=99=9A=E6=8B=9F=E5=8D=95=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=9A=84=E4=B8=8D=E5=85=81=E8=AE=B8=E9=9D=A2?= =?UTF-8?q?=E5=8D=95=E5=88=A0=E9=99=A4=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/domain/EmisCustomerUser.java | 7 +++++ .../erp/emis/service/EmisBaseService.java | 6 +---- .../impl/EmisTmsScanRecordServiceImpl.java | 18 +++++++++++++ .../mapper/EmisCustomerUserMapper.xml | 26 +++++++++++++------ 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java index a379e2b50..2b876a79c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java @@ -126,6 +126,10 @@ public class EmisCustomerUser extends BaseEntity private String payee; /* 销售联系人 */ private String salesmen; + /* 销售支持 */ + private String salesSupport; + /* 销售主管 */ + private String salesExecutive; /* 数据来源 */ private String dataFrom; /* 是否开通oms */ @@ -174,6 +178,9 @@ public class EmisCustomerUser extends BaseEntity /* 专属业务员 */ private String opEmpName; + /* 是否是导入操作，1：是 */ + private String blImport; + // 最近下单时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date lastOrderTime; 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 63c531b98..a7383d097 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 @@ -3439,13 +3439,9 @@ public class EmisBaseService { emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser); // 插入角色 emisCustomerUserMapper.insertSysOmsUserRole(emisCustomerUser.getId()); - - redissonService.unlock("EMIS_CREATE_USER_LOCK"); return emisCustomerUser; - }catch(Exception ex){ + } finally { redissonService.unlock("EMIS_CREATE_USER_LOCK"); - ex.printStackTrace(); - return emisCustomerUser; } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 4f64543d6..6ffa354e2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -1915,6 +1915,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取主单号 String mainBillCode = getMainBillCode(scanBillCode); + // 有虚拟单绑定关系的不允许面单删除 + checkVirtual(problemType, mainBillCode); + // bug:1454,未开单不允许扫描 boolean isGot = checkWaybillIsGot(mainBillCode); if (!isGot) { @@ -2023,6 +2026,21 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm return itemList; } + private void checkVirtual(String problemType, String mainBillCode) throws EmisBizError { + if ("151".equals(problemType)) { + EmisWaybill emisWaybill = emisWaybillMapper.selectEmisWaybillByBillCode(mainBillCode); + if (Objects.isNull(emisWaybill)) { + return; + } + if ("1".equals(emisWaybill.getBlVirtual())) { + throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR, "该运单已绑定主单，请先解绑"); + } + if (StringUtils.isNotBlank(emisWaybill.getVirtualRemark())) { + throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR, "该运单已绑定虚拟单，请先解绑"); + } + } + } + /** * 填充公共数据 * @param emisTmsScanRecord diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index a7082495c..48c4ed901 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -59,6 +59,8 @@ + + @@ -88,7 +90,7 @@ - select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user + select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, sales_support, sales_executive, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user @@ -161,6 +163,8 @@ and credit_period_type=#{creditPeriodType} and credit_period = #{creditPeriod} and settle_day = #{settleDay} + and sales_support = #{salesSupport} + and sales_executive = #{salesExecutive} @@ -180,7 +184,7 @@ @@ -241,6 +245,8 @@ settle_day, status, order_num, + sales_support, + sales_executive, remark, del_flag, create_by, @@ -304,6 +310,8 @@ #{settleDay}, #{status}, #{orderNum}, + #{salesSupport}, + #{salesExecutive}, #{remark}, #{delFlag}, #{createBy}, @@ -371,6 +379,8 @@ settle_day = #{settleDay}, status = #{status}, order_num = #{orderNum}, + sales_support = #{salesSupport}, + sales_executive = #{salesExecutive}, remark = #{remark}, del_flag = #{delFlag}, create_by = #{createBy}, @@ -418,25 +428,25 @@ From 5641204efe7a9bd8e7bde9f5afcba7d12f568f0f Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Tue, 22 Jul 2025 15:22:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=20=E5=AF=BC=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=20=E5=9B=BD=E5=AE=B6=E3=80=81=E7=9C=81=E4=BB=BD?= =?UTF-8?q?=E3=80=81=E5=9F=8E=E5=B8=82=E3=80=81=E5=BC=80=E9=80=9Aoms?= =?UTF-8?q?=E3=80=81=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=20=E6=9C=AA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/emis/EmisCustomerUserController.java | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java index 22286053f..46538a74b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java @@ -15,7 +15,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; -import com.xdadan.erp.emis.domain.EmisDestination; +import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.service.EmisBaseService; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +38,6 @@ import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.common.utils.StringUtils; import com.xdadan.erp.common.utils.poi.ExcelUtil; -import com.xdadan.erp.emis.domain.EmisCustomerUser; import com.xdadan.erp.emis.service.IEmisCustomerUserService; /** @@ -261,6 +260,9 @@ public class EmisCustomerUserController extends EmisBaseController emisCustomerUser.setUserName(emisCustomerUser.getMonthlyPayCode()); + if ("1".equals(emisCustomerUser.getBlImport())) { + nameToCode(emisCustomerUser); + } return toAjax(emisCustomerUserService.insertMonthCustomerUser(emisCustomerUser)); } catch (DuplicateKeyException e) { e.printStackTrace(); @@ -269,6 +271,46 @@ public class EmisCustomerUserController extends EmisBaseController } + private void nameToCode(EmisCustomerUser emisCustomerUser) { + // 国家 + if (!StringUtils.isEmpty(emisCustomerUser.getCountry())) { + EmisCountry country = emisBaseService.getCountryByName(emisCustomerUser.getCountry()); + if (country != null) { + emisCustomerUser.setCountry(country.getCode()); + } + } + // 省份 + if (!StringUtils.isEmpty(emisCustomerUser.getProvince())) { + EmisRegion province = emisBaseService.getRegionByName(emisCustomerUser.getCountry(), null, emisCustomerUser.getProvince()); + if (province != null) { + emisCustomerUser.setProvince(province.getRegionCode()); + } + } + // 城市 + if (!StringUtils.isEmpty(emisCustomerUser.getCity())) { + EmisRegion city = emisBaseService.getRegionByName(emisCustomerUser.getCountry(), emisCustomerUser.getProvince(), emisCustomerUser.getCity()); + if (city != null) { + emisCustomerUser.setCity(city.getRegionCode()); + } + } + // 开通oms + if (!StringUtils.isEmpty(emisCustomerUser.getBlOpenOms())) { + if ("是".equals(emisCustomerUser.getBlOpenOms())) { + emisCustomerUser.setBlOpenOms("1"); + } else { + emisCustomerUser.setBlOpenOms("0"); + } + } + // 启用状态 + if (!StringUtils.isEmpty(emisCustomerUser.getStatus())) { + if ("是".equals(emisCustomerUser.getStatus())) { + emisCustomerUser.setStatus("1"); + } else { + emisCustomerUser.setStatus("0"); + } + } + } + /** * 重置用户登录密码