From a9de3496506007335e38a0ca855b60b90ccb8630 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Fri, 24 Mar 2023 14:45:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mps/rest/ProduceWorkorderController.java  |  22 ++++-
 .../mps/rest/ProduceshiftorderController.java |  81 +-----------------
 .../mps/service/ProduceWorkorderService.java  |   7 ++
 .../mps/service/ProduceshiftorderService.java |   5 --
 .../impl/ProduceWorkorderServiceImpl.java     |  24 +++++-
 .../impl/ProduceshiftorderServiceImpl.java    |  15 +---
 .../src/main/java/org/nl/wms/pdm/wql/pdm.xls  | Bin 236032 -> 236032 bytes
 mes/qd/src/views/wms/mps/produce/index.vue    |  30 +++----
 8 files changed, 64 insertions(+), 120 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceWorkorderController.java
index 95a768d8..a74fd217 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceWorkorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceWorkorderController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.mps.rest;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -34,7 +36,6 @@ public class ProduceWorkorderController {
     @GetMapping
     @Log("查询工单管理")
     @ApiOperation("查询工单管理")
-    //@PreAuthorize("@el.check('produceWorkorder:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(produceWorkorderService.queryAll(whereJson, page), HttpStatus.OK);
     }
@@ -47,6 +48,14 @@ public class ProduceWorkorderController {
         produceWorkorderService.create(dto);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
+    @PostMapping("/submits")
+    @Log("新增工单管理")
+    @ApiOperation("新增工单管理")
+    //@PreAuthorize("@el.check('produceWorkorder:add')")
+    public ResponseEntity<Object> submit(@Validated @RequestBody ProduceWorkorderDto dto) {
+        produceWorkorderService.create(dto);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
 
     @PutMapping
     @Log("修改工单管理")
@@ -57,9 +66,16 @@ public class ProduceWorkorderController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
+    @PutMapping("/submits")
+    @Log("工单下发")
+    @ApiOperation("工单下发")
+    public ResponseEntity<Object> submits(@RequestBody List<String> param) {
+        produceWorkorderService.submits(param);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
     @Log("删除工单管理")
     @ApiOperation("删除工单管理")
-    //@PreAuthorize("@el.check('produceWorkorder:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
         produceWorkorderService.deleteAll(ids);
@@ -77,7 +93,6 @@ public class ProduceWorkorderController {
     @PostMapping("/getDtl")
     @Log("获取当前工单下的工单生产记录")
     @ApiOperation("获取当前工单下的工单生产记录")
-    //@PreAuthorize("@el.check('produceshiftorder:list')")
     public ResponseEntity<Object> getDtl(@RequestBody JSONObject param) {
         return new ResponseEntity<>(produceWorkorderService.getDtl(param), HttpStatus.OK);
     }
@@ -85,7 +100,6 @@ public class ProduceWorkorderController {
     @PostMapping("/forceFinish")
     @Log("工单强制完成")
     @ApiOperation("工单强制完成")
-    //@PreAuthorize("@el.check('produceshiftorder:list')")
     public ResponseEntity<Object> forceFinish(@RequestBody JSONObject param) {
         produceWorkorderService.forceFinish(param);
         return new ResponseEntity<>(HttpStatus.OK);
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceshiftorderController.java
index 05e99a20..281bada6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceshiftorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/ProduceshiftorderController.java
@@ -28,67 +28,13 @@ import java.util.Map;
  **/
 @RestController
 @RequiredArgsConstructor
-@Api(tags = "工单管理")
+@Api(tags = "一体机工单管理")
 @RequestMapping("/api/produceshiftorder")
 @Slf4j
 public class ProduceshiftorderController {
 
     private final ProduceshiftorderService produceshiftorderService;
 
-    @GetMapping
-    @Log("查询工单")
-    @ApiOperation("查询工单")
-    //@PreAuthorize("@el.check('produceshiftorder:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
-        return new ResponseEntity<>(produceshiftorderService.queryAll(whereJson, page), HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增工单")
-    @ApiOperation("新增工单")
-    //@PreAuthorize("@el.check('produceshiftorder:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody ProduceshiftorderDto dto) {
-        produceshiftorderService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PostMapping("/addRows")
-    @Log("批量新增工单")
-    @ApiOperation("批量新增工单")
-    //@PreAuthorize("@el.check('produceshiftorder:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody List<ProduceshiftorderDto> rows) {
-        for (ProduceshiftorderDto dto : rows) {
-            produceshiftorderService.create(dto);
-        }
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改工单")
-    @ApiOperation("修改工单")
-    //@PreAuthorize("@el.check('produceshiftorder:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody ProduceshiftorderDto dto) {
-        produceshiftorderService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除工单")
-    @ApiOperation("删除工单")
-    //@PreAuthorize("@el.check('produceshiftorder:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        produceshiftorderService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PutMapping("/submits")
-    @Log("工单下发")
-    @ApiOperation("工单下发")
-    //@PreAuthorize("@el.check('produceshiftorder:edit')")
-    public ResponseEntity<Object> submits(@RequestBody JSONObject param) {
-        produceshiftorderService.submits(param);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
 
     @PostMapping("/getDevice")
     @Log("根据登录用户设备下拉")
@@ -141,31 +87,6 @@ public class ProduceshiftorderController {
         return new ResponseEntity<>(produceshiftorderService.getReportWork(param), HttpStatus.OK);
     }
 
-    @PostMapping("/forceFinish")
-    @Log("工单强制完成")
-    @ApiOperation("工单强制完成")
-    //@PreAuthorize("@el.check('produceshiftorder:list')")
-    public ResponseEntity<Object> forceFinish(@RequestBody JSONObject param) {
-        produceshiftorderService.forceFinish(param);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/getDtl")
-    @Log("获取当前工单下的工单生产记录")
-    @ApiOperation("获取当前工单下的工单生产记录")
-    //@PreAuthorize("@el.check('produceshiftorder:list')")
-    public ResponseEntity<Object> getDtl(@RequestBody JSONObject param) {
-        return new ResponseEntity<>(produceshiftorderService.getDtl(param), HttpStatus.OK);
-    }
-
-    @PostMapping("/excelImport")
-    @Log("excel导入")
-    @ApiOperation("excel导入")
-    public ResponseEntity<Object> excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
-        produceshiftorderService.excelImport(file, request);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
     @PostMapping("/getNotWorkDeviceByWorkproceduceId")
     @Log("根据工序查询没有工单的设备")
     @ApiOperation("根据工序查询没有工单的设备")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceWorkorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceWorkorderService.java
index afd5c0af..cb38029b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceWorkorderService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceWorkorderService.java
@@ -80,6 +80,13 @@ public interface ProduceWorkorderService {
      */
     JSONArray getDtl(JSONObject param);
 
+    /**
+     * 工单下发
+     * @param param
+     * @return
+     */
+    void submits(List<String> param);
+
     /**
      * 强制完成
      * @param param
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceshiftorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceshiftorderService.java
index d5ae4e5a..5ccecca3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceshiftorderService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/ProduceshiftorderService.java
@@ -66,11 +66,6 @@ public interface ProduceshiftorderService {
     */
     void deleteAll(Long[] ids);
 
-    /**
-     * 工单下发
-     * @param param
-     */
-    void submits(JSONObject param);
 
     /**
      * 根据当前登录用户下拉
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
index 199662f4..fa0ea02d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
@@ -41,6 +42,8 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author lyd
@@ -187,8 +190,8 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
             JSONObject param = new JSONObject();
             param.put("workorder_id", String.valueOf(workorder_id));
             param.put("is_delete", "1");
-            param.put("update_optid", currentUserId);
-            param.put("update_optname", nickName);
+            param.put("update_id", currentUserId);
+            param.put("update_name", nickName);
             param.put("update_time", DateUtil.now());
             wo.update(param);
         }
@@ -212,6 +215,21 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
         return resultJSONArray;
     }
 
+    @Override
+    public void submits(List<String> param) {
+        if (param == null || param.size()==0){
+            return;
+        }
+        String sql = param.stream().collect(Collectors.joining("','"));
+        String currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getCurrentNickName();
+        WQLObject wo = WQLObject.getWQLObject("PDM_produce_workOrder");
+        wo.update(MapOf.of("workorder_status", WorkerOrderEnum.SEND.getCode()
+                ,"update_id", currentUserId,"update_name"
+                , nickName,"update_time", DateUtil.now())
+                ,"workorder_id in ('"+sql+"')");
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void forceFinish(JSONObject param) {
@@ -237,7 +255,7 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
         produceorderMap.put("update_name", nickName);
         produceorderMap.put("update_time", DateUtil.now());
         produceorderMap.put("realproduceend_date", DateUtil.now());
-        wo.update(produceorderMap);
+        wo.update(produceorderMap,"workorder_id = '"+workorder_id+"'");
         JSONObject jsonObject = wo.query("workorder_id = '" + workorder_id + "'").uniqueResult(0);
         String real_qty = jsonObject.getString("real_qty");
         if (StrUtil.isEmpty(real_qty)) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java
index 2939f040..a66c3f82 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java
@@ -59,6 +59,8 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService {
     @Autowired
     ISysUserService userService;
 
+
+
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
         String produceorder_code = MapUtil.getStr(whereJson, "produceorder_code");
@@ -204,19 +206,6 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService {
         }
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void submits(JSONObject param) {
-        String currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getCurrentNickName();
-
-        WQLObject wo = WQLObject.getWQLObject("mps_bd_produceshiftorder");
-        param.put("order_status", "01");
-        param.put("update_optid", currentUserId);
-        param.put("update_optname", nickName);
-        param.put("update_time", DateUtil.now());
-        wo.update(param);
-    }
 
     @Override
     public JSONArray getDevice(JSONObject param) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
index 82a40428faba1e433d734256f0cf810a0a39e317..1c8279628d06ea3adcf7f6276f04b96bc2186e63 100644
GIT binary patch
delta 3173
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

delta 3195
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
PEof>wrY|ltza0BNAv-j7

diff --git a/mes/qd/src/views/wms/mps/produce/index.vue b/mes/qd/src/views/wms/mps/produce/index.vue
index b5ae2911..c2eac439 100644
--- a/mes/qd/src/views/wms/mps/produce/index.vue
+++ b/mes/qd/src/views/wms/mps/produce/index.vue
@@ -369,7 +369,7 @@
         <el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
         <el-table-column prop="workprocedure_name" label="工序名称" width="120" show-overflow-tooltip />
-        <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4"/>
+        <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
         <el-table-column prop="planproducestart_date" label="计划开始时间" width="100" show-overflow-tooltip />
         <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
         <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
@@ -390,7 +390,7 @@
             {{ dict.label.IS_OR_NOT[scope.row.is_needmove] }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_type" label="创建类型" show-overflow-tooltip >
+        <el-table-column prop="create_type" label="创建类型" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
           </template>
@@ -703,13 +703,13 @@ export default {
       if (length > 1) {
         var flag = false
         for (let i = 0; i < rows.length; i++) {
-          if (rows[i].order_status !== '00' || rows[i].device_id === '') {
+          if (rows[i].workorder_status === '5') {
             flag = true
             break
           }
         }
         return flag
-      } else if (length === 1 && rows[0].order_status === '00' && rows[0].device_id !== '') {
+      } else if (length === 1 && rows[0].workorder_status !== '5') {
         return false
       } else {
         return true
@@ -722,13 +722,13 @@ export default {
       if (length > 1) {
         var flag = false
         for (let i = 0; i < rows.length; i++) {
-          if (rows[i].order_status === '04') {
+          if (rows[i].workorder_status === '5') {
             flag = true
             break
           }
         }
         return flag
-      } else if (length === 1 && rows[0].order_status !== '04') {
+      } else if (length === 1 && rows[0].workorder_status !== '5') {
         return false
       } else {
         return true
@@ -749,16 +749,16 @@ export default {
     },
     // 下发
     submits(rows) {
-      var i = Number(0)
+      var orders = []
+      console.log(rows)
       rows.forEach((item) => {
-        var produceorder_id = item.produceorder_id
-        crudProduceshiftorder.submits({ produceorder_id: produceorder_id }).then(res => {
-          i = i + 1
-          if (i === rows.length) {
-            this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-            this.crud.toQuery()
-          }
-        })
+        debugger
+        orders.push(item.workprocedure_id)
+      })
+      debugger
+      crudProduceshiftorder.submits(orders).then(res => {
+        this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
       })
     },
     add() {