From 02d39afbd5d5a17a381a8a57df4ea83a3f546ec3 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 15 Aug 2023 20:03:57 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/AppRun.java | 2 +- .../orderExt/dao/MpsSaleOrderIcExt.java | 7 ++++ .../MpsSaleOrderIcExtController.java | 37 +++++++++++++++++-- .../src/main/resources/config/application.yml | 9 ----- 4 files changed, 42 insertions(+), 13 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java b/mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java index 2203ba94..d227b0a4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/AppRun.java @@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController; }) @ServletComponentScan @EnableTransactionManagement -@EnableJpaAuditing(auditorAwareRef = "auditorAware") +//@EnableJpaAuditing(auditorAwareRef = "auditorAware") @EnableMethodCache(basePackages = "org.nl") @EnableCreateCacheAnnotation 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 38c543e5..24e1cbc6 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 @@ -1,6 +1,8 @@ package org.nl.wms.mps_manage.other.service.orderExt.dao; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import lombok.Data; @@ -21,6 +23,11 @@ public class MpsSaleOrderIcExt implements Serializable { private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value = "orderext_id") + private String orderext_id; /** * 销售单标识 */ 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 9a37befb..4c68aa6e 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,7 +3,10 @@ package org.nl.wms.mps_manage.saleorder.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang3.StringUtils; import org.nl.common.anno.Log; +import org.nl.common.utils.IdUtil; +import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.mps_manage.other.service.orderExt.IMpsSaleOrderIcExtService; import org.nl.wms.mps_manage.other.service.orderExt.dao.MpsSaleOrderIcExt; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; @@ -15,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.List; + /** *

* 生产订单扩展表 前端控制器 @@ -44,16 +50,41 @@ public class MpsSaleOrderIcExtController { @Log("根据工单获取条码") //("根据工单获取条码") public ResponseEntity getExtList(@RequestBody JSONObject whereJson) { - String workorder_code = whereJson.getString("workorder_code"); + 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"))); int print_no = 0; if (one==null){ - + one = new MpsSaleOrderIcExt(); + one.setSale_id(whereJson.getString("sale_id")); + one.setMaterial_code(whereJson.getString("material_code")); }else { print_no = one.getPrint_no(); } - return new ResponseEntity<>(extService.list(new QueryWrapper().eq("remark1",whereJson.getString("workorder_code"))),HttpStatus.OK); + List barCodes = new ArrayList<>(); + for (int i =0;i(barCodes,HttpStatus.OK); + } + + public static void main(String[] args) { + int print_no = 0; + for (int i =0;i<5;i++){ + String bar_code = String.format("%05d", print_no + i+1); + System.out.println(bar_code); + } + System.out.println(print_no + 5); } } diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index 095bb353..2cd47978 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -9,15 +9,6 @@ spring: redis: repositories: enabled: false - #配置 Jpa - jpa: - hibernate: - ddl-auto: none - open-in-view: true - properties: - hibernate: - dialect: org.hibernate.dialect.MySQL5InnoDBDialect - task: pool: # 核心线程池大小