From d23359f59eea156fc61249763e1a123c1a109309 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Mon, 15 Jul 2024 17:59:57 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=87=BA=E5=85=A5=E5=BA=93=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IBmVehicleInfoService.java | 2 +- .../impl/BmVehicleInfoServiceImpl.java | 4 +- .../controller/StIvtIostorinvController.java | 6 + .../StIvtIostorinvOutController.java | 6 + .../iostor/IStIvtIostorinvService.java | 1 + .../io/service/iostor/dao/StIvtIostorinv.java | 2 +- .../impl/StIvtIostorinvServiceImpl.java | 123 +++++++++------ .../views/wms/stor_manage/in/AddDialog.vue | 129 ++++++++------- .../views/wms/stor_manage/in/TaskDialog.vue | 148 ++++++++++-------- .../qd/src/views/wms/stor_manage/in/index.vue | 77 +++++---- .../views/wms/stor_manage/out/AddDialog.vue | 12 ++ .../src/views/wms/stor_manage/out/index.vue | 6 +- 12 files changed, 307 insertions(+), 209 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java index 19235292..b2f919dd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java @@ -63,7 +63,7 @@ public interface IBmVehicleInfoService extends IService { * @param code code * @return BmVehicleInfo */ - Object findByCode(String code); + BmVehicleInfo findByCode(String code); /** * 编辑 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 ce710766..480be3bd 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 @@ -124,8 +124,8 @@ public class BmVehicleInfoServiceImpl extends ServiceImpl().eq("storagevehicle_code",code)); + public BmVehicleInfo findByCode(String code) { + return this.getOne(new QueryWrapper().eq("vehicle_code",code)); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java index 55e3e304..e092f170 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java @@ -54,6 +54,12 @@ public class StIvtIostorinvController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/update") + public ResponseEntity update(@RequestBody JSONObject form) { + iStIvtIostorinvService.update(form); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("getIosInvDtl") public ResponseEntity getDtl(@RequestBody String inv_id) { List mapList = iStIvtIostorinvDtlService.getByInv(inv_id); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java index eb7d30c4..4b7a3137 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java @@ -54,6 +54,12 @@ public class StIvtIostorinvOutController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/update") + public ResponseEntity update(@RequestBody JSONObject form) { + iStIvtIostorinvService.update(form); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("getIosInvDtl") public ResponseEntity getDtl(@RequestBody String inv_id) { List mapList = iStIvtIostorinvDtlOutService.getByInv(inv_id); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java index 659d1736..eb1c1d7f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java @@ -15,6 +15,7 @@ import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv; public interface IStIvtIostorinvService extends IService { void save(JSONObject form); + void update(JSONObject form); /** * 出库分配 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java index 29668f85..3f3fc68b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java @@ -101,7 +101,7 @@ public class StIvtIostorinv implements Serializable { /** * 是否为入库单 */ - @TableField(insertStrategy = FieldStrategy.NEVER) + @TableField(insertStrategy = FieldStrategy.NEVER,updateStrategy = FieldStrategy.NEVER) private Boolean in_storage; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java index f3d26ac3..42f180ad 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java @@ -54,10 +54,11 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl dtls = (List) form.remove("item"); @@ -67,7 +68,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl0){ + if (dtls != null && dtls.size() > 0) { for (int i = 0; i < dtls.size(); i++) { StIvtIostorinvdtl dtl = new JSONObject(dtls.get(i)).toJavaObject(StIvtIostorinvdtl.class); dtl.setId(IdUtil.getStringId()); @@ -79,12 +80,30 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl dtls = (List) form.remove("item"); + StIvtIostorinv mst = form.toJavaObject(StIvtIostorinv.class); + if (dtls != null && dtls.size() > 0) { + for (int i = 0; i < dtls.size(); i++) { + StIvtIostorinvdtl dtl = new JSONObject(dtls.get(i)).toJavaObject(StIvtIostorinvdtl.class); +// dtl.setInv_id(mst.getId()); + iStIvtIostorinvDtlService.updateById(dtl); + } + } + this.updateById(mst); + } + @Override @Transactional public void inDecision(JSONObject form) { Object tmpItemO = form.remove("item"); - if (tmpItemO==null||((List)tmpItemO).size()<1){ + if (tmpItemO == null || ((List) tmpItemO).size() < 1) { throw new BadRequestException("入库分配失败:明细不能为空"); } String now = DateUtil.now(); @@ -92,18 +111,18 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl vehicleMaters = groupVehicle(form, (List) tmpItemO, dtl); iStIvtIostorinvDtlService.update(new UpdateWrapper() .set("update_time", now) - .set("vehicle_code",vehicleMaters.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.joining(","))) - .set("vehicle_id",vehicleMaters.stream().map(MdPbVehicleMater::getId).collect(Collectors.joining(","))) + .set("vehicle_code", vehicleMaters.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.joining(","))) + .set("vehicle_id", vehicleMaters.stream().map(MdPbVehicleMater::getId).collect(Collectors.joining(","))) .eq("id", dtl.getId()) ); //更新组单据 int count = iStIvtIostorinvDtlService.count(new QueryWrapper() .eq("inv_id", dtl.getInv_id()).isNull("vehicle_code")); - if (count == 0){ + if (count == 0) { this.update(new UpdateWrapper() - .set("status",StatusEnum.FORM_STATUS.code("已分配")) - .set("update_time", now).set("update_name",SecurityUtils.getCurrentNickName()) - .eq("id",dtl.getInv_id())); + .set("status", StatusEnum.FORM_STATUS.code("已分配")) + .set("update_time", now).set("update_name", SecurityUtils.getCurrentNickName()) + .eq("id", dtl.getInv_id())); } } @@ -144,12 +163,12 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl collect = vehicleMaters.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.toSet()); int tmpCount = iBmVehicleInfoService.count(new QueryWrapper().in("vehicle_code", collect)); - if (tmpCount tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper().in("vehicle_code", collect)); - if (tmpCount1.size()>0){ - throw new BadRequestException("组盘失败：载具已经存在组盘信息"+tmpCount1.stream().map(MdPbVehicleMater::getVehicle_code).distinct().collect(Collectors.joining(","))); + if (tmpCount1.size() > 0) { + throw new BadRequestException("组盘失败：载具已经存在组盘信息" + tmpCount1.stream().map(MdPbVehicleMater::getVehicle_code).distinct().collect(Collectors.joining(","))); } //生成组盘信息 iMdPbVehicleMaterService.saveBatch(vehicleMaters); @@ -160,47 +179,47 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl().in("id",Arrays.asList(vehicles))); + iMdPbVehicleMaterService.remove(new QueryWrapper().in("id", Arrays.asList(vehicles))); iMdGruopDickService.remove(new QueryWrapper() - .in("vehicle_code",Arrays.asList(dtl.getVehicle_id().split(","))) - .lt("status",StatusEnum.FORM_STATUS.code("完成"))); + .in("vehicle_code", Arrays.asList(dtl.getVehicle_id().split(","))) + .lt("status", StatusEnum.FORM_STATUS.code("完成"))); iStIvtIostorinvDtlService.update(new UpdateWrapper() - .set("update_time",DateUtil.now()) - .set("vehicle_code",null) - .set("vehicle_id",null) - .eq("id",dtl.getId()) + .set("update_time", DateUtil.now()) + .set("vehicle_code", null) + .set("vehicle_id", null) + .eq("id", dtl.getId()) ); this.update(new UpdateWrapper() - .set("status",StatusEnum.FORM_STATUS.code("生成")) + .set("status", StatusEnum.FORM_STATUS.code("生成")) .set("update_time", DateUtil.now()) - .set("update_name",SecurityUtils.getCurrentNickName()) - .eq("id",dtl.getInv_id())); + .set("update_name", SecurityUtils.getCurrentNickName()) + .eq("id", dtl.getInv_id())); } @Override public String outDispense(JSONObject form) { //分配更新 Map map = iStIvtStructattrService.desicion(form, Boolean.FALSE); - if (CollectionUtils.isEmpty(map)){ + if (CollectionUtils.isEmpty(map)) { throw new BadRequestException("分配失败,当前出库分配无可用货位"); } String vehicle_code = map.get("vehicle_code"); Map stringMap = iMdPbVehicleMaterService.getVehicleCode2Id(vehicle_code.split(",")); iStIvtIostorinvDtlService.update(new UpdateWrapper() - .set("vehicle_code",vehicle_code) - .set("vehicle_id",stringMap.values().stream().collect(Collectors.joining(","))) - .eq("id",form.getString("id"))); + .set("vehicle_code", vehicle_code) + .set("vehicle_id", stringMap.values().stream().collect(Collectors.joining(","))) + .eq("id", form.getString("id"))); int count = iStIvtIostorinvDtlService.count(new QueryWrapper() .eq("inv_id", form.getString("inv_id")).isNull("vehicle_code")); - if (count == 0){ + if (count == 0) { this.update(new UpdateWrapper() - .set("status",StatusEnum.FORM_STATUS.code("已分配")) - .eq("id",form.getString("inv_id"))); + .set("status", StatusEnum.FORM_STATUS.code("已分配")) + .eq("id", form.getString("inv_id"))); } return vehicle_code; } @@ -209,21 +228,21 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl() .set("frozen_qty", 0) - .eq("is_delete",false) + .eq("is_delete", false) .in("vehicle_code", Arrays.asList(split))); iStIvtIostorinvDtlService.update(new UpdateWrapper() - .set("vehicle_code",null) - .set("vehicle_id",null) - .eq("id",form.getString("id"))); + .set("vehicle_code", null) + .set("vehicle_id", null) + .eq("id", form.getString("id"))); this.update(new UpdateWrapper() - .set("status",StatusEnum.FORM_STATUS.code("生成")) - .eq("id",form.getString("inv_id"))); + .set("status", StatusEnum.FORM_STATUS.code("生成")) + .eq("id", form.getString("inv_id"))); } return null; } @@ -237,21 +256,21 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl dtlVo = iStIvtIostorinvDtlService.getDtlVo(iostorinv.getId()); List vechiles = dtlVo.stream().map(StIvtIostorinvdtlVo::getVehicle_code).collect(Collectors.toList()); //扔一个物料信息进去 - BussEventMulticaster.Publish(new FlowStartEvent("st_ivt_iostorinv_"+(iostorinv.getIn_storage()?"in":"out") - , (proc_inst_id,innerVehicle) -> iMdPbVehicleMaterService.update(new UpdateWrapper() - .set("proc_inst_id",proc_inst_id) - .in("vehicle_code",innerVehicle==null?vechiles: ListOf.of(innerVehicle))) + BussEventMulticaster.Publish(new FlowStartEvent("st_ivt_iostorinv_" + (iostorinv.getIn_storage() ? "in" : "out") + , (proc_inst_id, innerVehicle) -> iMdPbVehicleMaterService.update(new UpdateWrapper() + .set("proc_inst_id", proc_inst_id) + .in("vehicle_code", innerVehicle == null ? vechiles : ListOf.of(innerVehicle))) //传递全局参数：出库分配出库点用 - ,iostorinv.getForm_data()) - .build("st_ivt_iostorinv",iostorinv.getId(),iostorinv.getSource_form_type(),iostorinv.getSource_form_id(),form) - .build("st_ivt_iostorinvdtl",dtlVo) - ); + , iostorinv.getForm_data()) + .build("st_ivt_iostorinv", iostorinv.getId(), iostorinv.getSource_form_type(), iostorinv.getSource_form_id(), form) + .build("st_ivt_iostorinvdtl", dtlVo) + ); this.update(new UpdateWrapper() - .set("status",StatusEnum.FORM_STATUS.code("执行中")) - .set("update_time",DateUtil.now()) - .set("update_name",SecurityUtils.getCurrentNickName()) - .eq("id",form.getString("id"))); + .set("status", StatusEnum.FORM_STATUS.code("执行中")) + .set("update_time", DateUtil.now()) + .set("update_name", SecurityUtils.getCurrentNickName()) + .eq("id", form.getString("id"))); } @Override @@ -259,7 +278,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl iostorinvdtls = iStIvtIostorinvDtlService.list(new QueryWrapper().eq("inv_id", id)); String collect = iostorinvdtls.stream().map(StIvtIostorinvdtl::getVehicle_id).collect(Collectors.joining(",")); - if (StringUtils.isNotEmpty(collect)){ + if (StringUtils.isNotEmpty(collect)) { String[] split = collect.split(","); //更新点位锁,删除分配 iMdPbVehicleMaterService.update(new UpdateWrapper() @@ -267,8 +286,8 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl() - .set("status",StatusEnum.FORM_STATUS.code("取消")) - .eq("id",id)); + .set("status", StatusEnum.FORM_STATUS.code("取消")) + .eq("id", id)); return null; } } diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue index 9d63d1d2..f2ce88ea 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue @@ -11,19 +11,21 @@ > - + - 保存 + 保存 关闭 - + - + - + - + - + - + - +
- + - - - - + + + + - + - +