|  |  |  | @ -31,9 +31,7 @@ import com.glxp.api.util.CustomUtil; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.util.GennerOrderUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.util.OrderNoTypeBean; | 
			
		
	
		
			
				
					|  |  |  |  | import lombok.extern.slf4j.Slf4j; | 
			
		
	
		
			
				
					|  |  |  |  | import org.apache.commons.lang3.StringUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.beans.BeanUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.scheduling.annotation.Async; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.validation.BindingResult; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.web.bind.annotation.*; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  |  | @ -477,25 +475,25 @@ public class IoOrderController extends BaseController { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     @AuthRuleAnnotation("") | 
			
		
	
		
			
				
					|  |  |  |  |     @PostMapping("/udiwms/stock/order/change") | 
			
		
	
		
			
				
					|  |  |  |  |     public BaseResponse stockOrderChange(@RequestBody AddStockOrderChangeRequest addStockOrderChangeRequest) { | 
			
		
	
		
			
				
					|  |  |  |  |     public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         IoOrderEntity originOrder = orderService.findByBillNo(addStockOrderChangeRequest.getOrderId()); | 
			
		
	
		
			
				
					|  |  |  |  |         IoOrderEntity originOrder = orderService.findByBillNo(addOrderChangeRequest.getOrderId()); | 
			
		
	
		
			
				
					|  |  |  |  |         IoOrderEntity newOrder = new IoOrderEntity(); | 
			
		
	
		
			
				
					|  |  |  |  |         List<IoCodeEntity> originCodes = codeService.findByOrderId(originOrder.getBillNo()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setCreateTime(new Date()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setFromCorp(addStockOrderChangeRequest.getFromCorp()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setFromInvCode(addStockOrderChangeRequest.getFromInvCode()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setFromDeptCode(addStockOrderChangeRequest.getFromDeptCode()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setInvCode(addStockOrderChangeRequest.getInvCode()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setDeptCode(addStockOrderChangeRequest.getDeptCode()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setFromCorp(addOrderChangeRequest.getFromCorp()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setFromInvCode(addOrderChangeRequest.getFromInvCode()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setFromDeptCode(addOrderChangeRequest.getFromDeptCode()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setInvCode(addOrderChangeRequest.getInvCode()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setDeptCode(addOrderChangeRequest.getDeptCode()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setCorpOrderId(CustomUtil.getId() + "x"); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setMainAction(addStockOrderChangeRequest.getMainAction()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setAction(addStockOrderChangeRequest.getAction()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setMainAction(addOrderChangeRequest.getMainAction()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setAction(addOrderChangeRequest.getAction()); | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setExportStatus(0);  //设置导出状态为未导出
 | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);//设置单据未草稿状态
 | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); //设置验收状态为未验收
 | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setFromType(ConstantStatus.FROM_COPY); | 
			
		
	
		
			
				
					|  |  |  |  |         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addStockOrderChangeRequest.getAction()); | 
			
		
	
		
			
				
					|  |  |  |  |         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderChangeRequest.getAction()); | 
			
		
	
		
			
				
					|  |  |  |  |         String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); | 
			
		
	
		
			
				
					|  |  |  |  |         String supplementOrderNo = orderNo; | 
			
		
	
		
			
				
					|  |  |  |  |         newOrder.setBillNo(supplementOrderNo); | 
			
		
	
	
		
			
				
					|  |  |  | @ -503,7 +501,7 @@ public class IoOrderController extends BaseController { | 
			
		
	
		
			
				
					|  |  |  |  |         originOrder.setReplicateNo(orderNo); | 
			
		
	
		
			
				
					|  |  |  |  |         List<IoCodeTempEntity> supplementCodes = new ArrayList<>(); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         List<IoCodeEntity> products = addStockOrderChangeRequest.getProducts(); | 
			
		
	
		
			
				
					|  |  |  |  |         List<IoCodeEntity> products = addOrderChangeRequest.getProducts(); | 
			
		
	
		
			
				
					|  |  |  |  |         originCodes.forEach( | 
			
		
	
		
			
				
					|  |  |  |  |                 code -> { | 
			
		
	
		
			
				
					|  |  |  |  |                     //复制选中的产品
 | 
			
		
	
	
		
			
				
					|  |  |  | 
 |