mom-pro2-after.git

			@@ -119,10 +119,9 @@
			String uuid = IdUtil.fastSimpleUUID();
			List<MesProPalletDO> pallets = new ArrayList<>(palletCount);
			if (!ton) {
			int startSeq = palletMapper.selectMaxTempCodeSeq() + 1;
			for (int i = 0; i < palletCount; i++) {
			pallets.add(new MesProPalletDO()
			.setTempCode("PL-" + StrUtil.padPre(String.valueOf(startSeq + i), 8, '0'))
			.setTempCode(codeRedisDao.generate())
			.setBagCount(perPallet)
			.setAutoGenerated(true)
			.setStatus(MesProPalletStatusEnum.IN_USE.getStatus()));
			@@ -136,7 +135,7 @@
			MesProPalletDO pallet = ton ? null : pallets.get(i / perPallet);
			bagCodes.add(new MesProBagCodeDO()
			.setUuid(uuid)
			.setCode("BAG-" + StrUtil.padPre(String.valueOf(bagNo), 8, '0'))
			.setCode(codeRedisDao.generate())
			.setBagNo(bagNo)
			.setItemId(item.getId())
			.setItemCode(item.getCode())
			@@ -255,7 +254,7 @@

			/**
			* 袋码录入批次时，将其绑定的临时托盘（未绑定批次）级联绑定到同一批次：
			* 分配正式托盘码（批次号-P序号）、回写袋码上的冗余托盘码、累计批次托盘数
			* 分配正式托盘码（16 位随机数字，与托盘码生成规则一致）、回写袋码上的冗余托盘码、累计批次托盘数
			*/
			private void bindPalletsToBatch(List<MesProBagCodeDO> bagCodes, MesProBatchDO batch) {
			List<Long> palletIds = bagCodes.stream().map(MesProBagCodeDO::getPalletId)
			@@ -270,12 +269,12 @@
			if (pallet == null \|\| pallet.getBatchId() != null \|\| StrUtil.isNotEmpty(pallet.getCode())) {
			continue;
			}
			String palletCode = batch.getCode() + "-P" + StrUtil.padPre(String.valueOf(nextPalletNo++), 2, '0');
			String palletCode = codeRedisDao.generate();
			palletMapper.updateById(new MesProPalletDO().setId(palletId)
			.setCode(palletCode)
			.setBatchId(batch.getId())
			.setBatchCode(batch.getCode())
			.setPalletNo(nextPalletNo - 1));
			.setPalletNo(nextPalletNo++));
			// 袋码上的冗余托盘码由临时码更新为正式码
			bagCodeMapper.updatePalletCodeByPalletId(palletId, palletCode);
			boundCount++;