标识卡码3

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -1275,32 +1275,21 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                     BigDecimal pall = pow.getBatchQuantity();
                     BigDecimal pn = pow.getPalletNum();
 
-                    while(pall.subtract(pn).compareTo(BigDecimal.ZERO)>0){
-                        pw = new ProOrderWorkorder();
-                        pw.setProductName(pow.getProductName());
-                        pw.setWorkorderCode(pow.getWorkorderCode());
-                        pw.setBatchCode(pow.getBatchCode());
-                        pw.setProductDateStr(pow.getProductDateStr());
-                        pw.setRecordId(IdUtils.fastSimpleUUID());
-                        pw.setBatchQuantity(pn);
-                        pw.setPalletNo(i++);
-                        pw.setPalletCode(pow.getPalletCode()+"-"+pw.getPalletNo());
-                        pw.setCreateTime(nowDate);
-                        dtos.add(pw);
-                        pall = pall.subtract(pn);
-                    }
-                    if(pall.compareTo(pn)<0){//最后一托盘
+                    while(pall.compareTo(BigDecimal.ZERO)>0){
                         pw = new ProOrderWorkorder();
                         pw.setProductName(pow.getProductName());
                         pw.setWorkorderCode(pow.getWorkorderCode());
                         pw.setBatchCode(pow.getBatchCode());
                         pw.setProductDateStr(pow.getProductDateStr());
                         pw.setRecordId(IdUtils.fastSimpleUUID());
+                        if(pall.compareTo(pn)<0) {//最后一托盘
                             pw.setBatchQuantity(pall);
+                        }
                         pw.setPalletNo(i++);
                         pw.setPalletCode(pow.getPalletCode()+"-"+pw.getPalletNo());
                         pw.setCreateTime(nowDate);
                         dtos.add(pw);
+                        pall = pall.subtract(pn);
                     }
                 }
             }