0521

src/main/java/cn/ezhizao/project/business/controller/BizCompanyProductPackageController.java

@@ -14,6 +14,8 @@ import cn.ezhizao.project.business.service.IBizAccessoriesService;
 import cn.ezhizao.project.business.service.IBizCompanyProductPackageService;
 import cn.ezhizao.project.business.service.IBizCompanyService;
 import cn.ezhizao.project.business.service.IBizProductService;
+import cn.ezhizao.project.system.domain.SysUser;
+import cn.ezhizao.project.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -45,6 +47,8 @@ public class BizCompanyProductPackageController extends BaseController
     private IBizCompanyService bizCompanyService;
     @Resource
     private IBizAccessoriesService bizAccessoriesService;
+    @Resource
+    private ISysUserService sysUserService;
 
     /**
      * 查询包装方式列表
@@ -137,6 +141,31 @@ public class BizCompanyProductPackageController extends BaseController
         bizCompanyProductPackage.setCompanyId(companyList.get(0).getId());
         bizCompanyProductPackage.setCompanyAlias(companyList.get(0).getCompanyAlias());
         bizCompanyProductPackage.setMnemonicCode(companyList.get(0).getMnemonicCode());
+        //查询销售员，技术员，保管员编码是否存在
+        if(bizCompanyProductPackage.getXsyno() !=null && !bizCompanyProductPackage.getXsyno().equals("")){
+            SysUser userByCode = sysUserService.getUserByCode(bizCompanyProductPackage.getXsyno());
+            if(userByCode == null){
+                return error("新增包装方式失败,销售员编码不存在");
+            }
+            bizCompanyProductPackage.setXsyId(userByCode.getUserId());
+            bizCompanyProductPackage.setXsyna(userByCode.getNickName());
+        }
+        if(bizCompanyProductPackage.getBgyno() !=null && !bizCompanyProductPackage.getBgyno().equals("")){
+            SysUser userByCode = sysUserService.getUserByCode(bizCompanyProductPackage.getBgyno());
+            if(userByCode == null){
+                return error("新增包装方式失败,保管员编码不存在");
+            }
+            bizCompanyProductPackage.setBgyId(userByCode.getUserId());
+            bizCompanyProductPackage.setBgyna(userByCode.getNickName());
+        }
+        if(bizCompanyProductPackage.getJsyno() !=null && !bizCompanyProductPackage.getJsyno().equals("")){
+            SysUser userByCode = sysUserService.getUserByCode(bizCompanyProductPackage.getJsyno());
+            if(userByCode == null){
+                return error("新增包装方式失败,技术员编码不存在");
+            }
+            bizCompanyProductPackage.setJsyId(userByCode.getUserId());
+            bizCompanyProductPackage.setJsyna(userByCode.getNickName());
+        }
         //查询包装箱辅料编码是否存在
         List<BizAccessories> accessoriesList = bizAccessoriesService.query().eq("accessories_code", bizCompanyProductPackage.getPackageCode()).list();
         if(accessoriesList.isEmpty()){
@@ -208,6 +237,31 @@ public class BizCompanyProductPackageController extends BaseController
             bizCompanyProductPackage.setProductId(productList.get(0).getId());
             bizCompanyProductPackage.setProductDescription(productList.get(0).getDescription());
         }
+        //查询销售员，技术员，保管员编码是否存在
+        if(bizCompanyProductPackage.getXsyno() !=null && !bizCompanyProductPackage.getXsyno().equals("")){
+            SysUser userByCode = sysUserService.getUserByCode(bizCompanyProductPackage.getXsyno());
+            if(userByCode == null){
+                return error("修改包装方式失败,销售员编码不存在");
+            }
+            bizCompanyProductPackage.setXsyId(userByCode.getUserId());
+            bizCompanyProductPackage.setXsyna(userByCode.getNickName());
+        }
+        if(bizCompanyProductPackage.getBgyno() !=null && !bizCompanyProductPackage.getBgyno().equals("")){
+            SysUser userByCode = sysUserService.getUserByCode(bizCompanyProductPackage.getBgyno());
+            if(userByCode == null){
+                return error("修改包装方式失败,保管员编码不存在");
+            }
+            bizCompanyProductPackage.setBgyId(userByCode.getUserId());
+            bizCompanyProductPackage.setBgyna(userByCode.getNickName());
+        }
+        if(bizCompanyProductPackage.getJsyno() !=null && !bizCompanyProductPackage.getJsyno().equals("")){
+            SysUser userByCode = sysUserService.getUserByCode(bizCompanyProductPackage.getJsyno());
+            if(userByCode == null){
+                return error("修改包装方式失败,技术员编码不存在");
+            }
+            bizCompanyProductPackage.setJsyId(userByCode.getUserId());
+            bizCompanyProductPackage.setJsyna(userByCode.getNickName());
+        }
         //查询客户编码是否存在
         if(bizCompanyProductPackage.getCompanyCode() != null) {
             List<BizCompany> companyList = bizCompanyService.query().eq("company_code", bizCompanyProductPackage.getCompanyCode()).list();

src/main/java/cn/ezhizao/project/business/domain/BizCompanyProductPackage.java

@@ -161,4 +161,16 @@ public class BizCompanyProductPackage extends BaseEntity
     private String netWeight;
     private String engineerChangeNumber;
     private String supplierCode;
+    //销售员编号
+    private String xsyno;
+    private Long xsyId;
+    private String xsyna;
+    //保管员编号
+    private String bgyno;
+    private Long bgyId;
+    private String bgyna;
+    //技术员编号
+    private String jsyno;
+    private Long jsyId;
+    private String jsyna;
 }