md

emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTransLineMapper.java

@@ -28,6 +28,10 @@ public interface EmisTransLineMapper extends BaseMapper<EmisTransLine>
      */
     public EmisTransLine selectEmisTransLineById(Long id);
 
+
+    public EmisTransLine selectTransLineByName(String lineName);
+
+
     /**
      * 查询列表
      * 

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 <p> 运输产品类型 Mapper 接口 </p>
@@ -28,6 +30,15 @@ public interface EmisTransProductMapper extends BaseMapper<EmisTransProduct>
      */
     public EmisTransProduct selectEmisTransProductById(Long id);
 
+
+    /**
+     * 名称查询
+     * @param lineCode
+     * @param prodName
+     * @return
+     */
+    public EmisTransProduct selectTransProductByName(@Param("lineCode") String lineCode,@Param("prodName") String prodName);
+
     /**
      * 查询列表
      * 

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();
+         return emisTransLineMapper.selectTransLineByName(lineName);
-         queryEmisTransLine.setLineName(lineName);
-         List<EmisTransLine> list=emisTransLineMapper.selectEmisTransLineList(queryEmisTransLine);
-         if(!CollectionUtils.isEmpty(list)) {
-             return list.get(0);
-         }
-         return null;
      }
 
      /**
@@ -1799,16 +1794,7 @@ public class EmisBaseService {
       * @return
       */
      public EmisTransProduct getTransProductByName(String lineCode,String prodName) {
-         EmisTransProduct emisTransProduct = new EmisTransProduct();
+         return emisTransProductMapper.selectTransProductByName(lineCode,prodName);
-         emisTransProduct.setTransLineCode(lineCode);
-         emisTransProduct.setProdName(prodName);
-         List<EmisTransProduct> list=emisTransProductMapper.selectEmisTransProductList(emisTransProduct);
-         if(!CollectionUtils.isEmpty(list)) {
-             return list.get(0);
-         }
-
-         return null;
-
      }
 
      /**

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, "销售联系人不存在");
+            }
         }
 
 

emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml

@@ -77,6 +77,13 @@
         where a.id = #{id}
     </select>
 
+    <select id="selectTransLineByName" parameterType="String" resultMap="EmisTransLineResult">
+        select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_trans_line a
+        where a.line_name = #{lineName}
+    </select>
+
+
     <insert id="insertEmisTransLine" parameterType="EmisTransLine">
         insert into emis_trans_line
         <trim prefix="(" suffix=")" suffixOverrides=",">

emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml

@@ -62,6 +62,12 @@
         order by order_num desc
     </select>
 
+    <select id="selectTransProductByName" parameterType="String" resultMap="EmisTransProductResult">
+        select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, aging_flag, min_aging, max_aging, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_trans_product a
+        where a.trans_line_code=#{lineCode} and a.prodName=#{prodName} limit 1
+    </select>
+
     <select id="checkUnique" parameterType="EmisTransProduct"  resultType="int">
 		select count(1) from  emis_trans_product
 		where del_flag='0'