|  |  |  | @ -1,19 +1,19 @@ | 
			
		
	
		
			
				
					|  |  |  |  | package com.glxp.api.service.collect; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | import cn.hutool.core.bean.BeanUtil; | 
			
		
	
		
			
				
					|  |  |  |  | import cn.hutool.core.util.StrUtil; | 
			
		
	
		
			
				
					|  |  |  |  | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | 
			
		
	
		
			
				
					|  |  |  |  | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | 
			
		
	
		
			
				
					|  |  |  |  | import com.github.pagehelper.PageHelper; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.constant.Constant; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.entity.collect.IoCollectOrder; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.dao.collect.IoSplitDesOrderMapper; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.entity.collect.IoSplitDesOrder; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.entity.collect.IoSplitDesOrderDetail; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.entity.inout.IoSplitFifoInv; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.req.collect.AddInvDesDetaiRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.req.collect.CollectOrderRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.req.collect.IoSplitDesOrderRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.res.collect.IoCollectOrderResponse; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.res.collect.IoSplitDesOrderResponse; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.util.GennerOrderUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.util.OrderNoTypeBean; | 
			
		
	
		
			
				
					|  |  |  |  | import org.apache.groovy.util.BeanUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.stereotype.Service; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | import javax.annotation.Resource; | 
			
		
	
	
		
			
				
					|  |  |  | @ -21,16 +21,14 @@ import java.util.Collections; | 
			
		
	
		
			
				
					|  |  |  |  | import java.util.Date; | 
			
		
	
		
			
				
					|  |  |  |  | import java.util.List; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.entity.collect.IoSplitDesOrder; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.dao.collect.IoSplitDesOrderMapper; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | @Service | 
			
		
	
		
			
				
					|  |  |  |  | public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, IoSplitDesOrder> { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     @Resource | 
			
		
	
		
			
				
					|  |  |  |  |     IoSplitDesOrderMapper splitDesOrderMapper; | 
			
		
	
		
			
				
					|  |  |  |  |     @Resource | 
			
		
	
		
			
				
					|  |  |  |  |     IoSplitDesOrderDetailService splitDesOrderDetailService; | 
			
		
	
		
			
				
					|  |  |  |  |     @Resource | 
			
		
	
		
			
				
					|  |  |  |  |     GennerOrderUtils gennerOrderUtils; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     public List<IoSplitDesOrderResponse> filterList(IoSplitDesOrderRequest splitDesOrderRequest) { | 
			
		
	
	
		
			
				
					|  |  |  | @ -60,13 +58,23 @@ public class IoSplitDesOrderService extends ServiceImpl<IoSplitDesOrderMapper, I | 
			
		
	
		
			
				
					|  |  |  |  |             collectOrder = new IoSplitDesOrder(); | 
			
		
	
		
			
				
					|  |  |  |  |             String orderNo = gennerOrderUtils.createWdOrderNo(new OrderNoTypeBean(Constant.SPLIT_DES_ORDER, "yyyyMMdd")); | 
			
		
	
		
			
				
					|  |  |  |  |             collectOrder.setBillNo(orderNo); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         // TODO 添加到单据详情
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         IoSplitFifoInv splitFifoInv = addInvDesDetaiRequest.getSplitFifoInv(); | 
			
		
	
		
			
				
					|  |  |  |  |         IoSplitDesOrderDetail splitDesOrderDetail = IoSplitDesOrderDetail.builder() | 
			
		
	
		
			
				
					|  |  |  |  |                 .workPlaceCode(collectOrder.getWorkPlaceCode()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .orderIdFk(collectOrder.getBillNo()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .invId(splitFifoInv.getId()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .relId(splitFifoInv.getRelId()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .batchNo(splitFifoInv.getBatchNo()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .produceDate(splitFifoInv.getProduceDate()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .expireDate(splitFifoInv.getExpireDate()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .supId(splitFifoInv.getSupId()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .count(splitFifoInv.getReCount()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .reCount(splitFifoInv.getReCount()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .createTime(new Date()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .updateTime(new Date()) | 
			
		
	
		
			
				
					|  |  |  |  |                 .remark("").build(); | 
			
		
	
		
			
				
					|  |  |  |  |         splitDesOrderDetailService.save(splitDesOrderDetail); | 
			
		
	
		
			
				
					|  |  |  |  |         return collectOrder; | 
			
		
	
		
			
				
					|  |  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  |  | } | 
			
		
	
	
		
			
				
					|  |  |  | 
 |