From 3054a90c9c71f5f1f91b54653cabf276751183fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Wed, 19 Apr 2023 09:08:00 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 6 +- .../org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql | 8 +-- .../nl/wms/sch/manage/AbstractAcsTask.java | 3 + .../org/nl/wms/sch/manage/AutoCreateTask.java | 1 + .../send/material/SZSendMaterialTask.java | 2 - .../src/main/java/org/nl/wms/wms.xls | Bin 267264 -> 266752 bytes .../main/resources/config/application-dev.yml | 4 +- .../wms/basedata/material/detail/index.vue | 36 ++++------- .../src/views/wms/basedata/material/index.vue | 31 +++++---- .../src/views/wms/pdm/device/index.vue | 12 ++-- .../src/views/wms/pdm/workerorder/index.vue | 48 +++++++------- .../src/views/wms/pub/DeviceDialog.vue | 19 +++--- .../src/views/wms/pub/MaterDialog.vue | 25 ++++--- .../src/views/wms/sch/point/index.vue | 61 +++++++----------- .../src/views/wms/sch/region/index.vue | 18 +++--- .../src/views/wms/sch/task/index.vue | 1 - 16 files changed, 123 insertions(+), 152 deletions(-) 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 f130dad..3916e35 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 @@ -183,13 +183,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Transactional(rollbackFor = Exception.class) public JSONObject apply(JSONObject param) { String point_code = param.getString("device_code"); + if (StrUtil.isBlank(point_code)) { + throw new BadRequestException("点位不能为空!"); + } String type = param.getString("type"); if (StrUtil.isBlank(type)) { throw new BadRequestException("任务类型不能为空!"); } - if (StrUtil.isBlank(point_code)) { - throw new BadRequestException("点位不能为空!"); - } RLock lock = redissonClient.getFairLock("acs_to_wms:" + point_code); boolean try_lock = false; String task_code = null; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql index 9836da1..82daba6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql @@ -69,17 +69,17 @@ find_in_set( ShiftOrder.order_status, 输入.order_status) ENDOPTION OPTION 输入.begin_time <> "" - ShiftOrder.planproducestart_date >= 输入.begin_time + ShiftOrder.realproducestart_date >= 输入.begin_time ENDOPTION OPTION 输入.end_time <> "" - ShiftOrder.planproduceend_date <= 输入.end_time + ShiftOrder.realproduceend_date <= 输入.end_time ENDOPTION OPTION 输入.produceorder_code <> "" - ShiftOrder.produceorder_code like 输入.produceorder_code + ShiftOrder.workorder_code like 输入.produceorder_code ENDOPTION OPTION 输入.material <> "" ( - material.material_code like '%' 输入.material '%' + material.material_code like 输入.material ) ENDOPTION ENDSELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index 280abb6..e8089b9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -10,6 +10,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.task.AcsTaskDTO; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; @@ -25,11 +26,13 @@ import java.util.List; * @created 2020年6月12日 下午5:53:28 */ public abstract class AbstractAcsTask { + /** * @discription 在如果任务无法形成会一直定时刷新判断 * @author ldjun * @created 2020年6月12日 下午5:55:25 */ + @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW) public List schedule() { this.autoCreate(); this.findStartPoint(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java index 507fe0a..1635f8b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java @@ -13,6 +13,7 @@ import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.task.AcsTaskDTO; import org.reflections.Reflections; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java index 080c7f1..798bae4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java @@ -7,11 +7,9 @@ import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.basedata.eum.VehicleType; import org.nl.wms.sch.manage.*; import org.nl.wms.sch.task.util.TaskUtils; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; /** * @author zhangjiangwei diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 332188392d2569b22da86e58cf9288a1a96012db..b18c843dbe2e9d63086aa6ff5083b88c21f5db4a 100644 GIT binary patch delta 47031 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 diff --git a/lms/nladmin-system/src/main/resources/config/application-dev.yml b/lms/nladmin-system/src/main/resources/config/application-dev.yml index 5ac9770..84e511a 100644 --- a/lms/nladmin-system/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/src/main/resources/config/application-dev.yml @@ -6,9 +6,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lnsh_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lnsh_lms3}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true username: ${DB_USER:root} - password: ${DB_PWD:P@ssw0rd} + password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue index 7012689..62c777d 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue @@ -10,9 +10,9 @@ :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" - width="500px" + width="600px" > - + @@ -36,7 +36,7 @@ @@ -47,9 +47,7 @@ :data="crud.data" size="mini" style="width: 100%;" - @selection-change="crud.selectionChangeHandler" > - + - +