zy-asrs.git - Gitblit

			@@ -11,11 +11,13 @@
			import com.zy.asrs.service.OrderDetlService;
			import com.zy.asrs.utils.MatCompareUtils;
			import com.zy.common.model.LocDto;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.stereotype.Service;

			import java.util.List;

			@Service("orderDetlService")
			@Slf4j
			public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {

			@Override
			@@ -178,7 +180,10 @@
			}
			for (OrderDetl orderDetl : detlList) {
			if (MatCompareUtils.compare(orderDetl, wrkDetl)) {
			log.info("更新订单完成数量：订单号：{},订单明细id:{}，数量：{}", orderNo,orderDetl.getId(), qty);
			return this.baseMapper.increaseQtyById(orderDetl.getId(), qty) > 0;
			} else {
			log.error("更新订单完成数量，有不一致字段，订单号：{}", orderDetl.getOrderNo());
			}
			}
			return false;

			@@ -353,6 +353,7 @@
			try {
			if (!Cools.isEmpty(orderDetl)) {
			if (!orderDetlService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl, wrkDetl.getAnfme())) {
			log.error("全板出库更新订单完成数量失败，workNo:{},locNo:{}",wrkMast.getWrkNo(),wrkMast.getLocNo());
			// exceptionHandle("全板出库 ===>> 更新订单完成数量失败；[workNo={0}],[locNo={1}]",
			// wrkMast.getWrkNo(), wrkMast.getLocNo());
			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

			@@ -24,7 +24,7 @@
			<file>${LOG_PATH}/info.log</file>
			<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
			<FileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
			<maxHistory>10</maxHistory>
			<maxHistory>30</maxHistory>
			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
			<maxFileSize>10MB</maxFileSize>
			</timeBasedFileNamingAndTriggeringPolicy>
			@@ -43,7 +43,7 @@
			<file>${LOG_PATH}/error.log</file>
			<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
			<FileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
			<maxHistory>10</maxHistory>
			<maxHistory>30</maxHistory>
			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
			<maxFileSize>10MB</maxFileSize>
			</timeBasedFileNamingAndTriggeringPolicy>

	src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/logback-spring.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史