From ef17d390f7ce108b8ce64bf8270338a5346f0d97 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 8 Aug 2023 22:06:19 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E7=BB=84=E7=9B=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=88=A0=E9=99=A4/=E5=8C=85=E8=A3=85=E6=9C=BA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle/MdPbBucketrecordController.java | 18 ++++ .../impl/MdPbBucketrecordServiceImpl.java | 81 ++++++++------ .../pda/controller/TmpPackageController.java | 101 ++++++++++++++++++ .../impl/StIvtIostorinvCpOutServiceImpl.java | 4 +- .../product_manage/workorder/ViewDialog.vue | 9 +- .../wms/product_manage/workorder/index.vue | 9 +- .../product/bucketRecord/index.vue | 27 ++++- 7 files changed, 205 insertions(+), 44 deletions(-) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpPackageController.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java index 957c900e..19617a7d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java @@ -1,12 +1,14 @@ package org.nl.wms.masterdata_manage.controller.vehicle; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.ApiOperation; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.RedissonUtils; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; +import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -16,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; import java.util.Map; /** @@ -40,6 +43,21 @@ public class MdPbBucketrecordController { return new ResponseEntity<>(iMdPbBucketrecordService.queryAll(whereJson,page), HttpStatus.OK); } + @PutMapping + @Log("修改桶记录表") + //("查询桶记录表") + public ResponseEntity update(@RequestBody JSONObject whereJson) { + iMdPbBucketrecordService.updateById(whereJson.toJavaObject(MdPbBucketrecord.class)); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping + @Log("删除桶记录表") + public ResponseEntity delete(@RequestBody String[] ids) { + iMdPbBucketrecordService.removeByIds(Arrays.asList(ids)); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("/excelImport") @Log("导入组盘信息") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java index 7345604f..5a0b4648 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbBucketrecordServiceImpl.java @@ -168,19 +168,11 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl sales = saleOrderService.list(new QueryWrapper().in("sale_code", data.stream().map(MdPbBucketrecord::getSale_code).collect(Collectors.toSet()))); - HashMap max = new HashMap<>(); - for (MpsSaleOrder sale : sales) { - Integer integer = max.get(sale.getSale_code()); - if (integer==null){ - max.put(sale.getSale_code(),0); - }else { - max.put(sale.getSale_code(),Math.max(integer,sale.getSeq_no())); - } - } + List sales = saleOrderService + .list(new QueryWrapper() + .in("sale_code", data.stream().map(MdPbBucketrecord::getSale_code).collect(Collectors.toSet()))); List arrayList = new ArrayList<>(); - Map hashMap = new HashMap<>(); for (MdPbBucketrecord datum : data) { datum.setBucket_record_id(IdUtil.getStringId()); String bucketunique = datum.getBucketunique(); @@ -204,31 +196,49 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl mpsSaleOrders = sales.stream().filter(a -> a.getSale_code().equals(datum.getSale_code())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(mpsSaleOrders)){ + MpsSaleOrder mpsSaleOrder = new MpsSaleOrder(); + mpsSaleOrder.setSale_id(IdUtil.getStringId()); + mpsSaleOrder.setSale_code(datum.getSale_code()); + mpsSaleOrder.setSale_qty(new BigDecimal(datum.getStorage_qty())); + mpsSaleOrder.setIs_delete(0); + mpsSaleOrder.setMaterial_id(datum.getMaterial_id()); + mpsSaleOrder.setMaterial_code(datum.getMaterial_code()); + mpsSaleOrder.setMaterial_spec(datum.getMaterial_spec()); + mpsSaleOrder.setProduct_area("A1"); + mpsSaleOrder.setContract_code(datum.getContract_code()); + mpsSaleOrder.setStatus(IOSEnum.ORDER_STATUS.code("生成")); + mpsSaleOrder.setStatus("10"); mpsSaleOrder.setSeq_no(100); - hashMap.put(mpsSaleOrder.getSale_code(),100); + datum.setSeq_no(mpsSaleOrder.getSeq_no()); + arrayList.add(mpsSaleOrder); + sales.add(mpsSaleOrder); }else { - int nowno = integer + 100; - mpsSaleOrder.setSeq_no(nowno); - hashMap.put(mpsSaleOrder.getSale_code(),nowno); + List collect = mpsSaleOrders.stream().filter(a -> a.getMaterial_code().equals(datum.getMaterial_code())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(collect)){ + MpsSaleOrder max = mpsSaleOrders.stream().max(Comparator.comparing(MpsSaleOrder::getSeq_no)).get(); + MpsSaleOrder mpsSaleOrder = new MpsSaleOrder(); + mpsSaleOrder.setSale_id(IdUtil.getStringId()); + mpsSaleOrder.setSale_code(datum.getSale_code()); + mpsSaleOrder.setSale_qty(new BigDecimal(datum.getStorage_qty())); + mpsSaleOrder.setIs_delete(0); + mpsSaleOrder.setMaterial_id(datum.getMaterial_id()); + mpsSaleOrder.setMaterial_code(datum.getMaterial_code()); + mpsSaleOrder.setMaterial_spec(datum.getMaterial_spec()); + mpsSaleOrder.setProduct_area("A1"); + mpsSaleOrder.setContract_code(datum.getContract_code()); + mpsSaleOrder.setStatus(IOSEnum.ORDER_STATUS.code("生成")); + mpsSaleOrder.setStatus("10"); + mpsSaleOrder.setSeq_no(max.getSeq_no()+100); + datum.setSeq_no(mpsSaleOrder.getSeq_no()); + arrayList.add(mpsSaleOrder); + sales.add(mpsSaleOrder); + }else { + datum.setSeq_no(collect.get(0).getSeq_no()); + } } - Integer hasno = max.get(mpsSaleOrder.getSale_code())==null?0:max.get(mpsSaleOrder.getSale_code()); - mpsSaleOrder.setSeq_no(mpsSaleOrder.getSeq_no()+hasno); - datum.setSeq_no(mpsSaleOrder.getSeq_no()); - arrayList.add(mpsSaleOrder); + } List has = this.list(new QueryWrapper() .in("sale_code", data.stream().map(MdPbBucketrecord::getSale_code).collect(Collectors.toSet()))); @@ -241,8 +251,9 @@ public class MdPbBucketrecordServiceImpl extends ServiceImpl packageList(){ + //workorderService.list(new QueryWrapper().eq()) + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + } + + @PostMapping("sendVechile") + @SaIgnore + public ResponseEntity callVechile(@RequestBody JSONObject param){ + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + } + + @PostMapping("cachepoint") + @SaIgnore + public ResponseEntity kzpoint(@RequestBody JSONObject param) { + JSONObject jo = new JSONObject(); + jo.put("device_code", "A1_KZ_SL"); + JSONObject result = wmsToAcsService.request(jo, "api/wms/startDischarge"); + if (!StrUtil.equals(result.getString("status"), "200")) { + throw new BadRequestException((String)result.get("message")); + } + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + } + @PostMapping("callVechile") + @SaIgnore + public ResponseEntity kzresidue(@RequestBody JSONObject param){ + RedissonUtils.lock(()->{ + JSONObject jo = new JSONObject(); + jo.put("next_point_code", param.getString("device_code")); + jo.put("start_point_code", "A1_KZ_SL"); + jo.put("weight", param.getString("qty")); + JSONObject result = wmsToAcsService.request(jo, "api/wms/putOver"); + if (!StrUtil.equals(result.getString("status"), "200")) { + throw new BadRequestException((String)result.get("message")); + } + },"kzresidue",null); + return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java index 4d5fd2ec..d56d4982 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java @@ -272,9 +272,9 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl - + + + + diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue index b40b8326..97b489e3 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/index.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue @@ -409,7 +409,7 @@ - + + + + - + + + @@ -99,11 +106,19 @@ - + + + + @@ -155,7 +170,7 @@ const defaultForm = { } export default { name: 'DeliveryOrder', - dicts: ['PCS_DELIVER_TYPE', 'PCS_DELI_STATUS'], + dicts: ['PCS_DELIVER_TYPE', 'BOX_STATUS'], components: {pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog, UploadDialog}, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { @@ -164,7 +179,7 @@ export default { optShow: { add: true, edit: false, - del: false, + del: true, reset: true, download: false }, @@ -188,6 +203,8 @@ export default { this.initClass3() }, methods: { + deletrow(row){}, + updaterow(row){}, queryClassId() { const param = { 'class_idStr': this.class_idStr