From 0b37e66ac890e07dcdddaca7218ba22a9ba7abf3 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 24 Oct 2023 15:05:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8E=E8=B0=83=E7=94=A8mes=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 4 ++-- .../org/nl/wms/ext/mes/service/WmsToMesService.java | 3 ++- .../ext/mes/service/dao/mapper/MesRequestMapper.java | 2 +- .../ext/mes/service/dao/mapper/MesRequestMapper.xml | 7 +++++-- .../ext/mes/service/impl/WmsToMesServiceImpl.java | 4 ++-- .../service/impl/PdmBdWorkorderServiceImpl.java | 3 ++- .../org/nl/wms/report/service/ReportService.java | 6 ++++++ .../wms/report/service/dao/mapper/ReportMapper.xml | 2 +- .../views/wms/pdm/workerorder/ProductionOrder.vue | 2 +- .../src/views/wms/pdm/workerorder/index.vue | 12 ++++++------ 10 files changed, 28 insertions(+), 17 deletions(-) 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 f204a07..da7b3aa 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 @@ -441,7 +441,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { */ @Override public ApplyTaskResponse applyLabelling(JSONObject param) { - // 木托盘号##物料编码##数量##吨量（单重X数量）##生产日期##订单号 + // 木托盘号##物料编码##数量##吨量（单重X数量）##生产日期##客户名称##订单号 String requestNo = param.getString("requestNo"); ApplyTaskRequest baseRequest = param.toJavaObject(ApplyTaskRequest.class); if (baseRequest.getVehicle_code() == null) { @@ -469,7 +469,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { .append(multiply).append("##") .append(DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyy年MM月dd日")).append("##") .append(custer.getCUSTER_NAME()).append("##") - .append(object.getString("order_no")); + .append(workorder.getProduction_order()); return ApplyTaskResponse.responseOk(requestNo, sb.toString()); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java index a5db807..e2c8aab 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java @@ -63,6 +63,7 @@ public interface WmsToMesService { List getAllMesGdyInfos(); /** + * 统计当前设备的不合格位置的数量作为不合格数 * 上报压机判废信息 * @param workorderCode */ @@ -111,5 +112,5 @@ public interface WmsToMesService { * @param currentSize * @return */ - List selectPageMesOrder(int currentPage, int currentSize); + List selectPageMesOrder(String materialId, int currentPage, int currentSize); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java index 24e2712..3fa55f2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java @@ -65,5 +65,5 @@ public interface MesRequestMapper { @DS("oracle") CusterVo getCusterByNo(String custerNo); @DS("oracle") - List selectPageMesOrder(int currentPage, int currentSize); + List selectPageMesOrder(String materialId, int currentPage, int currentSize); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml index ced3002..227defe 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml @@ -282,10 +282,10 @@ WHERE p1.region_code = 'GTPHC' 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 bf9b261..db444ce 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 @@ -419,8 +419,8 @@ public class WmsToMesServiceImpl implements WmsToMesService { } @Override - public List selectPageMesOrder(int currentPage, int currentSize) { - return mesRequestMapper.selectPageMesOrder(currentPage, currentSize); + public List selectPageMesOrder(String materialId, int currentPage, int currentSize) { + return mesRequestMapper.selectPageMesOrder(materialId, currentPage, currentSize); } /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index f447068..8b09cec 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -113,6 +113,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl inventoryCeil ? BigDecimal.valueOf(inventoryCeil) : BigDecimal.valueOf(ceil)); entity.setExt_data(res.toJSONString()); + entity.setProduce_order(entity.getOrder_no()); } @Override @@ -224,7 +225,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl pages = new Page<>(page, size); int currentPage = page * size; int currentSize = pageQuery.getPage() == 0 ? 1 : pageQuery.getPage() * size; - List mesOrderInfoList = wmsToMesService.selectPageMesOrder(currentPage, currentSize); + List mesOrderInfoList = wmsToMesService.selectPageMesOrder(query.getMaterialId(), currentPage, currentSize); pages.setRecords(mesOrderInfoList); return pages; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java index 2f78a98..24d2201 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java @@ -19,6 +19,12 @@ public interface ReportService { IPage inKilnReport(Map json, PageQuery page); + /** + * 物料警告 + * @param json + * @param page + * @return + */ IPage inventoryMaterialTimeoutWarning(Map json, PageQuery page); // IPage<> mudTransfer(JSONObject json, PageQuery page); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml index 66e841e..dd80b74 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml @@ -59,6 +59,6 @@ WHERE p.region_code = 'GTPHC' AND p.point_type = '2' AND p.point_status = '3' - AND vg.instorage_time DATE_SUB(NOW(), INTERVAL 7 DAY) + AND vg.instorage_time DATE_SUB(NOW(), INTERVAL 30 DAY) diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue index cbea6f1..844a004 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue @@ -60,7 +60,7 @@ export default { url: 'api/pdmBdWorkorder/mesOrder', optShow: {}, query: { - material_code: null + materialId: null } }) }, 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 a24eea7..bdb3c92 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -226,15 +226,15 @@ /> - + - {{ item.CUSTER_NO }} - {{ item.CUSTER_NAME }} + {{ item.custer_NO }} + {{ item.custer_NAME }}