From 643d790311e37e2e706bfa189e7cb1793b24af69 Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Thu, 1 Sep 2022 17:37:55 +0800 Subject: [PATCH] no message --- .../org/nl/wms/common/PointUpdateUtil.java | 4 +- .../org/nl/wms/common/StructFindUtil.java | 8 ++-- .../org/nl/wms/common/wql/QSTRUCT_RULE.wql | 1 + .../wms/ext/acs/rest/AcsToWmsController.java | 6 +++ .../wms/ext/acs/service/AcsToWmsService.java | 5 +++ .../acs/service/impl/AcsToWmsServiceImpl.java | 12 +++++- .../org/nl/wms/ext/acs/wql/ACSTOMES_001.wql | 24 +++++++++++ .../wms/pdm/rest/ProducetaskController.java | 8 ++++ .../wms/pdm/service/ProducetaskService.java | 7 +++ .../service/impl/ProducetaskServiceImpl.java | 15 ++++++- .../nl/wms/sch/task/AutoSysProduceTask.java | 40 ++++++++++++++++++ .../src/main/java/org/nl/wms/wms.xls | Bin 399872 -> 400384 bytes wms/qd/src/api/wms/pdm/producetask.js | 11 ++++- .../src/views/wms/pdm/produceTask/index.vue | 19 +++++++++ 14 files changed, 147 insertions(+), 13 deletions(-) create mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSysProduceTask.java diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PointUpdateUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PointUpdateUtil.java index d137068..9ceb8ee 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PointUpdateUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PointUpdateUtil.java @@ -20,13 +20,12 @@ public class PointUpdateUtil { } JSONObject joo = wmsToAcsServiceImpl.queryPointStatus(arr); JSONArray pointarr = joo.getJSONArray("data"); - - //JSONArray pointarr =new JSONArray(); WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); for (int i = 0; i < pointarr.size(); i++) { JSONObject pointjo = pointarr.getJSONObject(i); //String point_status = "00"; + String mode = pointjo.getString("mode"); String point_status = "0" + pointjo.getString("move"); //String vehicle_code = pointjo.getString("vehicle_code"); String vehicle_code = pointjo.getString("barcode"); @@ -41,6 +40,7 @@ public class PointUpdateUtil { pointObj.put("vehicle_code", vehicle_code); pointObj.put("point_status", point_status); pointObj.put("vehicle_type", pallet_type); + pointObj.put("mode", mode); pointTable.update(pointObj); } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index 48b790d..232e33d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -40,7 +40,7 @@ public class StructFindUtil { String area_type = jsonObject.getString("area_type"); String is_full = jsonObject.getString("is_full"); String workprocedure_id = jsonObject.getString("workprocedure_id"); - String group_device= jsonObject.getString("group_device"); + String group_device = jsonObject.getString("group_device"); if (StrUtil.isEmpty(material_id)) { throw new BadRequestException("物料不能为空！"); @@ -60,7 +60,7 @@ public class StructFindUtil { } JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "3") .addParam("material_id", material_id).addParam("area_type", area_type) - .addParam("group_device",group_device) + .addParam("group_device", group_device) .addParam("is_full", is_full).addParam("workprocedure_id", workprocedure_id) .process().uniqueResult(0); return result; @@ -130,9 +130,7 @@ public class StructFindUtil { int task_num = WQL.getWO("QSTRUCT_RULE").addParam("flag", "7").process().uniqueResult(0).getIntValue("count"); if (count > task_num) { result = pointTable.query("device_id = '" + deviceObj.getString("device_id") + "' and device_point_type='01'").uniqueResult(0); - - } else { - continue; + break; } } return result; diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql index 14adf21..1561cec 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql @@ -211,6 +211,7 @@ IF 输入.flag = "6" LEFT JOIN pdm_base_device device ON device.device_id = rule.cacheline_id WHERE point.area_type = '07' + AND point.mode<>'0' AND ( point.vehicle_code = '' OR point.vehicle_code IS NULL ) OPTION 输入.material_id <> "" rule.material_id = 输入.material_id diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 347426d..76442f2 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -124,4 +124,10 @@ public class AcsToWmsController { public ResponseEntity queryCribbingInfo(@RequestBody Map whereJson) { return new ResponseEntity<>(acsToWmsService.queryCribbingInfo(whereJson), HttpStatus.OK); } + @PostMapping("/queryPrintInfoByCode") + @Log("获取打印信息") + @ApiOperation("获取木托盘垛形信息") + public ResponseEntity queryPrintInfoByCode(@RequestBody Map whereJson) { + return new ResponseEntity<>(acsToWmsService.queryPrintInfoByCode(whereJson), HttpStatus.OK); + } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index e87cf07..ba96804 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -116,5 +116,10 @@ public interface AcsToWmsService { * @return Map */ Map queryCribbingInfo(Map jsonObject); + /** + * 获取条码信息 + * @return Map + */ + Map queryPrintInfoByCode(Map jsonObject); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 82ae078..26f880c 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -198,7 +198,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { jsonObject.put("material_id", material_id); jsonObject.put("is_full", "0"); jsonObject.put("workprocedure_id", WorkProcedureEnum.BZGX.getId()); - jsonObject.put("group_device",jsonObject1.getString("group_device_id")); + jsonObject.put("group_device", jsonObject1.getString("group_device_id")); callMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject)); break; } @@ -277,7 +277,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String producetask_id = WQLObject.getWQLObject("pdm_mg_producetask").query("producetask_code='" + producetask_code + "'").uniqueResult(0).getString("producetask_id"); JSONObject groubObj = new JSONObject(); String group_id = IdUtil.getSnowflake(1, 1).nextId() + ""; - groubObj.put("device_id",produceInfoByCode.getString("device_id")); + groubObj.put("device_id", produceInfoByCode.getString("device_id")); groubObj.put("group_id", group_id); groubObj.put("material_id", material_id); groubObj.put("material_code", materialObj.getString("material_code")); @@ -778,6 +778,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } + @Override + public Map queryPrintInfoByCode(Map jsonObject) { + //找出最近的一个到包装位的任务 + JSONObject taskObj = WQLObject.getWQLObject("sch_base_task").query("next_point_code='BZSLW' and is_delete='0' and task_type='07'", "update_time desc").uniqueResult(0); + JSONObject result = WQL.getWO("ACSTOMES_001").addParam("flag", "9").addParam("task_id", taskObj.getString("task_id")).process().uniqueResult(0); + return result; + } + public static JSONObject getProduceInfoByCode(String code) { //根据 设备点位去找生产任务信息 //1 根据点位去找设备，去找对应的设备信息 diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql index aac94f9..8de73b7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql @@ -197,4 +197,28 @@ IF 输入.flag = "8" point_code IN ( 'FJJXSXLW301', 'FJJXSXLW302' ) ENDSELECT ENDQUERY +ENDIF + + +IF 输入.flag = "9" + QUERY + SELECT DISTINCT + producetask.print_type, + producetask.print_dm, + producetask.print_name, + producetask.print_gg, + producetask.print_pc, + producetask.yh_name + FROM + sch_base_task task + LEFT JOIN st_buss_vehicleRelaRecord recordmst ON recordmst.vehicle_code = task.vehicle_code + LEFT JOIN st_buss_vehicleRelaRecordtl recorddtl ON recorddtl.record_id = recordmst.record_id + LEFT JOIN pdm_mg_producetask producetask ON producetask.producetask_id = recorddtl.producetask_id + where + 1=1 + OPTION 输入.task_id <> "" + task.task_id = 输入.task_id + ENDOPTION + ENDSELECT + ENDQUERY ENDIF \ No newline at end of file diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProducetaskController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProducetaskController.java index 6968691..14758ff 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProducetaskController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProducetaskController.java @@ -166,5 +166,13 @@ public class ProducetaskController { producetaskService.issued(param); return new ResponseEntity<>(HttpStatus.OK); } + @PutMapping("/synchro") + @Log("同步") + @ApiOperation("同步") + //@PreAuthorize("@el.check('producetask:list')") + public ResponseEntity synchro(@RequestBody JSONObject param){ + producetaskService.synchro(param); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProducetaskService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProducetaskService.java index 7eaeaad..f8aa984 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProducetaskService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProducetaskService.java @@ -142,4 +142,11 @@ public interface ProducetaskService { * @param param */ void issued(JSONObject param); + /** + * 下发 + * @param param + */ + void synchro(JSONObject param); + + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java index 9cff741..98aacfd 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java @@ -14,6 +14,7 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SpringContextHolder; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl; import org.nl.wms.pdm.service.ProducetaskService; import org.nl.wms.pdm.service.dto.ProducetaskDto; import org.nl.wms.sch.AcsUtil; @@ -24,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Pageable; import java.io.InputStream; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.regex.Matcher; @@ -275,8 +277,8 @@ public class ProducetaskServiceImpl implements ProducetaskService { String now = DateUtil.now(); String producetask_id = param.getString("producetask_id"); WQLObject wo = WQLObject.getWQLObject("pdm_mg_producetask"); - JSONObject taskObj= WQL.getWO("PDM_ProduceTask_01").addParam("flag", "3").addParam("producetask_id", producetask_id).process().uniqueResult(0); - taskObj.put("product_code","wms"); + JSONObject taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "3").addParam("producetask_id", producetask_id).process().uniqueResult(0); + taskObj.put("product_code", "wms"); WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class); JSONArray arr = new JSONArray(); arr.add(taskObj); @@ -290,6 +292,15 @@ public class ProducetaskServiceImpl implements ProducetaskService { wo.update(map, "producetask_id = '" + producetask_id + "'"); } + @Override + public void synchro(JSONObject param) { + WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); + JSONObject jo = new JSONObject(); + jo.put("startdate", DateUtil.today()); + jo.put("enddate", DateUtil.today()); + wmsToJnService.synchroDaySchedule(jo); + } + @Override public JSONArray getProduceline() { WQLObject wo = WQLObject.getWQLObject("pdm_base_produceline"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSysProduceTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSysProduceTask.java new file mode 100644 index 0000000..84be5bc --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSysProduceTask.java @@ -0,0 +1,40 @@ +package org.nl.wms.sch.task; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl; +import org.nl.wql.core.bean.WQLObject; +import org.springframework.stereotype.Component; + + +/** + * @author geng by + * 自动回传失败的日志 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class AutoSysProduceTask { + private final WmsToJnServiceImpl wmsToJnServiceImpl; + + public void run() throws Exception { + + try { + JSONObject jo = new JSONObject(); + jo.put("startdate", DateUtil.today()); + jo.put("enddate", DateUtil.today()); + wmsToJnServiceImpl.synchroDaySchedule(jo); + } catch (Exception e) { + e.printStackTrace(); + } + + + } + + +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index fe959cd2a29f0effcb8e700d724bc414ce6d2e41..686efcbc5a4a0b78b1057fbc4fe6bc4d1b06d6f6 100644 GIT binary patch delta 9613 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 diff --git a/wms/qd/src/api/wms/pdm/producetask.js b/wms/qd/src/api/wms/pdm/producetask.js index fd3121b..7a8fb55 100644 --- a/wms/qd/src/api/wms/pdm/producetask.js +++ b/wms/qd/src/api/wms/pdm/producetask.js @@ -101,10 +101,17 @@ export function mandFinish(data) { export function issued(data) { return request({ - url: 'api/producetask/issued', + url: 'api/producetask/npm', + method: 'put', + data + }) +} +export function synchro(data) { + return request({ + url: 'api/producetask/synchro', method: 'put', data }) } -export default { add, edit, del, getMaterial, getDevice, getProduceline, getCust, getWorkprocedure, excelImport, getDevice1, copyAdd, sortUpdate, mandFinish, issued } +export default { add, edit, del, getMaterial, getDevice, getProduceline, getCust, getWorkprocedure, excelImport, getDevice1, copyAdd, sortUpdate, mandFinish, issued, synchro } diff --git a/wms/qd/src/views/wms/pdm/produceTask/index.vue b/wms/qd/src/views/wms/pdm/produceTask/index.vue index 614802a..18cc2ec 100644 --- a/wms/qd/src/views/wms/pdm/produceTask/index.vue +++ b/wms/qd/src/views/wms/pdm/produceTask/index.vue @@ -124,6 +124,16 @@ > 排序 + + 同步 + @@ -465,6 +475,15 @@ export default { this.mind_finish = true }) }, + is_sys() { + crudProducetask.synchro({ producetask_id:'' }).then(res => { + this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + this.issue = true + this.copy_add = true + this.mind_finish = true + }) + }, buttonChange(current) { if (current !== null) { this.currentRow = current