product-inventory-management-after.git

			@@ -378,8 +378,10 @@
			if (ObjectUtils.isNull(productionOrder.getStartTime())) {
			productionOrder.setStartTime(LocalDateTime.now());
			}
			// 订单状态由最后一道工序的合格产出推动，避免中间工序提前完工。
			// 仅待开始状态才推进到进行中，避免非末道工序报工时覆盖已完成状态。
			if (ProductOrderStatusEnum.WAIT.getCode().equals(productionOrder.getStatus())) {
			productionOrder.setStatus(ProductOrderStatusEnum.RUNNING.getCode());
			}
			if (isLastOperation) {
			productionOrder.setCompleteQuantity(defaultDecimal(productionOrder.getCompleteQuantity()).add(productQty));
			if (productionOrder.getQuantity() != null

			@@ -55,8 +55,13 @@
			@Override
			@Transactional(rollbackFor = Exception.class)
			public int add(StockInRecordDto stockInRecordDto) {
			String no = OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK","inbound_batches", stockInRecordDto.getCreateTime() != null ? stockInRecordDto.getCreateTime() : LocalDateTime.now());
			LocalDateTime createTime = stockInRecordDto.getCreateTime();
			if (createTime == null) {
			createTime = LocalDateTime.now();
			}
			String no = OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK","inbound_batches", createTime);
			stockInRecordDto.setInboundBatches(no);
			stockInRecordDto.setCreateTime(createTime);
			StockInRecord stockInRecord = new StockInRecord();
			BeanUtils.copyProperties(stockInRecordDto, stockInRecord);
			return stockInRecordMapper.insert(stockInRecord);

			@@ -60,8 +60,13 @@

			@Override
			public int add(StockOutRecordDto stockOutRecordDto) {
			String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches", stockOutRecordDto.getCreateTime() != null ? stockOutRecordDto.getCreateTime() : LocalDateTime.now());
			LocalDateTime createTime = stockOutRecordDto.getCreateTime();
			if (createTime == null) {
			createTime = LocalDateTime.now();
			}
			String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches", createTime);
			stockOutRecordDto.setOutboundBatches(no);
			stockOutRecordDto.setCreateTime(createTime);
			if (StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(stockOutRecordDto.getRecordType())){
			stockOutRecordDto.setApprovalStatus(3);
			}

	src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史