From c5894d0d10124caf113faedf3cd1a116135efdd7 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Fri, 13 Jan 2023 18:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86=201.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productplan/ZyPlanProcessDataList.vue     | 33 +++++++--------
 .../src/views/team/modules/GroupxModal.vue    | 18 +++++++--
 .../src/views/team/modules/StationModal.vue   | 35 ++++++++++++----
 .../team/service/impl/StationServiceImpl.java | 40 +++++++++++++++++--
 4 files changed, 94 insertions(+), 32 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue
index 56c45bc0..4b7441d4 100644
--- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue
@@ -27,12 +27,6 @@
         <template v-slot:toolbarSuffix>
           <a-button type="primary" icon="download" @click="handleExportXls('计划工序')">导出</a-button>
           <a-button type="primary" icon="rollback" @click="fanHui()">返回</a-button>
-          <!--          <a-tooltip placement="top" title="获取值，忽略表单验证" :autoAdjustOverflow="true">-->
-          <!--            <a-button @click="handleTableGet">获取值</a-button>-->
-          <!--          </a-tooltip>-->
-          <!--          <a-tooltip placement="top" title="模拟加载1000条数据" :autoAdjustOverflow="true">-->
-          <!--            <a-button @click="handleTableSet">设置值</a-button>-->
-          <!--          </a-tooltip>-->
         </template>
       </j-vxe-table>
     </div>
@@ -95,16 +89,27 @@ export default {
           options: [],
           placeholder: '请选择${title}',
         },
+        {
+          title: 'stationIds',
+          key: 'stationIds',
+          type: JVXETypes.hidden,
+        },
         {
           title: '设备列表',
-          key: 'machineIds',
+          key: 'machineNames',
           type: JVXETypes.selectMultiple,
           width: '200px',
           options: [],
           placeholder: '请选择${title}',
-        }, {
-          title: '工具列表',
+        },
+        {
+          title: 'toodsIds',
           key: 'toolsIds',
+          type: JVXETypes.hidden,
+        },
+        {
+          title: '工具列表',
+          key: 'toolsIdNames',
           type: JVXETypes.selectMultiple,
           width: '200px',
           options: [],
@@ -150,7 +155,7 @@ export default {
       dictOptions: {},
       superFieldList: [],
       stationId: [],
-      stationIdList: [],
+      stationList: [],
       toolsList: [],
       machineList: [],
       clickTrue: true,
@@ -169,11 +174,7 @@ export default {
         if (!errMap) {
           // 获取所有数据
           let tableData = target.getTableData()
-          // tableData.forEach(item => {
-          //   item.id = '';
-          // })
           console.log('当前保存的数据是：', tableData)
-
           // 【模拟保存】
           this.loading = true
           postAction(this.url.addProcessBatch, tableData).then(res => {
@@ -222,7 +223,7 @@ export default {
         if (res.success) {
           this.dataSource = res.result.records || res.result;
           // this.stationId = this.dataSource[0].stationId;
-          this.stationIdList = this.dataSource[0].stationIdList;
+          this.stationList = this.dataSource[0].stationList;
         } else {
           // this.stationIdCode = "station,station_name,id,depart_id in (select workshop_id from zy_product_plan where id='" + this.planId + "')";
           this.$message.warning(res.message)
@@ -253,7 +254,7 @@ export default {
       const {type, row, column, value, target, $table} = event
       console.log(JSON.stringify(this.stationIdList));
       // target.$refs.vxe.columns[6].dictCode = this.stationIdCode;
-      target.$refs.vxe.columns[6].options = this.stationIdList;
+      target.$refs.vxe.columns[6].options = this.stationList;
     },
     /** 当选项被改变时，联动其他组件 */
     handleValueChange(event) {
diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
index e0a7a31a..a18ee2b0 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
@@ -11,13 +11,22 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
-
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="部门">
           <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
           <!--          <j-select-depart placeholder="请选择部门" v-model="model.departId"/>-->
-          <j-dict-select-tag type="list" v-model="model.departId" dictCode="sys_depart,depart_name,id,org_category='2'"
-                             @change="getEnterprisesManagerValChange()"
-                             placeholder="请选择部门"/>
+          <!--          <j-dict-select-tag type="list" v-model="model.departId" dictCode="sys_depart,depart_name,id,org_category='2'"-->
+          <!--                             @change="getEnterprisesManagerValChange()"-->
+          <!--                             placeholder="请选择部门"/>-->
+
+          <j-tree-select v-model="model.departId"
+                         dict="sys_depart,depart_name,id"
+                         pidField="parent_id"
+                         placeholder="请选择车间"
+                         condition='{"org_category":"2"}'
+                         hasChildField="1"
+                         @change="getEnterprisesManagerValChange()"
+          >
+          </j-tree-select>
 
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupName" label="班组名称">
@@ -117,6 +126,7 @@ export default {
   methods: {
 
     getEnterprisesManagerValChange() {
+      console.log("the departId=", this.model.departId)
       this.enterprisesManager = "sys_user,realname,id,id in (select user_id from sys_user_depart where dep_id='" + this.model.departId + "')";
       // this.enterprisesManager = "zy_process,process_name,id,id in(select process_id from zy_product_process where product_id='1')";
     },
diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
index e9c3379e..0ab73814 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
@@ -12,14 +12,19 @@
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-<!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId"-->
-<!--                           label="车间ID">-->
-<!--          <a-input placeholder="请输入车间ID" v-model="model.departId"/>-->
-<!--        </a-form-model-item>-->
+
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="车间名称">
-          <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
-<!--          <j-select-depart placeholder="请选择车间" v-model="model.departId"/>-->
-          <j-dict-select-tag type="list"  v-model="model.departId" dictCode="sys_depart,depart_name,id,org_category='2'" placeholder="请选择车间" />
+<!--          <j-dict-select-tag type="list"  v-model="model.departId" dictCode="sys_depart,depart_name,id,org_category='2'" placeholder="请选择车间" />-->
+
+          <j-tree-select v-model="model.departId"
+                         dict="sys_depart,depart_name,id"
+                         pidField="parent_id"
+                         placeholder="请选择车间"
+                         condition='{"org_category":"2"}'
+                         hasChildField="1"
+          >
+          </j-tree-select>
+
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationName" label="工位名称">
           <a-input placeholder="请输入工位名称" v-model="model.stationName"/>
@@ -37,7 +42,7 @@
 </template>
 
 <script>
-import {httpAction} from '@/api/manage'
+import {getAction, httpAction} from '@/api/manage'
 import moment from "moment"
 
 export default {
@@ -79,6 +84,20 @@ export default {
   created() {
   },
   methods: {
+
+    async bianhao() {
+      //var n=6
+      getAction(this.url.sort, {id: this.model.clothsTypeId}).then((res) => {
+        //let num = res.result;
+        console.log("+6++++aaa: " + res.result)
+        //num=num.toString()
+        //while(num.length<n){
+        //num="0"+num
+        //}
+        //console.log(num)
+        this.model.nums = res.result;
+      })
+    },
     add() {
       //初始化默认值
       this.edit({});
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
index 39103f1a..878e87ac 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
@@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import java.util.List;
+
 /**
  * @Description: 车间工位管理
  * @Author: jeecg-boot
@@ -45,10 +47,28 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         if (ObjectUtils.isEmpty(entity)) {
             throw new JeecgBootException(id + "不存在");
         }
-        Station station = new Station();
-        station.setId(id);
-        station.setStationNum(entity.getStationNum() + 1);
-        this.updateById(station);
+        List<Station> list = this.list(new LambdaQueryWrapper<Station>().orderByDesc(Station::getStationNum));
+        Integer maxStationNum = list.get(0).getStationNum();
+        //最后一条不能下移
+        if (maxStationNum.intValue() != entity.getStationNum()) {
+            //先把下一编号减1
+            Station station1 = this.getOne(new LambdaQueryWrapper<Station>().eq(Station::getStationNum, entity.getStationNum() + 1));
+//            station1.setStationNum(null);
+            this.lambdaUpdate().set(Station::getStationNum, 333).eq(Station::getId, station1.getId()).update();
+
+//            Station station = new Station();
+//            station.setId(id);
+//            station.setStationNum(null);
+            this.lambdaUpdate().set(Station::getStationNum, 666).eq(Station::getId, id).update();
+
+//            station.setStationNum(entity.getStationNum() + 1);
+//            this.updateById(station);
+            this.lambdaUpdate().set(Station::getStationNum, entity.getStationNum() + 1).eq(Station::getId, id).update();
+            this.lambdaUpdate().set(Station::getStationNum, entity.getStationNum() - 1).eq(Station::getId, station1.getId()).update();
+
+//            station1.setStationNum(entity.getStationNum() - 1);
+//            this.updateById(station1);
+        }
     }
 
     @Override
@@ -57,11 +77,23 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         if (ObjectUtils.isEmpty(entity)) {
             throw new JeecgBootException(id + "不存在");
         }
+        //第一条不能上移
         if (entity.getStationNum() > 1) {
+            //先把上一编号加1
+            Station station1 = this.getOne(new LambdaQueryWrapper<Station>().eq(Station::getStationNum, entity.getStationNum() - 1));
+            station1.setStationNum(null);
+            this.updateById(station1);
+
             Station station = new Station();
             station.setId(id);
+            station.setStationNum(null);
+            this.updateById(station);
+
+
             station.setStationNum(entity.getStationNum() - 1);
             this.updateById(station);
+            station1.setStationNum(entity.getStationNum() + 1);
+            this.updateById(station1);
         }
     }
 }