wms / wms_guangzhouwanbao · Commits

Commit 198adaab4e14d6f447cfc1c299c3be5cf4a45e28

Authored by 游杰
2 parents 89c16d2c b69d555a

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms2 into develop

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @198adaa
... ... @@ -116,7 +116,6 @@ public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, Recei
116 116 int i = 1;
117 117 Date now = new Date();
118 118 SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
119   - LambdaQueryWrapper<ReceiptHeaderHistory> aa = Wrappers.lambdaQuery();
120 119 LambdaQueryWrapper<ReceiptHeader> lambda = Wrappers.lambdaQuery();
121 120 lambda.select(ReceiptHeader::getCode).eq(ReceiptHeader::getReceiptType, receiptType)
122 121 .orderByDesc(ReceiptHeader::getId).last("Limit 1");
... ... @@ -130,11 +129,12 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
130 129 //todo:隐藏了BUG，请修正。 修改好 去掉todo
131 130  
132 131 while (i != 0) {
  132 + LambdaQueryWrapper<ReceiptHeaderHistory> aa = Wrappers.lambdaQuery();
133 133 if (maxCode != null && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now))) {
134 134 Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
135 135 code = receiptType + df.format(now) + String.format("%05d", Count + i++);
136 136 } else {
137   - code = receiptType + df.format(now) + "0000"+i++;
  137 + code = receiptType + df.format(now) + String.format("%05d", 0000+i++);
138 138 }
139 139 aa.select(ReceiptHeaderHistory::getCode).eq(ReceiptHeaderHistory::getCode, code);
140 140 List<ReceiptHeaderHistory> list = receiptheaderhistoryMapper.selectList(aa);
... ...