From 6824cdf6531114cf575ffefa095df2e58368e184 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 12 Jun 2024 17:44:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../brick/service/impl/MdBaseBrickInfoServiceImpl.java | 2 +- .../org/nl/wms/ext/acs/controller/AcsToWmsController.java | 2 -- .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java | 4 ++-- .../pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java index b27fb1e..ff7522d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java @@ -79,7 +79,7 @@ public class MdBaseBrickInfoServiceImpl extends ServiceImpl apply(@RequestBody JSONObject param) { return new ResponseEntity<>(acsToWmsService.acsApply(param), HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 65f6426..affe27f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -564,7 +564,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override public BaseResponse applyOneGrab(JSONObject param) { BrickInfoDto brickInfoDto = param.toJavaObject(BrickInfoDto.class); - baseBrickInfoService.addBrickInfo(brickInfoDto); // 添加数据 + baseBrickInfoService.addBrickInfo(brickInfoDto); return BaseResponse.responseOk(brickInfoDto.getRequestNo()); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java index ca6866a..4be284c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java @@ -459,8 +459,8 @@ public class WmsToMesServiceImpl implements WmsToMesService { Integer page = pageQuery.getPage(); Integer size = pageQuery.getSize(); IPage pages = new Page<>(page, size); - int currentPage = page * size + 1; // start - int currentSize = (pageQuery.getPage() + 1) * size; // end + int currentPage = page * size + 1; + int currentSize = (pageQuery.getPage() + 1) * size; List mesScrapInfoList = mesRequestMapper.selectMesScrapInfo(currentPage, currentSize); pages.setRecords(mesScrapInfoList); int total = mesRequestMapper.getSemiProductGXPFTotal(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml index e8da211..3a04e02 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml @@ -51,7 +51,7 @@ IF(LENGTH(m.standard_size_height4) > 0, m.standard_size_height4, 0) AS standard_size_height4, IF(LENGTH(m.single_weight) > 0, m.single_weight, 0) AS standard_weight, 0 AS detection_error, - IF(LENGTH(m.reduce_volume) > 0, m.reduce_volume, 0) AS reduce_volume, + IF(LENGTH(m.reduce_volume) > 0, m.reduce_volume, 0) AS reduce_volume FROM `pdm_bd_workorder` w LEFT JOIN md_base_material m ON m.material_id = w.material_id WHERE w.workorder_id = #{workorderId} @@ -105,7 +105,7 @@ IF(LENGTH(m.standard_size_height4) > 0, m.standard_size_height4, 0) AS standard_size_height4, IF(LENGTH(m.single_weight) > 0, m.single_weight, 0) AS standard_weight, 0 AS detection_error, - IF(LENGTH(m.reduce_volume) > 0, m.reduce_volume, 0) AS reduce_volume, + IF(LENGTH(m.reduce_volume) > 0, m.reduce_volume, 0) AS reduce_volume FROM pdm_bd_workorder w LEFT JOIN md_base_material m ON m.material_id = w.material_id WHERE w.workorder_status = '1'