From 70b8b631a5f4dec7e9f9f56936c8c2ca5195e3cd Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 24 Jun 2024 20:35:37 +0800 Subject: [PATCH] md --- .../erp/emis/mapper/EmisTransLineMapper.java | 4 +++ .../emis/mapper/EmisTransProductMapper.java | 11 ++++++++ .../erp/emis/service/EmisBaseService.java | 24 ++++-------------- .../service/impl/EmisWaybillServiceImpl.java | 25 ++++++++++++++++--- .../resources/mapper/EmisTransLineMapper.xml | 7 ++++++ .../mapper/EmisTransProductMapper.xml | 6 +++++ 6 files changed, 54 insertions(+), 23 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransLineMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransLineMapper.java index bb5e752db..8681862a6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransLineMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransLineMapper.java @@ -28,6 +28,10 @@ public interface EmisTransLineMapper extends BaseMapper */ public EmisTransLine selectEmisTransLineById(Long id); + + public EmisTransLine selectTransLineByName(String lineName); + + /** * 查询列表 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java index d44e200ab..6e75c93de 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransProductMapper.java @@ -13,6 +13,8 @@ package com.xdadan.erp.emis.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.emis.domain.EmisTransProduct; +import org.apache.ibatis.annotations.Param; + /** * @ClassName EmisTransProductMapper * @Description

运输产品类型 Mapper 接口

@@ -28,6 +30,15 @@ public interface EmisTransProductMapper extends BaseMapper */ public EmisTransProduct selectEmisTransProductById(Long id); + + /** + * 名称查询 + * @param lineCode + * @param prodName + * @return + */ + public EmisTransProduct selectTransProductByName(@Param("lineCode") String lineCode,@Param("prodName") String prodName); + /** * 查询列表 * 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 e4e755f72..40c1c53fd 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 @@ -1594,8 +1594,9 @@ public class EmisBaseService { return sysUserMapper.selectUserByEmpName(empName); } - - + public SysUser getEmisStaffBySiteCodeAndEmpName(String ownerSiteCode,String empName){ + return sysUserMapper.selectUserBySiteCodeAndEmpName(ownerSiteCode,empName); + } /** * 产生客户编码 规则: siteCode+ 000000 @@ -1751,13 +1752,7 @@ public class EmisBaseService { * @return */ public EmisTransLine getTransLineByName(String lineName) { - EmisTransLine queryEmisTransLine = new EmisTransLine(); - queryEmisTransLine.setLineName(lineName); - List list=emisTransLineMapper.selectEmisTransLineList(queryEmisTransLine); - if(!CollectionUtils.isEmpty(list)) { - return list.get(0); - } - return null; + return emisTransLineMapper.selectTransLineByName(lineName); } /** @@ -1799,16 +1794,7 @@ public class EmisBaseService { * @return */ public EmisTransProduct getTransProductByName(String lineCode,String prodName) { - EmisTransProduct emisTransProduct = new EmisTransProduct(); - emisTransProduct.setTransLineCode(lineCode); - emisTransProduct.setProdName(prodName); - List list=emisTransProductMapper.selectEmisTransProductList(emisTransProduct); - if(!CollectionUtils.isEmpty(list)) { - return list.get(0); - } - - return null; - + return emisTransProductMapper.selectTransProductByName(lineCode,prodName); } /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index cd4325ae2..188f607f0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -276,6 +276,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb */ private void cvtWaybillDraftToReal(EmisWaybill emisWaybillSave) throws EmisBizError { + // 货物名称必填 + if(StringUtils.isEmpty(emisWaybillSave.getGoodsInfo())){ + throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "产品名称不能为空"); + } + // 线路转换 EmisTransLine transLine=getTransLineByName(emisWaybillSave.getTransLineType()); if(transLine==null){ @@ -336,16 +341,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 取件员或操作员 if("1".equals(pickupMethod)){ - SysUser empUser=getEmisStaffByEmpName(emisWaybillSave.getOperateEmployeeCode()); + SysUser empUser=getEmisStaffBySiteCodeAndEmpName(getCurrentUser().getOwnerSiteCode(),emisWaybillSave.getOperateEmployeeCode()); if(empUser==null){ - throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "快递员不正确"); + throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "操作员不正确"); } emisWaybillSave.setOperateEmployeeCode(empUser.getEmpCode()); } else if("2".equals(pickupMethod)){ - SysUser empUser=getEmisStaffByEmpName(emisWaybillSave.getOperateEmployeeCode()); + SysUser empUser=getEmisStaffBySiteCodeAndEmpName(getCurrentUser().getOwnerSiteCode(),emisWaybillSave.getOperateEmployeeCode()); if(empUser==null){ - throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "快递员不正确"); + throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "取件员不正确"); } emisWaybillSave.setTakePieceEmployeeCode(empUser.getEmpCode()); } @@ -413,8 +418,20 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb emisWaybillSave.setCustomerName(emisCustomerUser.getCustomerName()); emisWaybillSave.setPayee(emisCustomerUser.getPayee()); emisWaybillSave.setSalesmen(emisCustomerUser.getSalesmen()); + + }else{ emisWaybillSave.setCustNo(null); + // 判断现金的回款联系人和销售联系人 + SysUser payee=getEmisStaffByEmpName(emisWaybillSave.getPayee()); + if(payee==null){ + throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "回款联系人不存在"); + } + + SysUser salesmen=getEmisStaffByEmpName(emisWaybillSave.getSalesmen()); + if(salesmen==null){ + throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "销售联系人不存在"); + } } diff --git a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml index 9aa01a5b6..3b2eba037 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml @@ -77,6 +77,13 @@ where a.id = #{id} + + + insert into emis_trans_line diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml index ba1bf7345..9e4c971e4 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml @@ -62,6 +62,12 @@ order by order_num desc + +