From 3e34c5745e8c611ab82b0a803278d18ec3b710cf Mon Sep 17 00:00:00 2001
From: lenovo <123>
Date: Mon, 9 Jan 2023 15:41:38 +0800
Subject: [PATCH] 2023-1-9sample

---
 .../views/zyclothsample/ZyClothSampleList.vue |  2 +-
 .../modules/ZyClothSampleForm.vue             | 14 +++++------
 .../device/controller/ZyDeviceController.java | 19 +-------------
 .../impl/ZyPlanProcessServiceImpl.java        |  2 +-
 .../zyclothsample/entity/ZyClothSample.java   | 25 ++++++++++++-------
 .../controller/ZyDevicebrandController.java   |  2 +-
 .../controller/ZyDevicemodelController.java   |  2 +-
 .../controller/ZyDevicetypeController.java    |  2 +-
 8 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
index d3dcca18..139a80d0 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
@@ -217,7 +217,7 @@ export default {
         {
           title: '企业',
           align: "center",
-          dataIndex: 'userId_dictText'
+          dataIndex: 'enterpriseId_dictText'
         },
         {
           title: '创建时间',
diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
index cdf42a2e..af5aa95c 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="企业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterpriseId">
-              <j-select-depart v-model="model.userId" @change="kuanshi" />
+              <j-select-depart v-model="model.enterpriseId" @change="kuanshi" />
             </a-form-model-item>
           </a-col>
 
@@ -152,11 +152,11 @@ export default {
     },
     //
     kuanshi(){
-   this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.userId+"'";
+   this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.enterpriseId+"'";
       this.model.styleId=null
     },
     xiugai(){
-      if(this.model.stylemodelId!=null&&this.model.userId!=null){
+      if(this.model.stylemodelId!=null&&this.model.enterpriseId!=null){
         this.gaibian()
       }
     },
@@ -165,11 +165,11 @@ export default {
       console.log(this.model)
       getAction(this.url.sort,this.model).then((res)=>{
           console.log(res)
-        if(this.model.id!=null){
-          var num=parseInt(res.result,10)
-        }else{
+        if(this.model.id==null||parseInt(res.result,10)==0){
           var num=parseInt(res.result,10)+1
 
+        }else{
+          var num=parseInt(res.result,10)
         }
           num=num.toString()
           while(num.length<n){
@@ -188,7 +188,7 @@ export default {
     },
     edit(record) {
       this.model = Object.assign({}, record);
-      this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.userId+"'";
+      this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.enterpriseId+"'";
       this.visible = true;
     }
     ,
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java
index b4ed827d..d91662a9 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java
@@ -174,24 +174,7 @@ public class ZyDeviceController extends JeecgController<ZyDevice, IZyDeviceServi
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("name",zyDevice.getName());
 		int a=zyDeviceService.count(queryWrapper);
-		if(a==0){
-			if(zyDevice.getModelId()!=null&&!zyDevice.getModelId().equals("")){
-				ZyDevicemodel zyDevicemodel=zyDeviceService.findByModelId(zyDevice.getModelId());
-				if(zyDevicemodel.getBrandId()!=null){
-					zyDevice.setBrandId(zyDevicemodel.getBrandId());
-					zyDevice.setTypeCode(zyDevicemodel.getDevicetypeCode());
-				}
-			}
-			String code=zyDeviceService.getCode();
-			if(code==null||code.equals("")){
-				zyDevice.setCode(zyDevice.getTypeCode()+"001");
-			}else{
-				String  sort=String.valueOf(Integer.parseInt(code.substring(6))+1);
-				while(sort.length()<3){
-					sort="0"+sort;
-				}
-				zyDevice.setCode(zyDevice.getTypeCode()+sort);
-			}
+		if(a<2){
 			zyDeviceService.updateById(zyDevice);
 			return Result.OK("编辑成功!");
 		}else{
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
index d3933b79..17305470 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
@@ -32,7 +32,7 @@ import org.springframework.util.ObjectUtils;
 import java.util.LinkedList;
 import java.util.List;
 
-import static com.sun.tools.internal.xjc.reader.Ring.add;
+
 
 /**
  * @Description: 生产计划工序
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java
index 64a04bb6..c28e6539 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java
@@ -70,7 +70,7 @@ public class ZyClothSample implements Serializable {
     @Excel(name = "用户", width = 15)
     @ApiModelProperty(value = "用户")
     @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
-    private String userId;
+    private String enterpriseId;
     /**创建日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -85,10 +85,10 @@ public class ZyClothSample implements Serializable {
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 
-	/**成衣名称*/
-	@Excel(name = "成衣名称", width = 15)
-    @ApiModelProperty(value = "成衣名称")
-    private String clothName;
+//	/**成衣名称*/
+//	@Excel(name = "成衣名称", width = 15)
+//    @ApiModelProperty(value = "成衣名称")
+//    private String clothName;
 	/**描述*/
 	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
@@ -97,9 +97,16 @@ public class ZyClothSample implements Serializable {
 	@Excel(name = "图片", width = 15)
     @ApiModelProperty(value = "图片")
     private String url;
-	/**用户类型*/
-	@Excel(name = "用户类型", width = 15)
-    @ApiModelProperty(value = "用户类型")
-    private String type;
+//	/**用户类型*/
+//	@Excel(name = "用户类型", width = 15)
+//    @ApiModelProperty(value = "用户类型")
+//    private String type;
+
+    @Excel(name = "结构图", width = 15)
+    @ApiModelProperty(value = "结构图")
+    private String structureDiagram;
+    @Excel(name = "排料图", width = 15)
+    @ApiModelProperty(value = "排料图")
+    private String layoutDiagram;
 
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicebrand/controller/ZyDevicebrandController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicebrand/controller/ZyDevicebrandController.java
index ff131200..e36801f1 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicebrand/controller/ZyDevicebrandController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicebrand/controller/ZyDevicebrandController.java
@@ -109,7 +109,7 @@ public class ZyDevicebrandController extends JeecgController<ZyDevicebrand, IZyD
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("brand",zyDevicebrand.getBrand());
 		int a=zyDevicebrandService.count(queryWrapper);
-		if(a==0){
+		if(a<2){
 			zyDevicebrandService.updateById(zyDevicebrand);
 			return Result.OK("编辑成功！");
 		}else{
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicemodel/controller/ZyDevicemodelController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicemodel/controller/ZyDevicemodelController.java
index 82a378f2..a0874536 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicemodel/controller/ZyDevicemodelController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicemodel/controller/ZyDevicemodelController.java
@@ -144,7 +144,7 @@ public class ZyDevicemodelController extends JeecgController<ZyDevicemodel, IZyD
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("model",zyDevicemodel.getModel());
 		int a=zyDevicemodelService.count(queryWrapper);
-		if(a==0){
+		if(a<2){
 			zyDevicemodelService.updateById(zyDevicemodel);
 			return Result.OK("编辑成功!");
 		}else{
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/controller/ZyDevicetypeController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/controller/ZyDevicetypeController.java
index 04b4ea08..5d39fa65 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/controller/ZyDevicetypeController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zydevice/devicetype/controller/ZyDevicetypeController.java
@@ -107,7 +107,7 @@ public class ZyDevicetypeController extends JeecgController<ZyDevicetype, IZyDev
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("name",zyDevicetype.getName());
 		int a=zyDevicetypeService.count(queryWrapper);
-		if(a==0){
+		if(a<2){
 		zyDevicetypeService.updateById(zyDevicetype);
 		return Result.OK("编辑成功!");}
 		else{