0612

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

@@ -117,8 +117,8 @@ public class BizCompanyProductPackageController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     {
-        if(bizCompanyProductPackage.getJdId() == null||bizCompanyProductPackage.getProductCode() == null || bizCompanyProductPackage.getProductCode() == ""||bizCompanyProductPackage.getCompanyCode() == null || bizCompanyProductPackage.getCompanyCode() == "" || bizCompanyProductPackage.getPackageCode() == null || bizCompanyProductPackage.getPackageCode() == ""){
-            return error("新增包装方式失败,必填项:金蝶id,产品编码,客户编码,包装箱辅料编码不能为空");
+        if(bizCompanyProductPackage.getJdId() == null || bizCompanyProductPackage.getIsBanned() == null||bizCompanyProductPackage.getProductCode() == null || bizCompanyProductPackage.getProductCode() == ""||bizCompanyProductPackage.getCompanyCode() == null || bizCompanyProductPackage.getCompanyCode() == "" || bizCompanyProductPackage.getPackageCode() == null || bizCompanyProductPackage.getPackageCode() == ""){
+            return error("新增包装方式失败,必填项:金蝶id,禁用状态,产品编码,客户编码,包装箱辅料编码不能为空");
         }
         if(bizCompanyProductPackage.getAreaType() != null && bizCompanyProductPackage.getAreaType() != "" && !(bizCompanyProductPackage.getAreaType().equals("Manual")|| bizCompanyProductPackage.getAreaType().equals("Automatic"))){
             return error("新增包装方式失败,区域类型只能为Manual或Automatic");
@@ -126,6 +126,9 @@ public class BizCompanyProductPackageController extends BaseController
         if(bizCompanyProductPackage.getPalletType() != null && bizCompanyProductPackage.getPalletType() != "" && !(bizCompanyProductPackage.getPalletType().equals("0" ) || bizCompanyProductPackage.getPalletType().equals("1"))){
             return error("新增包装方式失败,托盘类型只能为0或1");
         }
+        if( !(bizCompanyProductPackage.getIsBanned()==0 || bizCompanyProductPackage.getIsBanned() == 1)){
+            return error("新增包装方式失败,禁用状态只能为0或1");
+        }
         //查询产品编码是否存在
         List<BizProduct> productList = bizProductService.query().eq("product_code", bizCompanyProductPackage.getProductCode()).list();
         if(productList.isEmpty()){
@@ -230,6 +233,9 @@ public class BizCompanyProductPackageController extends BaseController
         if(bizCompanyProductPackage.getPalletType() != null && bizCompanyProductPackage.getPalletType() != "" && !(bizCompanyProductPackage.getPalletType().equals("0" ) || bizCompanyProductPackage.getPalletType().equals("1"))){
             return error("修改包装方式失败,托盘类型只能为0或1");
         }
+        if(bizCompanyProductPackage.getIsBanned() != null && !(bizCompanyProductPackage.getIsBanned()==0 || bizCompanyProductPackage.getIsBanned() == 1)){
+            return error("修改包装方式失败,禁用状态只能为0或1");
+        }
         //查询产品编码是否存在
         if(bizCompanyProductPackage.getProductCode() != null) {
             List<BizProduct> productList = bizProductService.query().eq("product_code", bizCompanyProductPackage.getProductCode()).list();

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

@@ -176,4 +176,5 @@ public class BizCompanyProductPackage extends BaseEntity
     /** 金碟 id */
     @ApiModelProperty(value = "${comment}")
     private Long jdId;
+    private Integer isBanned;
 }