Merge remote-tracking branch 'origin/zhc4dev'

ant-design-vue-jeecg/src/views/hanger/HangerManage.vue

@@ -1,32 +1,6 @@
 <template>
   <a-card :bordered="false">
     <p style="font-size: 30px;color:#333; padding-left: 30% ">{{ this.workshopName + this.code }}吊挂管理</p>
-    <!--    <template>-->
-    <!--      <div>-->
-    <!--        <el-descriptions border :column='4'>-->
-    <!--          <el-descriptions-item label="工单编号 ">{{ planInfo.productCode }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="生产企业">{{ planInfo.productOrg }}</el-descriptions-item>-->
-    <!--          &lt;!&ndash;          <el-descriptions-item label="企业负责人 ">admin</el-descriptions-item>&ndash;&gt;-->
-    <!--          <el-descriptions-item label="车间 ">{{ planInfo.workshop }}</el-descriptions-item>-->
-    <!--          &lt;!&ndash;          <el-descriptions-item label="车间负责人 ">admin</el-descriptions-item>&ndash;&gt;-->
-    <!--          <el-descriptions-item label="班组">{{ planInfo.team }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="班组长">{{ planInfo.teamLade }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="产品类型">{{ planInfo.productType }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="产品编号">{{ planInfo.productNo }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="产品名称">{{ planInfo.productName }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="开始时间">{{ planInfo.workTime }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="生产时长">{{ planInfo.duration }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="生产状态">{{ planInfo.status }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="加急">{{ planInfo.speedUp }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="销售企业">{{ planInfo.salesEnterprise }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="订货期">{{ planInfo.orderTime }}</el-descriptions-item>-->
-    <!--          &lt;!&ndash;          <el-descriptions-item label="制定人">100</el-descriptions-item>&ndash;&gt;-->
-    <!--          &lt;!&ndash;          <el-descriptions-item label="制定时间">100</el-descriptions-item>&ndash;&gt;-->
-    <!--          <el-descriptions-item label="审核人">{{ planInfo.auditBy }}</el-descriptions-item>-->
-    <!--          <el-descriptions-item label="审核时间">{{ planInfo.auditTimr }}</el-descriptions-item>-->
-    <!--        </el-descriptions>-->
-    <!--      </div>-->
-    <!--    </template>-->
 
     <!-- table区域-begin -->
     <div>
@@ -46,22 +20,8 @@
       >
         <template v-slot:toolbarSuffix>
           <a-button type="primary" icon="plus-circle" @click="syncHangRecord()">同步吊挂运行记录</a-button>
-          <!--          <a-button type="primary" icon="plus-circle" @click="autoFilling()">自动排位</a-button>-->
-          <!--          <a-button type="primary" icon="plus-circle" @click="createMaterialBill()">生成物料单-->
-          <!--          </a-button>-->
-          <!--          <a-button type="primary" icon="unordered-list" @click="viewMaterialBill">查看物料单-->
-          <!--          </a-button>-->
-          <!--          <a-button type="primary" icon="redo" @click="sendToRepository()">发送到仓库-->
-          <!--          </a-button>-->
           <a-button type="primary" icon="rollback" @click="fanHui()">返回</a-button>
         </template>
-        <!--        <template v-slot:action="props">-->
-        <!--          <a @click="jump2MianLiao(props)">面料</a>-->
-        <!--          <a-divider type="vertical"/>-->
-        <!--          <a @click="jump2FuLiao(props)">辅料</a>-->
-        <!--          <a-divider type="vertical"/>-->
-        <!--          <a @click="viewDetail(props)">详情</a>-->
-        <!--        </template>-->
       </j-vxe-table>
     </div>
   </a-card>
@@ -93,18 +53,23 @@ export default {
         {
           title: '车间',
           key: 'workshopName',
-          width: '180px',
+          width: '220px',
         },
         {
           title: '吊挂编号',
           key: 'code',
-          width: '180px',
+          width: '220px',
+        },
+        {
+          title: '工站数量',
+          key: 'pointnumber',
+          width: '220px',
         },
         {
           title: '工站编号',
           key: 'point',
           type: JVXETypes.input,
-          width: '180px',
+          width: '220px',
           /*validateRules: [
             {
               required: true, // 必填
@@ -164,6 +129,7 @@ export default {
       ],
       url: {
         list: "/org.jeecg.modules.hanger/zyHang/getPointById",
+        getStationList: "/jeecg-boot/org.jeecg.modules.hanger/zyHang/getStationList",
         syncHangRecord: "/org.jeecg.modules.productplan/zyPlanProcess/syncHangRecord",
         addBatch: "/org.jeecg.modules.hanger/zyHangPoint/addBatch",
       },
@@ -171,15 +137,30 @@ export default {
       id: "",
       workshopName: "",
       code: "",
-      dictOptions: {},
+      pointnumber: "",
       stationIdList: [],
       clickTrue: true,
     }
   },
   created() {
     this.loadParameter();
+    // this.getStationList();
   },
   methods: {
+
+    async getStationList() {
+      const {data: res} = await this.$axios.get(this.url.getStationList, {params: {id: this.id}})
+      if (res.success) {
+        // this.dataSource = res.result.records || res.result;
+        this.stationIdList = JSON.stringify(res.result);
+        console.log("the getStationList=" + this.stationIdList)
+        console.log("this.columns[6].options------------:" + this.columns[6].options);
+        this.columns[6].options = this.stationIdList;
+      } else {
+        this.$message.warning(res.message)
+      }
+    },
+
     // 【整体保存】点击保存按钮时触发的事件
     handleTableSave({$table, target}) {
       console.log("生产计划工序保存开始-----------------")
@@ -217,7 +198,6 @@ export default {
       getAction(this.url.syncHangRecord, {"code": this.code}).then((res) => {
         if (res.success) {
           this.$message.success("操作成功");
-          // this.loadData();
         } else {
           this.$message.warning(res.message)
         }
@@ -233,13 +213,13 @@ export default {
         this.id = this.$route.query.id;
         this.workshopName = this.$route.query.workshopName;
         this.code = this.$route.query.code;
+        this.pointnumber = this.$route.query.pointnumber;
         console.log("*******传递的id:" + this.id)
         this.loadRouteType = true;
       }
     },
     loadData(arg) {
       console.log("the loadData---------开始");
-      // var that = this;
       if (!this.url.list) {
         this.$message.error("请设置url.list属性!")
         return
@@ -253,15 +233,13 @@ export default {
         if (res.success) {
           this.dataSource = res.result.records || res.result;
           this.stationIdList = this.dataSource[0].stationIdList;
-
-          // alert(this.stationIdList)
         } else {
           this.$message.warning(res.message)
         }
       }).finally(() => {
         this.dataSource.forEach(item => {
           item['workshopName'] = this.workshopName;
-          // item['stationNum'] = this.stationNum;
+          item['pointnumber'] = this.pointnumber;
         })
         this.loading = false
       })

ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue

@@ -267,6 +267,7 @@ export default {
           'id': record.id,
           'code': record.code,
           'workshopName': record.workshopId_dictText,
+          'pointnumber': record.pointnumber,
         },
       });
     },

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangController.java

@@ -4,11 +4,9 @@ package org.jeecg.modules.hanger.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
@@ -36,7 +34,6 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.util.*;
 
 /**
@@ -113,6 +110,27 @@ public class ZyHangController extends JeecgController<ZyHang, IZyHangService> {
         return Result.OK(pageList);
     }
 
+    @ApiOperation(value = "吊挂表-通过吊挂查询工站列表", notes = "吊挂表-通过吊挂查询工站列表")
+    @GetMapping(value = "/getStationList")
+    public Result<?> getStationList(ZyHang zyHang) {
+        ZyHang entity = zyHangService.getById(zyHang.getId());
+        Optional.ofNullable(entity).orElseThrow(() -> new JeecgBootException(zyHang.getId() + ":吊挂不存在"));
+        List<Station> stationList = iStationService.list(new LambdaQueryWrapper<Station>().eq(Station::getDepartId, entity.getWorkshopId()));
+        List<StationVo> stationVoList = new LinkedList<>();
+        if (!ObjectUtils.isEmpty(stationList)) {
+            stationList.forEach(en -> {
+                StationVo stationVo = new StationVo();
+                stationVo.setId(en.getId());
+                stationVo.setValue(en.getId());
+                stationVo.setText(en.getStationName());
+                stationVo.setTitle(en.getStationName());
+                stationVoList.add(stationVo);
+            });
+        }
+        return Result.OK(stationVoList);
+    }
+
+
     @ApiOperation(value = "吊挂表-通过吊挂查询工站列表", notes = "吊挂表-通过吊挂查询工站列表")
     @GetMapping(value = "/getPointById")
     public Result<?> getPointById(ZyHang zyHang) {

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java

@@ -68,7 +68,8 @@ public class ZyHangPointController extends JeecgController<ZyHangPoint, IZyHangP
     @ApiOperation(value = "吊挂工位表-同步生产记录表数据到吊挂运行记录表", notes = "吊挂工位表-同步生产记录表数据到吊挂运行记录表")
     @GetMapping(value = "/syncHangRecord")
     public Result<?> syncHangRecord(ZyHangPoint zyHangPoint) {
-        return Result.OK(zyHangPointService.syncHangRecord(zyHangPoint));
+        zyHangPointService.syncHangRecord(zyHangPoint);
+        return Result.OK();
     }