From 9edb7367948a08a6326dd8ce09f37e9af8185abc Mon Sep 17 00:00:00 2001
From: tongzhonghao <12345678>
Date: Tue, 31 May 2022 11:18:39 +0800
Subject: [PATCH] 电池包条码前缀 P1改为P 用于打印电池包码
---
src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java | 2 +-
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java | 4 ++--
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java b/src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
index b909f65..bbbd958 100644
--- a/src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
+++ b/src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
@@ -169,7 +169,7 @@ public class BarCodeDetailService extends ServiceImpl<BarCodeDetailMapper, BarCo
* @return
*/
public AjaxResult createRegenerationCode(int status){
- String result= DataUtils.createSerialNumberForRegenerationCode("P1",status);
+ String result= DataUtils.createSerialNumberForRegenerationCode("P",status);
return AjaxResult.success("操作成功",result);
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
index 751d9b6..80da81b 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
@@ -367,7 +367,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
if(receiptDetail.getMaterialIsBattery()==1){
LambdaQueryWrapper<ReceiptContainerDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery();
receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackType, receiptDetail.getBatteryPackType());
- receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackTwoCode, "P1");
+ receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackTwoCode, "P");
receiptDetailWrapper1.orderByDesc(ReceiptContainerDetail::getBatteryPackTwoCode).last("Limit 1");
ReceiptContainerDetail detail1=receiptContainerDetailService.getOne(receiptDetailWrapper1);
String maxCode="0";
@@ -377,7 +377,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
if(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType())){
batteryPackTwoCode= DataUtils.createSerialNumber(receiptDetail.getBatteryPackType(),maxCode,1);
}else{
- batteryPackTwoCode= DataUtils.createSerialNumber("P1",maxCode,1);
+ batteryPackTwoCode= DataUtils.createSerialNumber("P",maxCode,1);
}
return batteryPackTwoCode;
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
index acff9d5..7690208 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
@@ -183,7 +183,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
if(receiptDetail.getMaterialIsBattery()==1){
LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery();
receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, receiptDetail.getBatteryPackType());
- receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()), ReceiptDetail::getBatteryPackTwoCode, "P1");
+ receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()), ReceiptDetail::getBatteryPackTwoCode, "P");
receiptDetailWrapper1.orderByDesc(ReceiptDetail::getBatteryPackTwoCode).last("Limit 1");
ReceiptDetail detail1=receiptDetailSerivece.getOne(receiptDetailWrapper1);
String maxCode="0";
@@ -193,7 +193,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
if(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType())){
batteryPackTwoCode= DataUtils.createSerialNumber(receiptDetail.getBatteryPackType(),maxCode,1);
}else{
- batteryPackTwoCode= DataUtils.createSerialNumber("P1",maxCode,1);
+ batteryPackTwoCode= DataUtils.createSerialNumber("P",maxCode,1);
}
return batteryPackTwoCode;
}
--
libgit2 0.22.2