Merge remote-tracking branch 'origin/master'

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/controller/BizProductAccessoriesMaterialController.java

@@ -217,6 +217,7 @@ public class BizProductAccessoriesMaterialController extends BaseController
                                 bizProduct.setTechnicianCode(product.getTechnicianCode() != null ? product.getTechnicianCode() : "");
                                 bizProduct.setCreatorCode(product.getCreatorCode() != null ? product.getCreatorCode() : "");
                                 bizProduct.setMaterialNum(product.getMaterialNum() != null ? product.getMaterialNum() : "");
+                                bizProduct.setIsSubclass(product.getIsSubclass() != null ? product.getIsSubclass() : 0);
                                 productList.add(bizProduct);
                             }
                             bizProductService.saveBatch(productList);
@@ -666,6 +667,9 @@ public class BizProductAccessoriesMaterialController extends BaseController
                             if (product.getMaterialNum() != null) {
                                 bizProduct.setMaterialNum(product.getMaterialNum());
                             }
+                            if (product.getIsSubclass() != null) {
+                                bizProduct.setIsSubclass(product.getIsSubclass());
+                            }
                         }
                         bizProductService.updateBatchById(productList);
 

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

@@ -92,8 +92,8 @@ public class SysUserController extends BaseController
     public AjaxResult add(@RequestBody SysUser sysUser) throws NoSuchFieldException, IllegalAccessException
     {
         if(sysUser.getUserName() == null || sysUser.getUserName() == ""||sysUser.getNickName() == null || sysUser.getNickName() == "" || sysUser.getUsageCompanyId() == null
-                ||sysUser.getContractCompanyId() == null ||sysUser.getPassword()==null||sysUser.getPassword()=="" ){
-            return error("新增用户失败，员工姓名，员工编码，合同单位，使用单位，登录密码必填项不能为空");
+                ||sysUser.getContractCompanyId() == null ){
+            return error("新增用户失败，员工姓名，员工编码，合同单位，使用单位必填项不能为空");
         }
         //判断员工状态，用户性别的值
         if(sysUser.getSex() !=null && sysUser.getSex() !="" && (!sysUser.getSex().equals("男") && !sysUser.getSex().equals("女"))){
@@ -128,7 +128,7 @@ public class SysUserController extends BaseController
             return error("新增用户'" + sysUser.getUserName() + "'失败，邮箱账号已存在");
         }
         sysUser.setCreateBy(getUsername());
-        sysUser.setPassword(SecurityUtils.encryptPassword(sysUser.getPassword()));
+//        sysUser.setPassword(SecurityUtils.encryptPassword(sysUser.getPassword()));
         sysUser.setUserType("02");
         return success(sysUserService.insertUser(sysUser));
     }
@@ -156,8 +156,8 @@ public class SysUserController extends BaseController
         if(sysUser.getUserId() == null){
             return error("修改用户失败，用户ID不能为空");
         }
-        if(sysUser.getUserName() == ""|| sysUser.getNickName() == "" ||sysUser.getPassword()=="" ){
-            return error("修改用户失败，员工姓名，员工编码，登录密码不能为空");
+        if(sysUser.getUserName() == ""|| sysUser.getNickName() == "" ){
+            return error("修改用户失败，员工姓名，员工编码不能为空");
         }
         sysUserService.checkUserAllowed(sysUser);
         sysUserService.checkUserDataScope(sysUser.getUserId());

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;
 }

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

@@ -189,5 +189,7 @@ public class BizProduct extends BaseEntity
     @Excel(name = "物料编号")
     @ApiModelProperty(value = "物料编号")
     private String materialNum;
+    @ApiModelProperty(value = "是否有子件")
+    private Integer isSubclass;
 
 }

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

@@ -35,6 +35,8 @@ public class BizProductAccessoriesMaterial extends BaseEntity
     private String productCode;
     @ApiModelProperty(value = "原始料号")
     private String historyProductCode;
+    @ApiModelProperty(value = "是否有子件")
+    private Integer isSubclass;
 
     /** 预入仓库 */
     @Excel(name = "预入仓库")