Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/collecttype/admin/CollectTypeList.vue

@@ -4,6 +4,21 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="收藏分类名">
+              <a-input placeholder="请输入收藏分类名" v-model="queryParam.collectTypeName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>

ant-design-vue-jeecg/src/views/collecttype/admin/modules/CollectTypeModal.vue

@@ -11,12 +11,12 @@
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-form-model-item label="收藏分类名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectTypeName">
-          <a-input v-model="model.collectTypeName" placeholder="请输入收藏分类名" ></a-input>
+          <a-input v-model="model.collectTypeName" placeholder="请输入顶级收藏夹" ></a-input>
         </a-form-model-item>
-        <a-form-model-item label="父级节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
+        <a-form-model-item label="上级收藏夹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pid">
           <j-tree-select
             ref="treeSelect"
-            placeholder="请选择父级节点"
+            placeholder="请选择上级收藏夹"
             v-model="model.pid"
             dict="collect_type,collect_type_name,id"
             pidField="pid"

ant-design-vue-jeecg/src/views/customercollectgoods/admin/CustomercollectgoodsList.vue

@@ -1,12 +1,12 @@
 <template>
   <a-card :bordered="false">
     <!-- 查询区域 -->
-<div class="table-page-search-wrapper">
+    <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="用户">
-              <j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
+              <j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -157,11 +157,6 @@
             align:"center",
             dataIndex: 'price'
           },
-          {
-            title:'数量',
-            align:"center",
-            dataIndex: 'number'
-          },
           {
             title:'收藏夹',
             align:"center",
@@ -201,10 +196,11 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'sel_user',value:'userId',text:'用户'})
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
-        fieldList.push({type:'sel_search',value:'goodsId',text:'商品',dictTable:'', dictText:'', dictCode:''})
+        fieldList.push({type:'popup',value:'username',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
+        fieldList.push({type:'sel_search',value:'goodsId',text:'商品',dictTable:'zy_goods', dictText:'goods_name', dictCode:'id'})
+        fieldList.push({type:'popup',value:'goodsname',text:'商品', popup:{code:'findgoods',field:'id',orgFields:'id',destFields:'goods_id'}})
         fieldList.push({type:'string',value:'price',text:'当前单价',dictCode:''})
-        fieldList.push({type:'string',value:'number',text:'数量',dictCode:''})
         fieldList.push({type:'sel_search',value:'collectTypeId',text:'收藏夹',dictTable:'collect_type', dictText:'collect_type_name', dictCode:'id'})
         this.superFieldList = fieldList
       }

ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue

@@ -4,13 +4,29 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
-              <j-select-user-by-dep v-model="model.userId" />
+              <j-popup
+                v-model="model.username"
+                field="username"
+                org-fields="id,realname"
+                dest-fields="userId,username"
+                code="findcust"
+                :multi="true"
+                @input="popupCallback"
+                />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
+            <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsname">
-              <j-search-select-tag v-model="model.goodsId" dict="zy_goods,goods_name,id"  />
+              <j-popup
+                v-model="model.goodsname"
+                field="goodsname"
+                org-fields="id,goods_name,unit_price"
+                dest-fields="goodsId,goodsname,price"
+                code="findgoods"
+                :multi="true"
+                @input="popupCallback"
+                />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -18,11 +34,6 @@
               <a-input v-model="model.price" placeholder="请输入当前单价"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
-              <a-input v-model="model.number" placeholder="请输入数量"  ></a-input>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="收藏夹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectTypeId">
               <j-search-select-tag v-model="model.collectTypeId" dict="collect_type,collect_type_name,id"  />
@@ -119,6 +130,9 @@
          
         })
       },
+      popupCallback(value,row){
+         this.model = Object.assign(this.model, row);
+      },
     }
   }
 </script>

ant-design-vue-jeecg/src/views/device/ZyDeviceList.vue

@@ -130,6 +130,26 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'设备类型',
+            align:"center",
+            dataIndex: 'typeCode_dictText'
+          },
+          {
+            title:'设备型号',
+            align:"center",
+            dataIndex: 'modelId_dictText'
+          },
+          {
+            title:'设备品牌',
+            align:"center",
+            dataIndex: 'brandId_dictText'
+          },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'name'
+          },
           {
             title:'设备图片',
             align:"center",
@@ -139,14 +159,10 @@
           {
             title:'设备二维码',
             align:"center",
-            dataIndex: 'erweima',
+            dataIndex: 'qrcode',
             scopedSlots: {customRender: 'imgeSlot'}
           },
-          {
+
-            title:'设备类型',
-            align:"center",
-            dataIndex: 'typeid_dictText'
-          },
           {
             title:'设备编号',
             align:"center",
@@ -165,11 +181,6 @@
             align:"center",
             dataIndex: 'agent_dictText'
           },
-          {
-            title:'存放位置',
-            align:"center",
-            dataIndex: 'adress'
-          },
           {
             title:'设备状态',
             align:"center",

ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue

@@ -24,7 +24,7 @@
               <a-input placeholder="名称" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
+
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="颜色">
               <a-input placeholder="请输入颜色" v-model="queryParam.color"></a-input>
@@ -40,15 +40,10 @@
               <j-search-select-tag placeholder="请选择材质" v-model="queryParam.material" dict="material"/>
             </a-form-item>
           </a-col>
-          </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>

ant-design-vue-jeecg/src/views/process/modules/ZyOperationtoolList.vue

@@ -12,7 +12,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>

ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue

@@ -12,7 +12,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>

ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue

@@ -17,7 +17,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>

ant-design-vue-jeecg/src/views/process/modules/ZyProcessMachineList.vue

@@ -17,7 +17,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
             </span>
           </a-col>
         </a-row>

ant-design-vue-jeecg/src/views/process/modules/list/ZyMachine.vue

@@ -142,7 +142,7 @@
           // }
         ],
         url: {
-          list: "/devicetype/zyDevicetype/list1",
+          list: "/device/zyDevice/list1",
           importExcelUrl: "base/zyClothAction/importExcel",
 
         },

jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java

@@ -89,6 +89,15 @@ public class ZyFabricController extends JeecgController<ZyFabric, IZyFabricServi
 		if(zyFabric.getName()!=null&&!zyFabric.getName().equals("")){
 			queryWrapper.like("name",zyFabric.getName());
 		}
+		if(zyFabric.getColor()!=null&&!zyFabric.getColor().equals("")){
+			queryWrapper.like("color",zyFabric.getColor());
+		}
+		if(zyFabric.getPattern()!=null&&!zyFabric.getPattern().equals("")){
+			queryWrapper.like("pattern",zyFabric.getPattern());
+		}
+		if(zyFabric.getMaterial()!=null&&!zyFabric.getMaterial().equals("")){
+			queryWrapper.like("material",zyFabric.getMaterial());
+		}
         queryWrapper.orderByDesc("create_time");
 //		QueryWrapper queryWrapper = new QueryWrapper();
 		Page<ZyFabric> page = new Page<>(pageNo, pageSize);

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/entity/ZyProcessMachine.java

@@ -41,7 +41,7 @@ public class ZyProcessMachine implements Serializable {
     private String processId;
 	/**机器*/
 	@Excel(name = "机器", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "zy_device", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "机器")
     private String machineId;
 	/**创建时间*/

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessMachineMapper.java

@@ -21,6 +21,6 @@ public interface ZyProcessMachineMapper extends BaseMapper<ZyProcessMachine> {
 
     @Select("<script>select * from zy_process_machine <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
     IPage<ZyProcessMachine> page(Page<ZyProcessMachine> page, @Param("p") String processId, @Param("m") String machineId);
-    @Select("<script>select a.*,b.process_code,c.code  from zy_process_machine as a,zy_process as b,zy_devicetype as c <where> a.process_id=b.id and a.machine_id=c.id and a.process_id=#{p} <if test=\" m != null\"> and machine_id in (select id from zy_devicetype where name like #{m})</if></where></script>")
+    @Select("<script>select a.*,b.process_code,c.code  from zy_process_machine as a,zy_process as b,zy_device as c <where> a.process_id=b.id and a.machine_id=c.id and a.process_id=#{p} <if test=\" m != null\"> and machine_id in (select id from zy_device where name like #{m})</if></where></script>")
     IPage<ZyProcessMachine> page1(Page<ZyProcessMachine> page, @Param("p") String s, @Param("m") String t);
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/collecttype/entity/CollectType.java

@@ -58,9 +58,9 @@ public class CollectType implements Serializable {
     @Excel(name = "收藏分类名", width = 15)
     @ApiModelProperty(value = "收藏分类名")
     private java.lang.String collectTypeName;
-	/**父级节点*/
+    /**上级收藏夹*/
-	@Excel(name = "父级节点", width = 15)
+    @Excel(name = "上级收藏夹", width = 15)
-    @ApiModelProperty(value = "父级节点")
+    @ApiModelProperty(value = "上级收藏夹")
     private java.lang.String pid;
     /**是否有子节点*/
     @Excel(name = "是否有子节点", width = 15, dicCode = "yn")

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/entity/Customercollectgoods.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 收藏商品（衣橱）
  * @Author: jeecg-boot
- * @Date:   2022-12-08
+ * @Date:   2023-01-04
  * @Version: V1.0
  */
 @Data
@@ -55,23 +55,27 @@ public class Customercollectgoods implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
     /**用户*/
-	@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
-	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     @ApiModelProperty(value = "用户")
     private java.lang.String userId;
+    /**用户*/
+    @Excel(name = "用户", width = 15)
+    @ApiModelProperty(value = "用户")
+    private java.lang.String username;
     /**商品*/
     @Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_name", dicCode = "id")
     @Dict(dictTable = "zy_goods", dicText = "goods_name", dicCode = "id")
     @ApiModelProperty(value = "商品")
     private java.lang.String goodsId;
+    /**商品*/
+    @Excel(name = "商品", width = 15)
+    @ApiModelProperty(value = "商品")
+    private java.lang.String goodsname;
     /**当前单价*/
     @Excel(name = "当前单价", width = 15)
     @ApiModelProperty(value = "当前单价")
     private java.lang.String price;
-	/**数量*/
-	@Excel(name = "数量", width = 15)
-    @ApiModelProperty(value = "数量")
-    private java.lang.String number;
     /**收藏夹*/
     @Excel(name = "收藏夹", width = 15, dictTable = "collect_type", dicText = "collect_type_name", dicCode = "id")
     @Dict(dictTable = "collect_type", dicText = "collect_type_name", dicCode = "id")

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/controller/ZyDeviceController.java

@@ -102,10 +102,23 @@ public class ZyDeviceController extends JeecgController<ZyDevice, IZyDeviceServi
 			MatrixToImageWriter.writeToStream(bitMatrix, "PNG", outputStream);
 			Base64.Encoder encoder = Base64.getEncoder();
 			String text = encoder.encodeToString(outputStream.toByteArray());
-			pageList.getRecords().get(i).setErweima("data:image/png;base64,"+text);
+			pageList.getRecords().get(i).setQrcode("data:image/png;base64,"+text);
 		}
 		return Result.OK(pageList);
 	}
+	 @AutoLog(value = "设备信息-分页列表查询")
+	 @ApiOperation(value="设备信息-分页列表查询", notes="设备信息-分页列表查询")
+	 @GetMapping(value = "/list1")
+	 public Result<?> queryPageList1(ZyDevice zyDevice,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) throws WriterException, IOException {
+		 QueryWrapper<ZyDevice> queryWrapper = QueryGenerator.initQueryWrapper(zyDevice, req.getParameterMap());
+		 Page<ZyDevice> page = new Page<ZyDevice>(pageNo, pageSize);
+		 IPage<ZyDevice> pageList = zyDeviceService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
 
 	 /**
 	 *   添加

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/device/entity/ZyDevice.java

@@ -53,16 +53,16 @@ public class ZyDevice implements Serializable {
     private Date updateTime;
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
-    private String sysOrgCode;
+    private String orgCode;
 	/**设备图片*/
 	@Excel(name = "设备图片", width = 15)
     @ApiModelProperty(value = "设备图片")
     private String img;
 	/**设备类型*/
-	@Excel(name = "设备类型", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+//	@Excel(name = "设备类型", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+//	@Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
-    @ApiModelProperty(value = "设备类型")
+//    @ApiModelProperty(value = "设备类型")
-    private String typeid;
+//    private String typeid;
 	/**设备编号*/
 	@Excel(name = "设备编号", width = 15)
     @ApiModelProperty(value = "设备编号")
@@ -79,9 +79,9 @@ public class ZyDevice implements Serializable {
     @ApiModelProperty(value = "经办人")
     private String agent;
 	/**存放位置*/
-	@Excel(name = "存放位置", width = 15)
+//	@Excel(name = "存放位置", width = 15)
-    @ApiModelProperty(value = "存放位置")
+//    @ApiModelProperty(value = "存放位置")
-    private String adress;
+//    private String adress;
 	/**设备状态*/
 	@Excel(name = "设备状态", width = 15)
     @ApiModelProperty(value = "设备状态")
@@ -89,11 +89,11 @@ public class ZyDevice implements Serializable {
 	/**二维码*/
 	@Excel(name = "二维码", width = 15)
     @ApiModelProperty(value = "二维码")
-    private String erweima;
+    private String qrcode;
 	/**维护周期*/
 	@Excel(name = "维护周期", width = 15)
     @ApiModelProperty(value = "维护周期")
-    private String maintenancecycle;
+    private Integer maintenancecycle;
 	/**管理人*/
 	@Excel(name = "管理人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
 	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@@ -109,4 +109,17 @@ public class ZyDevice implements Serializable {
 	@Excel(name = "3d模型", width = 15)
     @ApiModelProperty(value = "3d模型")
     private String img3d;
+//    @Excel(name = "设备品牌", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "zy_devicebrand", dicText = "brand", dicCode = "id")
+    @ApiModelProperty(value = "设备品牌")
+    private String brandId;
+    @Dict(dictTable = "zy_devicemodel", dicText = "model", dicCode = "id")
+    @ApiModelProperty(value = "设备型号")
+    private String modelId;
+    @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "设备类型")
+    private String typeCode;
+
+    @ApiModelProperty(value = "设备名称")
+    private String name;
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/entity/ProductMachine.java

@@ -49,7 +49,7 @@ public class ProductMachine implements Serializable {
 	/**设备d*/
 	@Excel(name = "设备d", width = 15)
     @ApiModelProperty(value = "设备d")
-    @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "zy_device", dicText = "name", dicCode = "id")
     private String machineId;
 	/**序号*/
 	@Excel(name = "序号", width = 15)

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/pdmachine/mapper/ProductMachineMapper.java

@@ -18,7 +18,7 @@ import org.jeecg.modules.product.pdmachine.entity.ProductMachine;
  */
 public interface ProductMachineMapper extends BaseMapper<ProductMachine> {
 
-    @Select("select  id from zy_devicetype where name like #{s}")
+    @Select("select  id from zy_device where name like #{s}")
     List<String> find(String s);
 
     @Update("update product_machine set sort=sort+1 where id=#{id}")