From 69843f8c8ef73591c76be2a4e978f5d67307417e Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 20 May 2025 17:25:30 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=88=A0=E9=99=A4=E4=B8=80=E6=9C=9F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/acs/rest/AcsToWmsController.java | 9 -- .../wms/ext/acs/service/AcsToWmsService.java | 5 - .../acs/service/impl/AcsToWmsServiceImpl.java | 98 ------------------- .../impl/ProductInstorServiceImpl.java | 27 ----- .../java/org/nl/wms/sch/AutoQueryEnum.java | 1 - .../wms/sch/manage/AutoQueryProudDayData.java | 18 +--- .../nl/wms/sch/manage/AutoQueryUpload.java | 98 ------------------- 7 files changed, 3 insertions(+), 253 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 43e95de..98c9391 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -106,15 +106,6 @@ public class AcsToWmsController { return new ResponseEntity<>(acsToWmsService.getQZZInfo(jo), HttpStatus.OK); }*/ - @PostMapping("/initialize") - @Log(value = "仓位初始化", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) - - @SaIgnore - public ResponseEntity initialize(@RequestBody JSONObject json) { - acsToWmsService.initialize(json); - return new ResponseEntity<>(HttpStatus.OK); - } - @PostMapping("/initPoint") @Log(value = "点位初始化", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 257096e..c690493 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -87,11 +87,6 @@ public interface AcsToWmsService { // JSONObject getQZZInfo(JSONObject whereJson); - /** - * 仓位初始化 - */ - void initialize(JSONObject json); - /** * 点位初始化 */ 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 e889ebc..99466c1 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 @@ -1171,104 +1171,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return result; } - @Override - public void initialize(JSONObject param) { - int j_size = param.getInteger("j"); // 排 - int k_size = param.getInteger("k"); // 列 - String block = param.getString("layer"); // 块 - JSONObject max_jo = WQLObject.getWQLObject("ST_IVT_StructAttr").query("sect_code = 'ZC01' order by out_order_seq desc ").uniqueResult(0); - int max_no = 0; - if (ObjectUtil.isNotEmpty(max_jo)) { - max_no = max_jo.getIntValue("out_order_seq"); - } - max_no++; - for (int i = 1; i < 4; i++) { - for (int j = 1; j < j_size; j++) { - for (int k = 1; k < k_size; k++) { - //排 - String row = ""; - if (j < 10) { - row = "0" + j; - } else { - row = j + ""; - } - - //列 - String line = ""; - if (k < 10) { - line = "0" + k; - } else { - line = k + ""; - } - - //块 - String piece = i + block; - - //层 - String layer = "0" + i; - - - JSONObject jo = new JSONObject(); - jo.put("struct_id", IdUtil.getSnowflake(1, 1).nextId()); - jo.put("struct_code", piece + row + "-" + line + "-" + layer); - jo.put("struct_name", piece + "区" + row + "排" + line + "列" + layer + "层"); - jo.put("simple_name", piece + "区" + row + "排" + line + "列" + layer + "层"); - jo.put("sect_id", "1582991348217286656"); - jo.put("sect_code", "ZC01"); - jo.put("sect_name", "主存区"); - jo.put("stor_id", "1582991156504039424"); - jo.put("stor_code", "CP01"); - jo.put("stor_name", "兰州仓库"); - jo.put("stor_type", "03"); - jo.put("is_tempstruct", "0"); - jo.put("row_num", row); - jo.put("col_num", line); - jo.put("layer_num", layer); - jo.put("block_num", piece); - jo.put("in_order_seq", 0); - jo.put("out_order_seq", max_no); - jo.put("in_empty_seq", 0); - jo.put("out_empty_seq", 0); - jo.put("placement_type", "01"); - jo.put("create_id", "1"); - jo.put("create_name", "管理员"); - jo.put("create_time", DateUtil.now()); - jo.put("update_optid", "1"); - jo.put("update_optname", "管理员"); - jo.put("update_time", DateUtil.now()); - jo.put("is_delete", "0"); - jo.put("is_used", "1"); - jo.put("lock_type", "1"); - jo.put("material_height_type", "1"); - WQLObject.getWQLObject("ST_IVT_StructAttr").insert(jo); - max_no++; - //插入点位 - JSONObject structMap = new JSONObject(); - structMap.put("point_id", IdUtil.getSnowflake(1, 1).nextId()); - structMap.put("point_code", jo.getString("struct_code")); - structMap.put("point_name", jo.getString("struct_name")); - structMap.put("region_id", "1582991348217286656"); - structMap.put("region_code", jo.getString("sect_code")); - structMap.put("region_name", jo.getString("sect_name")); - structMap.put("point_type", "2"); - structMap.put("point_status", "1"); - structMap.put("lock_type", jo.getString("lock_type")); - structMap.put("block_num", jo.getIntValue("block_num")); - structMap.put("row_num", jo.getIntValue("row_num")); - structMap.put("col_num", jo.getIntValue("col_num")); - structMap.put("layer_num", jo.getIntValue("layer_num")); - structMap.put("source_id", jo.getString("struct_id")); - structMap.put("create_id", "1"); - structMap.put("create_name", "管理员"); - structMap.put("create_time", DateUtil.now()); - structMap.put("update_optid", "1"); - structMap.put("update_optname", "管理员"); - structMap.put("update_time", DateUtil.now()); - WQLObject.getWQLObject("sch_base_point").insert(structMap); - } - } - } - } @Override public void initPoint() { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java index 5e0fcfe..e55d30a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java @@ -364,33 +364,6 @@ public class ProductInstorServiceImpl implements ProductInstorService { form.put("task_type", "010507"); cutConveyorTask.createTask(form); } else { - /* - * 如果有实际重量则需要判断重量是否超标 - */ - /* // 重量阈值系统参数 - double weight_sys = Double.parseDouble(SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("weight_sys").getValue()); - // 木箱系统重量 - double box_weight = sub_jo.getDoubleValue("box_weight"); - // 木箱实称重重量 - double real_weight = sub_jo.getDoubleValue("real_weight"); - - if (ObjectUtil.isNotEmpty(sub_jo.getString("real_weight")) && "AC01".equals(sub_jo.getString("ext_code"))) { - // 判断木箱毛重是否超标 - if (NumberUtil.sub(box_weight, weight_sys) <= real_weight && NumberUtil.add(box_weight, weight_sys) >= real_weight) { - } else { - //判断is_pass是否为空，如果为空则通知飞书，不为空判断：为0则不允许通过，为1则允许 - if (ObjectUtil.isEmpty(sub_jo.getString("is_pass")) || sub_jo.getString("is_pass").equals(IOSEnum.IS_NOTANDYES.code("否")) ) { - // 通知飞书 - notifyMes(sub_jo); - throw new BadRequestException("重量不合格!系统重量浮动超过" + weight_sys + "KG,当前木箱称重重量:" + real_weight + ",已通知飞书处理！"); - } else { - if (sub_jo.getString("is_pass").equals(IOSEnum.IS_NOTANDYES.code("否"))) { - throw new BadRequestException("请等待放行!"); - } - } - - } - }*/ JSONArray now_dis_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("flag", "18").addParam("box_no", map.get("box_no")).process().getResultJSONArray(0); if (now_dis_rows.size() > 0) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AutoQueryEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AutoQueryEnum.java index f9c71f5..c95d0c8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AutoQueryEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AutoQueryEnum.java @@ -4,7 +4,6 @@ package org.nl.wms.sch; * 仓库枚举 */ public enum AutoQueryEnum { - AC01("01", "兰州一期仓库", "1582991156504039424"), BC01("02", "兰州二期仓库", "1582991156504039455"), WK01("03", "东莞仓库", "1597073830499717120"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java index 40ae374..b082e4d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java @@ -710,11 +710,7 @@ public class AutoQueryProudDayData { JSONObject result = new JSONObject(); // 兰州一期仓(除BC) - List collect = dataList.stream() - .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) - .filter(row -> !custBandC.contains(row.getString("customer_name"))) - .collect(Collectors.toList()); - result.put("Customerqty1", NumberUtil.round(collect.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); + //result.put("Customerqty1", NumberUtil.round(collect.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); // 兰州二期仓(除BC) List collect2 = dataList.stream() @@ -730,18 +726,10 @@ public class AutoQueryProudDayData { result.put("Customerqty3", NumberUtil.round(collect3.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); // 兰州一期仓(B) - List collect4 = dataList.stream() - .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) - .filter(row -> custB.contains(row.getString("customer_name"))) - .collect(Collectors.toList()); - result.put("Customerqty4", NumberUtil.round(collect4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); + //result.put("Customerqty4", NumberUtil.round(collect4.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); // 兰州一期仓(C) - List collect5 = dataList.stream() - .filter(row -> row.getString("stor_id").equals(AutoQueryEnum.AC01.getId())) - .filter(row -> custC.contains(row.getString("customer_name"))) - .collect(Collectors.toList()); - result.put("Customerqty5", NumberUtil.round(collect5.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); + //result.put("Customerqty5", NumberUtil.round(collect5.stream().map(row -> row.getDoubleValue("num")).reduce(Double::sum).orElse(0.00).toString(), 2) + ""); return result; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java deleted file mode 100644 index e9aa53b..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryUpload.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.nl.wms.sch.manage; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.system.service.param.impl.SysParamServiceImpl; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; -import org.springframework.stereotype.Component; - -import java.util.HashMap; -import java.util.concurrent.TimeUnit; - -@Slf4j -@Component -@RequiredArgsConstructor -public class AutoQueryUpload { - - private final RedissonClient redissonClient; - - @SneakyThrows - public void run() { - RLock lock = redissonClient.getLock(this.getClass().getName()); - boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); - try { - if (tryLock){ - //查询已经处于分配中、分配完但还未回传给MES的销售出库单 - WQLObject wo = WQLObject.getWQLObject("st_ivt_iostorinv"); - JSONArray send_rows = wo.query("bill_type = '1001' AND bill_status IN ( '30', '40' ) AND stor_code = 'AC01' AND upload_mes = '0' AND is_delete = '0'").getResultJSONArray(0); - this.sendInfo(send_rows); - } - }finally { - if (tryLock) { - lock.unlock(); - } - } - - } - - void sendInfo(JSONArray send_rows) { - WQLObject wo = WQLObject.getWQLObject("em_bi_devicestatus"); - String device_code = "UPLOAD_INFO"; - JSONObject device_jo = wo.query("device_code = '" + device_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(device_jo.getString("upload_user"))) { - return; - } - String upload_user = device_jo.getString("upload_user"); - String[] split = upload_user.split(","); - JSONArray UserList = new JSONArray(); - if (split.length > 0) { - for (String s : split) { - JSONObject jo = new JSONObject(); - jo.put("User", s); - UserList.add(jo); - } - } else { - return; - } - for (int i = 0; i < send_rows.size(); i++) { - JSONObject row = send_rows.getJSONObject(i); - String bill_code = row.getString("bill_code"); - String Message = "出库单号为：" + bill_code + "的单据还未进行质量报告回传，请及时回传！"; - JSONObject jo = new JSONObject(); - jo.put("SendType", "L"); - jo.put("Title", "质量报告回传信息"); - jo.put("WarnType", "string"); - jo.put("MessageType", "P"); - jo.put("UserList", UserList); - jo.put("Message", Message); - - String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_URL").getValue(); - String api = "/FeiShuNoticesWebApi/CommunalApi"; - url = url + api; - try { - String resultMsg = HttpRequest.post(url) - .body(String.valueOf(jo)) - .execute().body(); - log.info(" " + jo); - log.info("飞书输出参数为：-------------------" + resultMsg); - HashMap map = new HashMap<>(); - map.put("is_upload", "1"); - map.put("upload_time", DateUtil.now()); - wo.update(map, "device_code = '" + device_code + "'"); - } catch (Exception e) { - log.info(e.getMessage()); - } - } - - } -}