From 75fc9bddc9242831090183a1329b16a8d4452966 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 19 Oct 2023 14:56:30 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=B7=A5=E5=8D=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/config/ApiDocScan.java | 4 +++- .../wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java | 3 +++ .../controller/workorder/ProduceshiftorderController.java | 2 +- .../service/workorder/dao/PdmProduceWorkorder.java | 5 +---- .../workorder/impl/IPdmProduceWorkorderServiceImpl.java | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java index 7bbae09c..aca085f8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/ApiDocScan.java @@ -3,6 +3,7 @@ package org.nl.config; import cn.hutool.core.util.IdUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; +import com.alibaba.druid.util.StringUtils; import io.swagger.annotations.Api; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.nl.common.anno.Log; @@ -19,6 +20,8 @@ import java.io.File; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.function.Predicate; /* * @author ZZQ @@ -109,7 +112,6 @@ public class ApiDocScan implements SmartLifecycle { public void stop() { } - @Override public boolean isRunning() { return false; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java index 6ec30e7d..f2cde79f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java @@ -370,6 +370,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ String workorderCode = iterator.next(); BigDecimal dq_real_qty = param.getBigDecimal(workorderCode); PdmProduceWorkorder workorder = map.get(workorderCode); + if(workorder == null){ + continue; + } BigDecimal subtract = dq_real_qty.subtract(workorder.getDq_real_qty()); if (workorder.getUpdate_time() !=null){ divide = subtract.divide(new BigDecimal(DateUtil.between(workorder.getUpdate_time(), now, DateUnit.SECOND)), 3, RoundingMode.HALF_UP); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java index 77f6d1d8..82b343c4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java @@ -89,7 +89,7 @@ public class ProduceshiftorderController{ } /** @see org.nl.common.enums.WorkerOrderEnum */ param.put("workorder_status","'2','3','4'"); - if (!SecurityUtils.getCurrentUserId().equals("1")){ + if (!SecurityUtils.getCurrentUsername().equals("admin")){ param.put("optuser",SecurityUtils.getCurrentUserId()); } List list = iPdmProduceWorkorderService.getOrderList(param, page); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java index e6aa4102..da4fe63d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/PdmProduceWorkorder.java @@ -71,10 +71,7 @@ public class PdmProduceWorkorder implements Serializable{ * 物料标识 */ private String material_id; - /** - * 物料编码 - */ - private String material_code; + /** * 物料单重 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index aadec847..7fe20db2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -116,7 +116,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()).setOrderBy("ShiftOrder.planproducestart_date,ShiftOrder.workorder_code desc"); + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()).setOrderBy("ShiftOrder.workorder_code desc"); List result = pdmProduceWorkorderMapper.pageQuery(query); TableDataInfo build = TableDataInfo.build(result); build.setTotalElements(page.getTotal());