Commit 9aa397ae406c4635676baf646b4c10033229bcb2
1 parent
408ec30b
P改为P1
Showing
3 changed files
with
3 additions
and
3 deletions
src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
@@ -169,7 +169,7 @@ public class BarCodeDetailService extends ServiceImpl<BarCodeDetailMapper, BarCo | @@ -169,7 +169,7 @@ public class BarCodeDetailService extends ServiceImpl<BarCodeDetailMapper, BarCo | ||
169 | * @return | 169 | * @return |
170 | */ | 170 | */ |
171 | public AjaxResult createRegenerationCode(int status){ | 171 | public AjaxResult createRegenerationCode(int status){ |
172 | - String result= DataUtils.createSerialNumberForRegenerationCode("P",status); | 172 | + String result= DataUtils.createSerialNumberForRegenerationCode("P1",status); |
173 | return AjaxResult.success("操作成功",result); | 173 | return AjaxResult.success("操作成功",result); |
174 | } | 174 | } |
175 | 175 |
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
@@ -374,7 +374,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai | @@ -374,7 +374,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai | ||
374 | if(receiptDetail.getMaterialIsBattery()==1){ | 374 | if(receiptDetail.getMaterialIsBattery()==1){ |
375 | LambdaQueryWrapper<ReceiptContainerDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery(); | 375 | LambdaQueryWrapper<ReceiptContainerDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery(); |
376 | receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackType, receiptDetail.getBatteryPackType()); | 376 | receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackType, receiptDetail.getBatteryPackType()); |
377 | - receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackTwoCode, "P"); | 377 | + receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackTwoCode, "P1"); |
378 | receiptDetailWrapper1.orderByDesc(ReceiptContainerDetail::getBatteryPackTwoCode).last("Limit 1"); | 378 | receiptDetailWrapper1.orderByDesc(ReceiptContainerDetail::getBatteryPackTwoCode).last("Limit 1"); |
379 | ReceiptContainerDetail detail1=receiptContainerDetailService.getOne(receiptDetailWrapper1); | 379 | ReceiptContainerDetail detail1=receiptContainerDetailService.getOne(receiptDetailWrapper1); |
380 | String maxCode="0"; | 380 | String maxCode="0"; |
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
@@ -183,7 +183,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R | @@ -183,7 +183,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R | ||
183 | if(receiptDetail.getMaterialIsBattery()==1){ | 183 | if(receiptDetail.getMaterialIsBattery()==1){ |
184 | LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery(); | 184 | LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery(); |
185 | receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, receiptDetail.getBatteryPackType()); | 185 | receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, receiptDetail.getBatteryPackType()); |
186 | - receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()), ReceiptDetail::getBatteryPackTwoCode, "P"); | 186 | + receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()), ReceiptDetail::getBatteryPackTwoCode, "P1"); |
187 | receiptDetailWrapper1.orderByDesc(ReceiptDetail::getBatteryPackTwoCode).last("Limit 1"); | 187 | receiptDetailWrapper1.orderByDesc(ReceiptDetail::getBatteryPackTwoCode).last("Limit 1"); |
188 | ReceiptDetail detail1=receiptDetailSerivece.getOne(receiptDetailWrapper1); | 188 | ReceiptDetail detail1=receiptDetailSerivece.getOne(receiptDetailWrapper1); |
189 | String maxCode="0"; | 189 | String maxCode="0"; |