From f041a4855876365a8cfa7f4caec717e838e8c910 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 8 Mar 2024 13:27:34 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=90=91=E9=A3=9E=E4=B9=A6?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedata/master/rest/SalesController.java | 2 +- .../basedata/master/service/SalesService.java | 2 +- .../basedata/master/service/dto/SalesDto.java | 2 +- .../master/service/impl/SalesServiceImpl.java | 16 +++++----- .../acs/service/impl/AcsToWmsServiceImpl.java | 4 +-- .../mes/service/impl/LmsToMesServiceImpl.java | 8 ++--- .../views/wms/basedata/master/sales/index.vue | 31 +++++-------------- 7 files changed, 25 insertions(+), 40 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SalesController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SalesController.java index b29e461d7..ee9b259eb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SalesController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/SalesController.java @@ -53,7 +53,7 @@ public class SalesController { @Log("查询业务员") @DeleteMapping - public ResponseEntity delete(@RequestBody String[] ids) { + public ResponseEntity delete(@RequestBody Long[] ids) { salesService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SalesService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SalesService.java index 7eb09791e..672cfd348 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SalesService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/SalesService.java @@ -68,7 +68,7 @@ public interface SalesService { * * @param ids / */ - void deleteAll(String[] ids); + void deleteAll(Long[] ids); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SalesDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SalesDto.java index a2c38a9ef..85a811fc7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SalesDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/dto/SalesDto.java @@ -13,7 +13,7 @@ import java.math.BigDecimal; @Data public class SalesDto implements Serializable { - private Long id; + private Long sales_id; private String sales_code; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java index 00d63198b..351d6340d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/SalesServiceImpl.java @@ -57,9 +57,9 @@ public class SalesServiceImpl implements SalesService { } @Override - public SalesDto findById(Long id) { + public SalesDto findById(Long sales_id) { WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); - JSONObject json = wo.query("id =" + id + "").uniqueResult(0); + JSONObject json = wo.query("sales_id =" + sales_id + "").uniqueResult(0); if (ObjectUtil.isEmpty(json)) { return null; } @@ -87,7 +87,7 @@ public class SalesServiceImpl implements SalesService { throw new BadRequestException("存在相同的编码"); } - dto.setId(IdUtil.getSnowflake(1, 1).nextId()); + dto.setSales_id(IdUtil.getSnowflake(1, 1).nextId()); WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); @@ -97,14 +97,14 @@ public class SalesServiceImpl implements SalesService { @Override @Transactional(rollbackFor = Exception.class) public void update(SalesDto dto) { - SalesDto entity = this.findById(dto.getId()); + SalesDto entity = this.findById(dto.getSales_id()); if (entity == null) { throw new BadRequestException("被删除或无权限，操作失败!"); } String sales_code = dto.getSales_code(); SalesDto unitDto = this.findByCode(sales_code); - if (unitDto != null && !unitDto.getId().equals(dto.getId())) { + if (unitDto != null && !unitDto.getSales_id().equals(dto.getSales_id())) { throw new BadRequestException("存在相同的编码"); } @@ -115,14 +115,14 @@ public class SalesServiceImpl implements SalesService { @Override @Transactional(rollbackFor = Exception.class) - public void deleteAll(String[] ids) { + public void deleteAll(Long[] ids) { String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); WQLObject wo = WQLObject.getWQLObject("md_cs_areasalesinfo"); - for (String id : ids) { - wo.delete("id = '" + id + "'"); + for (Long sales_id : ids) { + wo.delete("sales_id = '" + sales_id + "'"); } } 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 a6d4e2972..f739b71f7 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 @@ -248,7 +248,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { box_type = "2"; } - if (Double.parseDouble(in_download_box_high) > box_high) { + if (Double.parseDouble(in_download_box_high) >= box_high) { box_type = "1"; } @@ -688,7 +688,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (is_labeling.equals("0")) { //更新实际重量 HashMap map = new HashMap<>(); - map.put("real_weight", weight); + map.put("real_weight", NumberUtil.round(weight, 1)); WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "package_box_sn = '" + vehicle_code + "'"); data.put("is_auto_table", "0"); result.put("data", data); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 520d1bdc0..a288b77b6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -705,7 +705,6 @@ public class LmsToMesServiceImpl implements LmsToMesService { @Override public JSONObject sendSalesIvtMsg(String file_name) { - log.info("sendSalesIvtMsg接口输入参数为：-------------------" + file_name.toString()); JSONObject result = new JSONObject(); if (StrUtil.equals("0", is_connect_mes)) { @@ -717,11 +716,12 @@ public class LmsToMesServiceImpl implements LmsToMesService { String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_URL").getValue(); String api = "/FeiShuNoticesWebApi/UploadImage"; - url = url + api; + url = url + api +"?fileName="+file_name; + + log.info("sendSalesIvtMsg接口输入参数为：-------------------" + url.toString()); try { - String resultMsg = HttpRequest.get(url) - .body("fileName",file_name) + String resultMsg = HttpRequest.post(url) .execute().body(); result = JSONObject.parseObject(resultMsg); log.info("sendSalesIvtMsg接口输出参数为：-------------------" + result.toString()); diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue index b492c0dc5..8e6db64c3 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue @@ -33,7 +33,7 @@ style="width: 370px;" > @@ -53,7 +53,7 @@ - +