From 5d09730b64807ff80c00ad07613bb4db6e16a118 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 5 Nov 2024 19:17:38 +0800 Subject: [PATCH] =?UTF-8?q?add:=E4=BF=AE=E6=94=B9=E8=80=81=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E5=B7=A5=E5=8D=95=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderExt/dao/MpsSaleOrderIcExt.java | 20 +- .../MpsSaleOrderIcExtController.java | 49 +++-- .../saleorder/service/dao/MpsSaleOrder.java | 2 +- .../impl/IPdmProduceWorkorderServiceImpl.java | 4 +- .../main/resources/config/application-dev.yml | 2 +- .../wms/old_manage/old_package/index.vue | 194 +++++++++--------- .../wms/old_manage/old_package/orderExt.js | 8 +- 7 files changed, 146 insertions(+), 133 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java index 3dadd390..453f44aa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java @@ -23,36 +23,18 @@ public class MpsSaleOrderIcExt implements Serializable { private static final long serialVersionUID = 1L; - /** - * 主键 - */ - @TableId(value = "orderext_id") - private String orderext_id; /** * 销售单标识 */ + @TableId(value = "sale_id") private String sale_id; - /** - * 销售单编号 - */ - private String sale_code; /** * 明细序号 */ private Integer seq_no; - /** - * print_序号 - */ - private Integer print_no; - - /** - * 物料规格 - */ - private String material_code; - /** * 包装袋类型 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java index 23861dad..eadc7adb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java @@ -3,6 +3,7 @@ package org.nl.wms.mps_manage.saleorder.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.apache.commons.lang3.StringUtils; import org.nl.common.anno.Log; import org.nl.common.utils.IdUtil; @@ -55,13 +56,16 @@ public class MpsSaleOrderIcExtController { @Log("新增订单扩展表") //("新增订单扩展表") public ResponseEntity query(@RequestBody JSONObject whereJson) { - Map map = extService.getMap(new QueryWrapper() - .eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code"))); - if (map==null){ - MpsSaleOrder saleOrder = saleOrderService.getById(whereJson.getString("sale_id")); - map= MapOf.of("sale_code",saleOrder.getSale_code(),"material_code",whereJson.getString("material_code"),"bar_code","","print_no",0,"orderext_id",""); + MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper() + .eq("sale_id", whereJson.getString("sale_id")).eq("remark1", whereJson.getString("material_code"))); + Map result; + if (one==null){ + String bar_code = whereJson.getString("workorder_code") + whereJson.getString("is_flip") + whereJson.getString("target_roadway") + "00001"; + result = MapOf.of("sale_id",whereJson.getString("sale_id"),"material_code",whereJson.getString("material_code"),"bar_code",bar_code,"print_no",0); + }else { + result = MapOf.of("sale_id",one.getSale_id(),"material_code",one.getRemark1(),"bar_code",one.getBar_code(),"print_no",one.getRemark2()); } - return new ResponseEntity<>(map,HttpStatus.OK); + return new ResponseEntity<>(result,HttpStatus.OK); } @PostMapping("/getExtList") @@ -71,14 +75,13 @@ public class MpsSaleOrderIcExtController { if (StringUtils.isEmpty(whereJson.getString("sale_id"))){throw new BadRequestException("当前工单没有绑定订单无法打印");}; if (whereJson.getInteger("print_num")==null){throw new BadRequestException("没有设置打印标签数量");}; MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper() - .eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code"))); + .eq("sale_id", whereJson.getString("sale_id")).eq("remark1", whereJson.getString("material_code"))); int print_no = 0; if (one==null){ one = new MpsSaleOrderIcExt(); - one.setSale_id(whereJson.getString("sale_id")); - one.setMaterial_code(whereJson.getString("material_code")); + one.setRemark1(whereJson.getString("material_code")); }else { - print_no = one.getPrint_no(); + print_no = Integer.parseInt(one.getRemark2()); } LinkedList barCodes = new LinkedList<>(); for (int i =0;i() + .set("remark2",one.getRemark2()) + .set("bar_code",one.getBar_code()) + .eq("sale_id", whereJson.getString("sale_id")) + .eq("remark1", whereJson.getString("material_code"))); } return new ResponseEntity<>(barCodes,HttpStatus.OK); } + @PostMapping("/reset") + @Log("根据工单获取条码") + //("根据工单获取条码") + public ResponseEntity reset(@RequestBody JSONObject whereJson) { + if (StringUtils.isEmpty(whereJson.getString("sale_id"))||StringUtils.isEmpty(whereJson.getString("material_code"))) { + throw new BadRequestException("请求参数不能为空，缺少sale_id或者物料信息"); + }; + extService.remove(new QueryWrapper() + .eq("sale_id", whereJson.getString("sale_id")) + .eq("remark1", whereJson.getString("material_code"))); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java index efffb209..0f07d7b8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java @@ -38,7 +38,7 @@ public class MpsSaleOrder implements Serializable{ * 明细序号 */ - private Integer seq_no; + private int seq_no; /** * 销售单类型 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index 3e111ffe..41ad8d5d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -1048,9 +1048,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl - + - - 保存 - + + + + + + + + + + - + - + - + @@ -167,7 +167,7 @@ - + @@ -193,12 +193,12 @@ - + - + @@ -206,13 +206,13 @@ - + - + @@ -220,7 +220,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -273,30 +273,30 @@ @open="printFormm()" @close="close()" > - - - - - - - - - - - - - - 重置箱号 - - - - - - - - 取 消 - 打 印 - + + + + + + + + + + + + + + 重置箱号 + + + + + + + + 取 消 + 打 印 + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - +