zy-asrs.git - Gitblit

			@@ -6,12 +6,12 @@
			import com.core.common.DateUtils;
			import com.core.common.SnowflakeIdWorker;
			import com.core.exception.CoolException;
			import com.zy.asrs.controller.BasCrnStatusController;
			import com.zy.asrs.entity.*;
			import com.zy.asrs.entity.param.OpenOrderPakinParam;
			import com.zy.asrs.entity.param.OpenOrderPakoutParam;
			import com.zy.asrs.mapper.Order1Mapper;
			import com.zy.asrs.mapper.OrderDetl1Mapper;
			import com.zy.asrs.mapper.OrderDetlMapper;
			import com.zy.asrs.mapper.OrderMapper;
			import com.zy.asrs.service.*;
			import com.zy.common.model.DetlDto;
			@@ -27,13 +27,13 @@
			public class Order1ServiceImpl extends ServiceImpl<Order1Mapper, Order1> implements Order1Service {

			@Autowired
			private OrderDetl1Mapper orderDetlMapper;
			private OrderDetl1Mapper orderDetl1Mapper;
			@Autowired
			private OpenService openService;
			@Autowired
			private SnowflakeIdWorker snowflakeIdWorker;
			@Autowired
			private OrderDetl1Service orderDetlService;
			private OrderDetl1Service orderDetl1Service;
			@Autowired
			private DocTypeService docTypeService;
			@Autowired
			@@ -50,7 +50,7 @@

			@Override
			public List<OrderDetl1> selectWorkingDetls(Long orderId) {
			return orderDetlMapper.selectWorkingDetls(orderId);
			return orderDetl1Mapper.selectWorkingDetls(orderId);
			}

			@Override
			@@ -64,7 +64,7 @@
			if (Cools.isEmpty(order) \|\| order.getSettle() >= 4L) {
			return;
			}
			List<OrderDetl1> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl1>().eq("order_id", order.getId()));
			List<OrderDetl1> orderDetls = orderDetl1Mapper.selectList(new EntityWrapper<OrderDetl1>().eq("order_id", order.getId()));
			boolean complete = true;
			for (OrderDetl1 orderDetl : orderDetls) {
			if (orderDetl.getAnfme() > orderDetl.getQty()) {
			@@ -76,7 +76,7 @@
			// 出库订单重新整理明细
			DocType docType = docTypeService.selectById(order.getDocType());
			if (null != docType && docType.getPakout() == 1) {
			if (!orderDetlService.delete(new EntityWrapper<OrderDetl1>().eq("order_id", order.getId()))) {
			if (!orderDetl1Service.delete(new EntityWrapper<OrderDetl1>().eq("order_id", order.getId()))) {
			throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
			}
			List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
			@@ -91,7 +91,7 @@
			orderDetl.setCreateBy(order.getCreateBy());
			orderDetl.setUpdateTime(order.getUpdateTime());
			orderDetl.setUpdateBy(order.getUpdateBy());
			if (!orderDetlService.insert(orderDetl)) {
			if (!orderDetl1Service.insert(orderDetl)) {
			throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
			}
			}
			@@ -139,11 +139,11 @@
			}
			for (DetlDto detlDto : detlDtos) {
			// 修改订单明细数量
			if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
			if (!orderDetl1Service.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
			throw new CoolException("修改单据明细数量失败");
			}
			// 修改订单作业数量
			if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
			if (!orderDetl1Service.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
			throw new CoolException("修改单据作业数量失败");
			}
			}
			@@ -159,7 +159,8 @@
			if (!this.deleteById(orderId)) {
			throw new CoolException("删除单据失败");
			}
			orderDetlService.delete(new EntityWrapper<OrderDetl1>().eq("order_id", orderId));

			orderDetl1Service.delete(new EntityWrapper<OrderDetl1>().eq("order_id", orderId));
			}

			@Override