From 8464f85667334f7c184cdb2b044a7d2a8426a519 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 28 Dec 2022 09:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/rest/UserController.java | 9 +++++++ .../basedata/service/dto/MaterialbaseDto.java | 2 ++ .../acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../nl/wms/pdm/rest/WorkorderController.java | 9 +++++++ .../nl/wms/pdm/service/WorkordeService.java | 6 +++++ .../service/impl/WorkorderServiceImpl.java | 22 +++++++++++++++++- .../sendMaterial/YqxSendMaterialTask.java | 6 ++--- .../src/main/java/org/nl/wms/wms.xls | Bin 258560 -> 258560 bytes lms/nladmin-ui/src/api/wms/pdm/workorder.js | 10 +++++++- .../src/views/wms/basedata/material/index.vue | 12 ++++++++-- .../src/views/wms/pdm/workerorder/index.vue | 9 +++---- .../src/views/wms/pub/MaterDialog.vue | 5 ++-- 12 files changed, 77 insertions(+), 15 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java index 672e2ef..b1503e9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java @@ -23,6 +23,7 @@ import cn.hutool.core.util.ObjectUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.config.RsaProperties; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.PageUtil; @@ -39,6 +40,7 @@ import org.nl.modules.system.service.UserService; import org.nl.modules.system.service.dto.RoleSmallDto; import org.nl.modules.system.service.dto.UserDto; import org.nl.modules.system.service.dto.UserQueryCriteria; +import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.data.redis.core.StringRedisTemplate; @@ -62,6 +64,7 @@ import java.util.stream.Collectors; * @date 2018-11-23 */ @Api(tags = "系统：用户管理") +@Slf4j @RestController @RequestMapping("/api/users") @RequiredArgsConstructor @@ -84,6 +87,12 @@ public class UserController { @GetMapping @SaCheckPermission("user:list") public ResponseEntity query(UserQueryCriteria criteria, Pageable pageable){ + try { + MDC.put("log_file_type", "init"); + log.debug("测试................."); + } finally { + MDC.remove("log_file_type"); + } if (!ObjectUtils.isEmpty(criteria.getDeptId())) { criteria.getDeptIds().add(criteria.getDeptId()); criteria.getDeptIds().addAll(deptService.getDeptChildren(deptService.findByPid(criteria.getDeptId()))); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java index b8b4ac8..4d918f6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java @@ -102,4 +102,6 @@ public class MaterialbaseDto implements Serializable { private Long product_series; private Integer standing_time; + + private Integer material_qty; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 290b4dd..f26b17c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -176,7 +176,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { //载具数量 String vehicle_num = whereJson.getString("vehicle_num"); //物料数量 - String material_num = whereJson.getString("material_num"); + String material_num = whereJson.getString("qty"); if (ObjectUtil.isEmpty(type)) throw new BadRequestException("类型不能为空"); if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("点位不能为空"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WorkorderController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WorkorderController.java index f8792a0..7ab9965 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WorkorderController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/WorkorderController.java @@ -74,6 +74,15 @@ public class WorkorderController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @PutMapping("/executes") + @Log("手持确认工单执行") + @ApiOperation("手持确认工单执行") + //@SaCheckPermission("produceshiftorder:edit") + public ResponseEntity executes(@RequestBody JSONObject param){ + workordeService.executes(param); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/getDevice") @Log("根据登录用户设备下拉") @ApiOperation("根据登录用户设备下拉") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkordeService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkordeService.java index 911b33c..b06926b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkordeService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/WorkordeService.java @@ -121,4 +121,10 @@ public interface WorkordeService { * @return */ JSONArray getDtl(JSONObject param); + + /** + * 工单执行 + * @param param + */ + void executes(JSONObject param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java index b15a65d..95edb70 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java @@ -189,7 +189,7 @@ public class WorkorderServiceImpl implements WorkordeService { JSONObject json = wo.query("workorder_id = '" + param.getString("workorder_id") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(json.getString("device_id"))) throw new BadRequestException("请先绑定设备"); - JSONArray orderArr = wo.query("device_id = '" + param.getString("device_id") + "' and order_status = '02'").getResultJSONArray(0); + JSONArray orderArr = wo.query("device_id = '" + param.getString("device_id") + "' and order_status = '3'").getResultJSONArray(0); if (ObjectUtil.isNotEmpty(orderArr)) throw new BadRequestException("当前设备正在生产中"); json.put("order_status", "2"); @@ -439,4 +439,24 @@ public class WorkorderServiceImpl implements WorkordeService { return resultJSONArray; } + @Override + public void executes(JSONObject param) { + Long currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + WQLObject wo = WQLObject.getWQLObject("PDM_BD_WorkOrder"); + JSONObject json = wo.query("workorder_id = '" + param.getString("workorder_id") + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(json.getString("device_id"))) throw new BadRequestException("请先绑定设备"); + + JSONArray orderArr = wo.query("device_id = '" + json.getString("device_id") + "' and order_status = '3'").getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(orderArr)) throw new BadRequestException("当前设备正在生产中"); + + json.put("order_status", "3"); + json.put("update_optid", currentUserId); + json.put("update_optname", nickName); + json.put("update_time", now); + wo.update(json); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java index edea920..c0af6f2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java @@ -100,6 +100,7 @@ public class YqxSendMaterialTask extends AbstractAcsTask { } @Override + @Transactional(rollbackFor = Exception.class) public void findNextPoint() { String task_status = TaskStatusEnum.SURE_START.getCode(); WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); @@ -141,8 +142,6 @@ public class YqxSendMaterialTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject whereJson) { String point_code1 = whereJson.getString("point_code1"); - String vehicle_type = whereJson.getString("vehicle_type"); - String vehicle_code = whereJson.getString("vehicle_code"); String qty = whereJson.getString("qty"); //生产工单表【PDM_BD_WorkOrder】 @@ -169,10 +168,9 @@ public class YqxSendMaterialTask extends AbstractAcsTask { .task_name("油漆线满料") .task_status(TaskStatusEnum.SURE_START.getCode()) .point_code1(point_code1) - .vehicle_code(vehicle_code) .material_info_id(workOrderObj.getLong("workorder_id")) .material_id(workOrderObj.getLong("material_id")) - .vehicle_type(vehicle_type) + .vehicle_type(workOrderObj.getString("vehicle_type")) .handle_class(THIS_CLASS) .material_qty(qty) .create_time(DateUtil.now()) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 0c2e02a00975f8f4d718804a9eebbddf3fda853a..9bd0cbb655d68ea3a2bdfa736a12789bdc615bc5 100644 GIT binary patch delta 22021 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 Vo25ZcH{xvTGHHa>a+|ft{u`+K$yxva delta 21811 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 T)`#uxd04?A=9-`R8mIpS4mr?V diff --git a/lms/nladmin-ui/src/api/wms/pdm/workorder.js b/lms/nladmin-ui/src/api/wms/pdm/workorder.js index 4d4f364..059d50b 100644 --- a/lms/nladmin-ui/src/api/wms/pdm/workorder.js +++ b/lms/nladmin-ui/src/api/wms/pdm/workorder.js @@ -32,6 +32,14 @@ export function submits(data) { }) } +export function executes(data) { + return request({ + url: 'api/workorder/executes', + method: 'put', + data + }) +} + export function getDevice(data) { return request({ url: 'api/workorder/getDevice', @@ -96,4 +104,4 @@ export function getDtl(data) { }) } -export default { add, edit, del, submits, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl } +export default { add, edit, del, submits, executes, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl } diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue index 3908729..4a2cdde 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -59,7 +59,7 @@ - + @@ -125,6 +125,13 @@ + + + + + + +
取消 @@ -140,9 +147,10 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 04c05d3..0794291 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -157,7 +157,7 @@ /> - + @@ -298,7 +298,7 @@