From e0ff6ad87f93632ffbe7be98816707f50aa21c15 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 12 Nov 2024 15:52:24 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=9B=B4=E6=96=B0=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=B6=E6=B2=A1=E6=9C=89=E6=9B=B4=E6=96=B0?= =?UTF-8?q?update=5Ftiem=EF=BC=9B=20rev:=E7=94=9F=E6=88=90=E8=BD=BD?= =?UTF-8?q?=E5=85=B7=E6=97=B6=E9=AB=98=E5=BA=A6=E4=BF=A1=E6=81=AF=E6=B2=A1?= =?UTF-8?q?=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BmVehicleInfoServiceImpl.java | 8 +++++- .../behavior/impl/FormActivityBehavior.java | 1 + .../iostorage/IOStorageController.java | 26 ++++++++++++++----- .../pda_manage/pick/PdaPickController.java | 10 +++++++ .../wms/pda_manage/pick/dto/PdaPickQuery.java | 12 +++++++++ .../listener/FlowEndEventListener.java | 4 ++- 6 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/dto/PdaPickQuery.java diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java index 480be3bd..eedef090 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java @@ -58,6 +58,7 @@ public class BmVehicleInfoServiceImpl extends ServiceImpl { JSONObject mst_json = handler.getJSONObject("t"); mst_json.put("id",IdUtil.getStringId()); mst_json.put("create_time",DateUtil.now()); + mst_json.put("update_time",DateUtil.now()); mst_json.put("create_name",SecurityUtils.getCurrentNickName()); mst_json.put("status",StatusEnum.FORM_STATUS.code("生成")); mst_json.put("bill_type",currentNode.getBill_type()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java index 341e2bfe..695efdae 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java @@ -14,6 +14,8 @@ import org.nl.common.enums.StatusEnum; import org.nl.common.utils.SecurityUtils; import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService; import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; +import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService; +import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick; import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService; import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater; import org.nl.wms.pda_manage.palletio.service.PalletIostorinvService; @@ -45,7 +47,8 @@ public class IOStorageController { private IActRuExecutionService iActRuExecutionService; @Autowired private IPmFormDataService iPmFormDataService; - + @Autowired + private IMdGruopDickService iMdGruopDickService; @PostMapping("out") @SaIgnore @@ -68,12 +71,14 @@ public class IOStorageController { } } //单据校验"针对托盘库拣选 - int count = iPmFormDataService.count(new QueryWrapper() - .eq("form_type", "Picking") - .eq("vehicle_code", vehicle_code) - .lt("status", StatusEnum.FORM_STATUS.code("完成"))); - if (count>0){ - throw new BadRequestException(String.format("当前载具%s为拣选出库请先进行拣选操作",vehicle_code)); + if (vehicle_code.contains("T")){ + int count = iPmFormDataService.count(new QueryWrapper() + .eq("form_type", "Picking") + .eq("vehicle_code", vehicle_code) + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); + if (count>0){ + throw new BadRequestException(String.format("当前载具%s为拣选出库请先进行拣选操作",vehicle_code)); + } } iMdPbVehicleMaterService.update(new UpdateWrapper() .set("is_delete",true) @@ -81,6 +86,13 @@ public class IOStorageController { .set("update_time", DateUtil.now()) .set("update_name", SecurityUtils.getCurrentNickName()) .eq("id",one.getId())); + if (StringUtils.isNotEmpty(one.getGroup_id())){ + iMdGruopDickService.update(new UpdateWrapper() + .set("status", StatusEnum.FORM_STATUS.code("完成")) + .set("update_time", DateUtil.now()) + .eq("id", one.getGroup_id()) + ); + } } return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java index df6c8220..ff0e7941 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService; +import org.nl.wms.pm_manage.form_data.service.IPmFormDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -28,7 +29,16 @@ public class PdaPickController { @Autowired private IMdGruopDickService iMdGruopDickService; + @Autowired + private IPmFormDataService iPmFormDataService; + @PostMapping("queryPick") + @SaIgnore + @Log("查询拣选作业") + public ResponseEntity queryPick(@RequestBody JSONObject form) { + iMdGruopDickService.groupDick(form); + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + } @PostMapping("savePickTask") @SaIgnore diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/dto/PdaPickQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/dto/PdaPickQuery.java new file mode 100644 index 00000000..4e884ee0 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/dto/PdaPickQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.pda_manage.pick.dto; + +import lombok.Data; + +@Data +public class PdaPickQuery { + private int page; + private int size; + private String form_type; + private String status; + private String vehicle_code; +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java index 3e686110..61f21aa3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java @@ -1,5 +1,6 @@ package org.nl.wms.stor_manage.monitor.listener; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -61,7 +62,8 @@ public class FlowEndEventListener extends AbstraceListener { sql.append("update ") .append(baseFromCollect.contains(history.getForm_type())?history.getForm_type():"pm_form_data") .append(" set status = ") - .append("'"+StatusEnum.FORM_STATUS.code("完成")+"'") + .append("'"+StatusEnum.FORM_STATUS.code("完成")+"' , update_time = ") + .append("'"+ DateUtil.now()+"'") .append(" where id = ") .append("'"+history.getForm_id()+"'"); iPmFormDataService.dynamicSql(sql.toString());