From a392a391dd838dc30a54d3b088e5cfbf41c3c6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Mon, 16 Jan 2023 17:47:38 +0800
Subject: [PATCH] 2023-01-16-02

---
 .../src/views/system/Depart3List.vue          |  93 +++++++++-----
 .../src/views/system/modules/DepartModal.vue  |  57 +++++++--
 .../ZyProductionOrderList.vue                 |  17 +--
 .../zyWorkorderManagement/ZyWorkOrderList.vue |  38 ++++--
 .../workdep/JSelectProductionDep.vue          |   5 +-
 .../controller/SysDepartController.java       |  18 +++
 .../controller/WorkOrderController.java       |   8 +-
 .../modules/workorder/entity/WorkOrderVo.java | 115 ++++++++++++++++++
 .../workorder/mapper/WorkOrderMapper.java     |   5 +
 .../workorder/mapper/xml/WorkOrderMapper.xml  |  34 ++++++
 .../workorder/service/IWorkOrderService.java  |   5 +
 .../service/impl/WorkOrderServiceImpl.java    |  13 ++
 .../modules/workproduct/entity/ZyProduct.java |   2 +-
 13 files changed, 343 insertions(+), 67 deletions(-)
 create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrderVo.java

diff --git a/ant-design-vue-jeecg/src/views/system/Depart3List.vue b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
index 4cd0e77f..5848e24d 100644
--- a/ant-design-vue-jeecg/src/views/system/Depart3List.vue
+++ b/ant-design-vue-jeecg/src/views/system/Depart3List.vue
@@ -75,37 +75,46 @@
         <a-tab-pane tab="基本信息" key="1" >
           <a-card :bordered="false" v-if="selectedKeys.length>0">
             <a-form :form="form">
+              <template v-if="!orgTypeDisabled">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
+                  <a-tree-select
+                    style="width:100%"
+                    :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+                    :treeData="treeData"
+                    :disabled="disable"
+                    v-model="model.parentId"
+                    placeholder="无">
+                  </a-tree-select>
+                </a-form-item>
+              </template>
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 label="部门名称">
                 <a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
               </a-form-item>
-              <template v-if="!orgCategory">
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
-                <a-tree-select
-                  style="width:100%"
-                  :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-                  :treeData="treeData"
-                  :disabled="disable"
-                  v-model="model.parentId"
-                  placeholder="无">
-                </a-tree-select>
+
+              <a-form-item
+                :labelCol="labelCol"
+                :wrapperCol="wrapperCol"
+                label="英文名称">
+                <a-input placeholder="请输入英文名称" v-decorator="['departNameEn', {'initialValue':''}]"/>
               </a-form-item>
-              </template>
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                label="部门编码">
-                <a-input disabled placeholder="请输入部门编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
+                label="缩写">
+                <a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
               </a-form-item>
-              <template v-if="orgCategory">
+
+
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                label="排序">
-                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
+                label="部门编码">
+                <a-input disabled placeholder="请输入部门编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
               </a-form-item>
+              <template v-if="orgTypeDisabled">
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
@@ -165,18 +174,13 @@
               </template>
 
 
-              <!--<a-form-item-->
-                <!--:labelCol="labelCol"-->
-                <!--:wrapperCol="wrapperCol"-->
-                <!--label="备注">-->
-                <!--<a-textarea placeholder="请输入备注" v-decorator="['memo', {'initialValue':''}]"/>-->
-              <!--</a-form-item>-->
               <a-form-item
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
-                label="排序">
-                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
+                label="备注">
+                <a-textarea placeholder="请输入备注" v-decorator="['memo', {'initialValue':''}]"/>
               </a-form-item>
+
             </a-form>
             <div class="anty-form-btn">
               <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">重置</a-button>
@@ -202,7 +206,7 @@
   import DepartModal from './modules/DepartModal'
   import pick from 'lodash.pick'
   import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
-  import {httpAction, deleteAction} from '@/api/manage'
+  import {httpAction, deleteAction,getAction} from '@/api/manage'
   import {JeecgListMixin} from '@/mixins/JeecgListMixin'
   import DepartAuthModal from './modules/DepartAuthModal'
   // 表头
@@ -211,6 +215,15 @@
       title: '部门名称',
       dataIndex: 'departName'
     },
+    {
+      title: '英文名称',
+      dataIndex: 'departNameEn'
+    },
+    {
+      title: '缩写',
+      dataIndex: 'departNameAbbr'
+    },
+
     {
       title: '',
       align: 'center',
@@ -295,7 +308,8 @@
           departName: {rules: [{required: true, message: '请输入部门/部门名称!'}]},
           orgCode: {rules: [{required: true, message: '请输入部门编码!'}]},
           orgCategory: {rules: [{required: true, message: '请输入部门类型!'}]},
-          mobile: {rules: [{validator: this.validateMobile}]}
+          mobile: {rules: [{validator: this.validateMobile}]},
+          departNameAbbr: {rules: [{required: true,validator: this.validatedepartNameAbbr}]}
         },
         url: {
           delete: '/sys/sysDepart/delete',
@@ -303,6 +317,7 @@
           deleteBatch: '/sys/sysDepart/deleteBatch',
           exportXlsUrl: "sys/sysDepart/exportXls",
           importExcelUrl: "sys/sysDepart/importExcel",
+          validatedepartNameAbbrUrl: "sys/sysDepart/validatedepartNameAbbr",
         },
         orgCategoryDisabled:false,
         orgTypeDisabled:false,
@@ -389,9 +404,6 @@
             ids += this.checkedKeys[a] + ','
           }
           var that = this
-
-
-
           this.$confirm( '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据，以及子节点数据吗?','确认删除',
             {
               confirmButtonText: '确定',
@@ -654,9 +666,30 @@
             this.getAllKeys(node.children[a])
           }
         }
-      }
+      },
       // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
 
+      //校验缩写
+      validatedepartNameAbbr(rule, value, callback){
+        let reg = /^[_a-zA-Z0-9]+$/
+        let reg2 = /^.{4,4}$/
+        // 长度为6到18个字符
+        if (value !== '' && !reg.test(value)) {
+          callback('只允许字母、数字、下划线')
+        } else if (value !== '' && !reg2.test(value)) {
+          callback('长度为4个字符')
+        } else {
+
+          getAction(this.url.validatedepartNameAbbrUrl,{'name':value}).then((res) => {
+            if (res.success) {
+              callback()
+            }else{
+             // this.$message.error(res.message);
+              callback('缩写已存在,请重新输入')
+            }
+          })
+        }
+      },
     },
     created() {
       this.currFlowId = this.$route.params.id
diff --git a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
index 5b1fec14..79f4f0ff 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
@@ -30,6 +30,20 @@
             :disabled="condition">
           </a-tree-select>
         </a-form-item>
+
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="英文名称">
+          <a-input placeholder="请输入英文名称" v-decorator="['departNameEn', {'initialValue':''}]"/>
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="缩写">
+          <a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
+        </a-form-item>
+
         <template v-if="seen">
           <a-form-item
             :labelCol="labelCol"
@@ -85,12 +99,12 @@
             <a-input placeholder="请输入地址" v-decorator="['address', {}]"/>
           </a-form-item>
         </template>
-        <!--<a-form-item-->
-          <!--:labelCol="labelCol"-->
-          <!--:wrapperCol="wrapperCol"-->
-          <!--label="备注">-->
-          <!--<a-textarea placeholder="请输入备注" v-decorator="['memo', {}]"/>-->
-        <!--</a-form-item>-->
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="备注">
+          <a-textarea placeholder="请输入备注" v-decorator="['memo', {}]"/>
+        </a-form-item>
 
       </a-form>
     </a-spin>
@@ -98,7 +112,7 @@
 </template>
 
 <script>
-  import {httpAction} from '@/api/manage'
+  import {httpAction,getAction} from '@/api/manage'
   import {queryIdTree} from '@/api/api'
   import pick from 'lodash.pick'
   import ATextarea from 'ant-design-vue/es/input/TextArea'
@@ -134,10 +148,12 @@
         validatorRules: {
           departName: {rules: [{required: true, message: '请输入部门/部门名称!'}]},
           orgCode: {rules: [{required: true, message: '请输入部门编码!'}]},
-          mobile: {rules: [{validator: this.validateMobile}]}
+          mobile: {rules: [{validator: this.validateMobile}]},
+          departNameAbbr: {rules: [{required: true,validator: this.validatedepartNameAbbr}]}
         },
         url: {
           add: "/sys/sysDepart/add",
+          validatedepartNameAbbrUrl: "sys/sysDepart/validatedepartNameAbbr",
         },
         dictDisabled: true,
       }
@@ -222,8 +238,31 @@
         } else {
           callback("您的手机号码格式不正确!");
         }
+      },
+      //校验缩写
+      validatedepartNameAbbr(rule, value, callback){
+        let reg = /^[_a-zA-Z0-9]+$/
+        let reg2 = /^.{4,4}$/
+        // 长度为6到18个字符
+        if (value !== '' && !reg.test(value)) {
+          callback('只允许字母、数字、下划线')
+        } else if (value !== '' && !reg2.test(value)) {
+          callback('长度为4个字符')
+        } else {
+          //
 
-      }
+          console.log("validatedepartNameAbbrUrl");
+          console.log(value);
+          getAction(this.url.validatedepartNameAbbrUrl,{'name':value}).then((res) => {
+            if (res.success) {
+              callback()
+            }else{
+              // this.$message.error(res.message);
+              callback('缩写已存在,请重新输入')
+            }
+          })
+        }
+      },
     }
   }
 </script>
diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue
index c33f1c8a..d88bc2aa 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyProductionOrderList.vue
@@ -210,11 +210,6 @@
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
           },
-          {
-            title:'订单编号',
-            align:"center",
-            dataIndex: 'ordersNum'
-          },
           // {
           //   title:'总金额(元)',
           //   align:"center",
@@ -245,11 +240,11 @@
             align:"center",
             dataIndex: 'ordersType_dictText'
           },
-          // {
-          //   title:'顾客',
-          //   align:"center",
-          //   dataIndex: 'userId_dictText'
-          // },
+          {
+            title:'客户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
           // {
           //   title:'商品条目数量',
           //   align:"center",
@@ -398,7 +393,7 @@
     },
     methods: {
       paidan(record){
-        this.$refs.productionForm.showModal(record.id)
+        this.$refs.productionForm.showModal(record.id,record.ordersNum+"订单派单管理")
 
         // getAction(this.url.paidan,{id:record.id}).then((res) => {
         //   if (res.success) {
diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
index f46163cc..25894e69 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/ZyWorkOrderList.vue
@@ -6,17 +6,17 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="工单编号">
-              <a-input placeholder="请输入工单编号" v-model="queryParam.workCode"></a-input>
+              <a-input placeholder="请输入工单编号" v-model="queryParam.productCode"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="订单编号">
-              <a-input placeholder="请输入订单编号" v-model="queryParam.orderCode"></a-input>
+              <a-input placeholder="请输入订单编号" v-model="queryParam.ordersNum"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="客户名称">
-              <a-input placeholder="请输入客户名称" v-model="queryParam.customerName"></a-input>
+              <a-input placeholder="请输入客户名称" v-model="queryParam.realname"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -91,8 +91,8 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <!--<a  @click="handleEdit(record)">编辑</a>-->
-          <!--<a-divider type="vertical" />-->
+          <a  @click="handleProductDetail(record)">产品管理</a>
+          <a-divider type="vertical" />
 
           <a @click="handleDetail(record)">详情</a>
 
@@ -102,6 +102,7 @@
     </div>
 
     <work-order-modal ref="modalForm" @ok="modalFormOk"></work-order-modal>
+    <zy-product-modal ref="productForm" @ok="modalFormOk"></zy-product-modal>
   </a-card>
 </template>
 
@@ -111,12 +112,14 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import WorkOrderModal from '@/views/workorder/modules/WorkOrderModal'
+  import ZyProductModal from '@/views/zyWorkProduct/modules/ZyProductModal'
 
   export default {
     name: 'ZyWorkOrderList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      WorkOrderModal
+      WorkOrderModal,
+      ZyProductModal
     },
     data () {
       return {
@@ -133,20 +136,25 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'订单编号',
+            align:"center",
+            dataIndex: 'ordersNum'
+          },
           {
             title:'工单编号',
             align:"center",
             dataIndex: 'productCode'
           },
           {
-            title:'订单',
+            title:'客户名称',
             align:"center",
-            dataIndex: 'ordersId'
+            dataIndex: 'realname'
           },
           {
-            title:'订单商品',
+            title:'商品名称',
             align:"center",
-            dataIndex: 'orderGoodsId'
+            dataIndex: 'goodsName'
           },
           {
             title:'商品数量',
@@ -158,6 +166,7 @@
             align:"center",
             dataIndex: 'orderTime'
           },
+
           {
             title:'交货期',
             align:"center",
@@ -166,7 +175,7 @@
           {
             title:'工单状态',
             align:"center",
-            dataIndex: 'workOrderStatus_dictText'
+            dataIndex: 'workOrderStatusText'
           },
           {
             title:'企业',
@@ -202,7 +211,12 @@
     },
     methods: {
       initDictConfig(){
-      }
+      },
+      handleProductDetail(record){
+        this.$refs.productForm.edit(record);
+        this.$refs.productForm.title="产品管理";
+        this.$refs.productForm.disableSubmit = true;
+      },
     }
   }
 </script>
diff --git a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/workdep/JSelectProductionDep.vue b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/workdep/JSelectProductionDep.vue
index 9ac09076..ea16f9bb 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkorderManagement/workdep/JSelectProductionDep.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkorderManagement/workdep/JSelectProductionDep.vue
@@ -10,6 +10,7 @@
     cancelText="关闭"
   >
     <a-card :bordered="false">
+      <p style="font-size: 30px;color:#333; padding-left: 28% ">{{ biaoTi }}</p>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -149,6 +150,7 @@
         selectedRowKeys: [],
         selectdepRows: [],
         selectdepIds: [],
+        biaoTi:"",
       }
     },
     created() {
@@ -162,10 +164,11 @@
     methods: {
       initDictConfig(){
       },
-      showModal(orderId) {
+      showModal(orderId,biaoTi) {
         this.selectedRowKeys=[]
         this.orderId=orderId
         this.visible = true;
+        this.biaoTi=biaoTi
         this.loadData();
       },
       close () {
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
index 12a02acc..74a464ed 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -527,4 +527,22 @@ public class SysDepartController {
 		result.setResult(sysUsers);
 		return result;
 	}
+
+	/**
+	 * 根据部门id获取用户信息
+	 *
+	 * @return
+	 */
+	@GetMapping("/validatedepartNameAbbr")
+	public Result<?> getValidatedepartNameAbbr(@RequestParam(name = "name") String name) {
+ 		QueryWrapper<SysDepart> depWrapper=new QueryWrapper<SysDepart>();
+		depWrapper.eq("depart_name_abbr",name);
+		List<SysDepart> list = sysDepartService.list(depWrapper);
+		if(list.size()>0)
+		{
+			return Result.error("缩写已存在！");
+		}
+		return Result.OK("成功！");
+	}
+
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java
index 96d08761..08f6507a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/controller/WorkOrderController.java
@@ -26,6 +26,7 @@ import org.jeecg.modules.demo.zyorders.service.IZyOrdersService;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.workorder.entity.WorkOrder;
+import org.jeecg.modules.workorder.entity.WorkOrderVo;
 import org.jeecg.modules.workorder.service.IWorkOrderService;
 import org.jeecg.modules.workproduct.entity.ZyProduct;
 import org.jeecg.modules.workproduct.service.IZyProductService;
@@ -254,13 +255,13 @@ public class WorkOrderController extends JeecgController<WorkOrder, IWorkOrderSe
 	 @AutoLog(value = "工单管理-分页列表查询")
 	 @ApiOperation(value="工单管理-分页列表查询", notes="工单管理工-分页列表查询")
 	 @GetMapping(value = "/workList")
-	 public Result<?> queryPageWorkList(WorkOrder workOrder,
+	 public Result<?> queryPageWorkList(WorkOrderVo workOrder,
 									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									HttpServletRequest req) {
-		 QueryWrapper<WorkOrder> queryWrapper = QueryGenerator.initQueryWrapper(workOrder, req.getParameterMap());
+		 //QueryWrapper<WorkOrder> queryWrapper = QueryGenerator.initQueryWrapper(workOrder, req.getParameterMap());
 		 Page<WorkOrder> page = new Page<WorkOrder>(pageNo, pageSize);
-		 IPage<WorkOrder> pageList = workOrderService.page(page, queryWrapper);
+		 IPage<WorkOrder> pageList = workOrderService.selectPage(page, workOrder);
 		 return Result.OK(pageList);
 	 }
 
@@ -363,6 +364,7 @@ public class WorkOrderController extends JeecgController<WorkOrder, IWorkOrderSe
 						for(int i=0;i<goodNum;i++)
 						{
 							ZyProduct productModel=new  ZyProduct();
+							productModel.setProductName(ogModel.getGoodsName());
 							productModel.setProductCode(CreateProductCode(workOrder.getProductCode()));//	产品编号
 							productModel.setWorkOrderId(workOrder.getId());//_	工单id
 //							productModel.setProduceTime("");//	生产时间
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrderVo.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrderVo.java
new file mode 100644
index 00000000..8179e3b3
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/entity/WorkOrderVo.java
@@ -0,0 +1,115 @@
+package org.jeecg.modules.workorder.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 工单订单完工
+ * @Author: jeecg-boot
+ * @Date:   2023-01-07
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="work_order对象", description="工单订单完工")
+public class WorkOrderVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**工单编号*/
+	@Excel(name = "工单编号", width = 15)
+    @ApiModelProperty(value = "工单编号")
+    private String productCode;
+//	/**订单*/
+//	@Excel(name = "订单", width = 15)
+//    @ApiModelProperty(value = "订单")
+//    private String ordersId;
+    /**原订单id*/
+    @Excel(name = "订单", width = 15)
+    @Dict(dictTable = "zy_orders", dicText = "orders_num", dicCode = "id")
+    @ApiModelProperty(value = "订单")
+    private String ordersId;
+
+	/**订单商品*/
+	@Excel(name = "订单商品", width = 15)
+    @ApiModelProperty(value = "订单商品")
+    private String orderGoodsId;
+
+    @ApiModelProperty(value = "订单商品名称")
+    private String goodsName;
+
+
+	/**商品数量*/
+	@Excel(name = "商品数量", width = 15)
+    @ApiModelProperty(value = "商品数量")
+    private Integer goodsNum;
+	/**下单时间*/
+	@Excel(name = "下单时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "下单时间")
+    private Date orderTime;
+	/**交货期*/
+	@Excel(name = "交货期", width = 15)
+    @ApiModelProperty(value = "交货期")
+    private Integer deliveryTime;
+	/**工单状态*/
+	@Excel(name = "工单状态", width = 15, dicCode = "work_order_status")
+	@Dict(dicCode = "work_order_status")
+    @ApiModelProperty(value = "工单状态")
+    private Integer workOrderStatus;
+
+    @ApiModelProperty(value = "工单状态")
+    private String workOrderStatusText;
+
+	/**企业*/
+	@Excel(name = "企业", width = 15)
+    @ApiModelProperty(value = "企业")
+    private String enterprisesId;
+
+	@ApiModelProperty(value = "客户姓名")
+    private String realname;
+
+    @ApiModelProperty(value = "企业")
+    private String departName;
+
+    @ApiModelProperty(value = "订单编号")
+    private java.lang.String ordersNum;
+
+}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/mapper/WorkOrderMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/mapper/WorkOrderMapper.java
index 7c25340f..ce3cb00c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/mapper/WorkOrderMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/mapper/WorkOrderMapper.java
@@ -2,9 +2,12 @@ package org.jeecg.modules.workorder.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.workorder.entity.WorkOrder;
+import org.jeecg.modules.workorder.entity.WorkOrderVo;
 
 /**
  * @Description: 工单订单完工
@@ -14,4 +17,6 @@ import org.jeecg.modules.workorder.entity.WorkOrder;
  */
 public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
 
+    //自定义分页查询
+    IPage<WorkOrder> selectListPage(Page<WorkOrder> page,@Param("model") WorkOrderVo model);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/mapper/xml/WorkOrderMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/mapper/xml/WorkOrderMapper.xml
index 9daa0a17..f3b65aad 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/mapper/xml/WorkOrderMapper.xml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/mapper/xml/WorkOrderMapper.xml
@@ -2,4 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.workorder.mapper.WorkOrderMapper">
 
+
+    <select id="selectListPage" resultType="org.jeecg.modules.workorder.entity.WorkOrderVo">
+        SELECT wo.*,og.goods_name AS goodsName  ,us.realname,dict.item_text AS workOrderStatusText ,dep.`depart_name` AS  departName ,o.orders_num AS  ordersNum
+        FROM  work_order AS wo
+        LEFT JOIN  zy_orders  o ON o.id= wo.orders_id
+        LEFT JOIN  order_goods  og ON og.id= wo.order_goods_id
+        LEFT JOIN  sys_user  us ON us.username= o.user_id
+        LEFT JOIN  sys_dict_item  dict ON dict.dict_id='1611565939851538433'
+        LEFT JOIN  sys_depart  dep ON dep.id=wo.enterprises_id
+        <where>
+            dict.item_value=wo.work_order_status
+            <if test="model != null">
+
+                <!--工单编号 -->
+                <if test="model.productCode!=null and  model.productCode!=''">
+                    and  wo.product_code =#{model.productCode}
+                </if >
+
+                <!--订单编号 -->
+                <if test="model.ordersNum!=null and  model.ordersNum!=''">
+                    and  o.orders_num =#{model.ordersNum}
+                </if >
+
+                <!--客户名称 -->
+                <if test="model.realname!=null and  model.realname!=''">
+                    and us.realname LIKE  CONCAT("%",#{model.realname},"%")
+                </if >
+
+
+            </if>
+        </where>
+        order by wo.create_time desc
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/IWorkOrderService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/IWorkOrderService.java
index 7575c90a..122bd861 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/IWorkOrderService.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/IWorkOrderService.java
@@ -1,8 +1,11 @@
 package org.jeecg.modules.workorder.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.workorder.entity.WorkOrder;
+import org.jeecg.modules.workorder.entity.WorkOrderVo;
 
 /**
  * @Description: 工单订单完工
@@ -12,4 +15,6 @@ import org.jeecg.modules.workorder.entity.WorkOrder;
  */
 public interface IWorkOrderService extends IService<WorkOrder> {
 
+    //自定义分页查询
+    IPage<WorkOrder> selectPage(Page<WorkOrder> page, WorkOrderVo workOrder);
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
index 41a61124..fed4c568 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workorder/service/impl/WorkOrderServiceImpl.java
@@ -1,7 +1,10 @@
 package org.jeecg.modules.workorder.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.workorder.entity.WorkOrder;
+import org.jeecg.modules.workorder.entity.WorkOrderVo;
 import org.jeecg.modules.workorder.mapper.WorkOrderMapper;
 import org.jeecg.modules.workorder.service.IWorkOrderService;
 import org.springframework.stereotype.Service;
@@ -17,4 +20,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements IWorkOrderService {
 
+    /**
+     * 自定义分页查询
+     * @param page
+     * @param workOrder
+     * @return
+     */
+    @Override
+    public IPage<WorkOrder> selectPage(Page<WorkOrder> page, WorkOrderVo workOrder) {
+        return baseMapper.selectListPage(page,workOrder);
+    }
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java
index 20d408fa..e826ec6b 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/workproduct/entity/ZyProduct.java
@@ -59,7 +59,7 @@ public class ZyProduct implements Serializable {
     @ApiModelProperty(value = "产品编号")
     private String productCode;
 
-    @Excel(name = "产品编号", width = 50)
+    @Excel(name = "产品名称", width = 50)
     @ApiModelProperty(value = "产品名称")
     private String productName;
 	/**工单*/