Commit 9edb7367948a08a6326dd8ce09f37e9af8185abc
1 parent
ed6c5d12
电池包条码前缀 P1改为P 用于打印电池包码
Showing
3 changed files
with
5 additions
and
5 deletions
src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
... | ... | @@ -169,7 +169,7 @@ public class BarCodeDetailService extends ServiceImpl<BarCodeDetailMapper, BarCo |
169 | 169 | * @return |
170 | 170 | */ |
171 | 171 | public AjaxResult createRegenerationCode(int status){ |
172 | - String result= DataUtils.createSerialNumberForRegenerationCode("P1",status); | |
172 | + String result= DataUtils.createSerialNumberForRegenerationCode("P",status); | |
173 | 173 | return AjaxResult.success("操作成功",result); |
174 | 174 | } |
175 | 175 | |
... | ... |
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
... | ... | @@ -367,7 +367,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai |
367 | 367 | if(receiptDetail.getMaterialIsBattery()==1){ |
368 | 368 | LambdaQueryWrapper<ReceiptContainerDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery(); |
369 | 369 | receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackType, receiptDetail.getBatteryPackType()); |
370 | - receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackTwoCode, "P1"); | |
370 | + receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackTwoCode, "P"); | |
371 | 371 | receiptDetailWrapper1.orderByDesc(ReceiptContainerDetail::getBatteryPackTwoCode).last("Limit 1"); |
372 | 372 | ReceiptContainerDetail detail1=receiptContainerDetailService.getOne(receiptDetailWrapper1); |
373 | 373 | String maxCode="0"; |
... | ... | @@ -377,7 +377,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai |
377 | 377 | if(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType())){ |
378 | 378 | batteryPackTwoCode= DataUtils.createSerialNumber(receiptDetail.getBatteryPackType(),maxCode,1); |
379 | 379 | }else{ |
380 | - batteryPackTwoCode= DataUtils.createSerialNumber("P1",maxCode,1); | |
380 | + batteryPackTwoCode= DataUtils.createSerialNumber("P",maxCode,1); | |
381 | 381 | } |
382 | 382 | return batteryPackTwoCode; |
383 | 383 | } |
... | ... |
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
... | ... | @@ -183,7 +183,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R |
183 | 183 | if(receiptDetail.getMaterialIsBattery()==1){ |
184 | 184 | LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery(); |
185 | 185 | receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, receiptDetail.getBatteryPackType()); |
186 | - receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()), ReceiptDetail::getBatteryPackTwoCode, "P1"); | |
186 | + receiptDetailWrapper1.like(StringUtils.isEmpty(receiptDetail.getBatteryPackType()), ReceiptDetail::getBatteryPackTwoCode, "P"); | |
187 | 187 | receiptDetailWrapper1.orderByDesc(ReceiptDetail::getBatteryPackTwoCode).last("Limit 1"); |
188 | 188 | ReceiptDetail detail1=receiptDetailSerivece.getOne(receiptDetailWrapper1); |
189 | 189 | String maxCode="0"; |
... | ... | @@ -193,7 +193,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R |
193 | 193 | if(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType())){ |
194 | 194 | batteryPackTwoCode= DataUtils.createSerialNumber(receiptDetail.getBatteryPackType(),maxCode,1); |
195 | 195 | }else{ |
196 | - batteryPackTwoCode= DataUtils.createSerialNumber("P1",maxCode,1); | |
196 | + batteryPackTwoCode= DataUtils.createSerialNumber("P",maxCode,1); | |
197 | 197 | } |
198 | 198 | return batteryPackTwoCode; |
199 | 199 | } |
... | ... |