From 46cf2c8da0b08442050a46b7ded6cae9e7ec9cbb Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 11 Apr 2024 09:26:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E9=95=BF?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=A6=86=E7=9B=96=E4=BA=86=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/utils/SecurityUtils.java | 18 ++++++++-- .../ext/acs/autotask/AutoIssueWorkOrder.java | 1 + .../acs/service/impl/AcsToWmsServiceImpl.java | 16 ++++++--- .../controller/PdmBdWorkorderController.java | 1 + .../workorder/service/dao/PdmBdWorkorder.java | 34 ------------------- .../impl/PdmBdWorkorderServiceImpl.java | 8 ++--- 6 files changed, 32 insertions(+), 46 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java index 83b707a..29f69b8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java @@ -40,7 +40,11 @@ public class SecurityUtils { * @return 系统用户名称 */ public static String getCurrentUsername() { - return getCurrentUser().getUsername(); + CurrentUser currentUser = getCurrentUser(); + if (currentUser == null) { + return "default"; + } + return currentUser.getUsername(); } /** @@ -49,7 +53,11 @@ public class SecurityUtils { * @return 系统用户名称 */ public static String getCurrentNickName() { - return getCurrentUser().getPresonName(); + CurrentUser currentUser = getCurrentUser(); + if (currentUser == null) { + return "默认系统"; + } + return currentUser.getPresonName(); } /** @@ -58,7 +66,11 @@ public class SecurityUtils { * @return 系统用户Id */ public static String getCurrentUserId() { - return getCurrentUser().getId(); + CurrentUser currentUser = getCurrentUser(); + if (currentUser == null) { + return "99"; + } + return currentUser.getId(); } /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java index 8f0c4fd..69e55c2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java @@ -85,5 +85,6 @@ public class AutoIssueWorkOrder { pdmBdWorkorder.setWorkorder_status(WorkOrderStatusEnum.ISSUED.getCode()); TaskUtils.setWorkOrderUpdateByAcs(pdmBdWorkorder); workorderService.updateById(pdmBdWorkorder); + log.info("自动下发工单「 " + pdmBdWorkorder.getWorkorder_code() + " 」成功！"); } } 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 ca89726..933dc5e 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 @@ -569,11 +569,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (bdWorkorder == null) { return BaseResponse.responseError(requestNo, "未找到工单号[" + workorderCode + "]的记录!"); } - bdWorkorder.setWorkorder_status(WorkOrderStatusEnum.PRODUCING.getCode()); - bdWorkorder.setRealproducestart_date(DateUtil.now()); - TaskUtils.setWorkOrderUpdateByAcs(bdWorkorder); - workorderService.updateById(bdWorkorder); - log.info("人工排产确认：{}", bdWorkorder); + if (!bdWorkorder.getWorkorder_status().equals(WorkOrderStatusEnum.ISSUED.getCode())) { + return BaseResponse.responseError(requestNo, "系统繁忙，请稍后再试!"); + } + PdmBdWorkorder upObj = new PdmBdWorkorder(); + upObj.setWorkorder_status(WorkOrderStatusEnum.PRODUCING.getCode()); + upObj.setRealproducestart_date(DateUtil.now()); + TaskUtils.setWorkOrderUpdateByAcs(upObj); + workorderService.update(upObj, new LambdaQueryWrapper() + .eq(PdmBdWorkorder::getWorkorder_code, bdWorkorder.getWorkorder_code())); + log.info("人工排产确认：{}, 作为更新的工单数据：{}", param, upObj); + log.info("人工排产确认工单「 " + bdWorkorder.getWorkorder_code() + " 」成功！"); return BaseResponse.responseOk(requestNo); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java index 5a6e392..da00e2a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java @@ -75,6 +75,7 @@ public class PdmBdWorkorderController { @PutMapping @Log("修改工单管理") + @Limit(period = 2, count = 1) //@SaCheckPermission("@el.check('pdmBdWorkorder:edit')") public ResponseEntity update(@Validated @RequestBody PdmBdWorkorder entity) { pdmBdWorkorderService.update(entity); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java index 849a053..b33315e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java @@ -23,28 +23,20 @@ public class PdmBdWorkorder implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "workorder_id", type = IdType.NONE) - private String workorder_id; - private String workorder_code; - private BigDecimal plan_qty; - private BigDecimal real_qty; - private BigDecimal plan_weight; - private BigDecimal real_weight; - private String material_id; - private String raw_material_code; private String produce_order; @@ -55,84 +47,58 @@ public class PdmBdWorkorder implements Serializable { private String produce_date; - private String vehicle_type; - private String planproducestart_date; - private String planproduceend_date; - private String realproducestart_date; - private String realproduceend_date; - private Integer standing_time; - private String point_code; - private String point_name; - private String region_code; - private String region_name; - private String workorder_status; - private Boolean is_needmove; - private String workorder_type; - @TableField(exist = false) private String production_order; - private String passback_status; - private String workshop_code; - private String ext_id; private String ext_data; - private Boolean is_delete; - private String create_id; - private String create_name; - private String create_time; - private String update_id; - private String update_name; - private String update_time; - private Boolean is_urgent; - private String operator; private Integer qualified_qty; 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 dfb24a7..1860f97 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 @@ -152,12 +152,12 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl