| 
					
				 | 
			
			
				@@ -3,6 +3,7 @@ package org.jeecg.modules.openApi.service.impl; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson.JSONArray; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.alibaba.fastjson.JSONObject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.dynamic.datasource.annotation.DS; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import lombok.extern.log4j.Log4j2; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.apache.commons.lang.StringUtils; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.jeecg.common.system.vo.DictModel; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import org.jeecg.config.InterfaceConnUtils; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -30,6 +31,7 @@ import java.util.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * @Date:   2022-03-31 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  * @Version: V1.0 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+@Log4j2 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @Transactional 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 @Service 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehousingMapper, PurchaseWarehousing> implements IPurchaseWarehousingService { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -202,7 +204,6 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             if(map.get("cMaker")==null||map.get("cMaker").equals("")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 throw new RuntimeException("缺少制单人字段"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            map.put("cMaker","云工厂管理员"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             map.put("cHandler",map.get("cMaker")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     }else{ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -213,7 +214,6 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if(map.get("cMaker")==null||map.get("cMaker").equals("")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         throw new RuntimeException("缺少制单人字段"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    map.put("cMaker","云工厂管理员"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     map.put("cHandler",map.get("cMaker")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -437,7 +437,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             jsonArraySave.add(saveJson); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        System.out.println("入库json:"+jsonArraySave.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        log.info("入库json:"+jsonArraySave.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return jsonArraySave; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -887,7 +887,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             jsonArraySave.add(saveJson); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        System.out.println("调拨单json:"+jsonArraySave.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        log.info("调拨单json:"+jsonArraySave.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return jsonArraySave; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1103,7 +1103,6 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 JSONObject saveJson=new JSONObject();//0412 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 String cCode=oConvertUtils.addOne(this.baseMapper.getMaxCode("cCode","rdrecord11","dnmaketime")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //saveJson.put("cCode",cCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                System.out.println("单据编号:"+cCode); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //修改最大编码 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 this.baseMapper.updateVoucherHistoryCNumber(oConvertUtils.maxNumber(cCode),"0412"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 saveJson.put("CACCID",accID); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1140,7 +1139,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 jsonArraySave.add(saveJson); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        System.out.println("材料出库单json:"+jsonArraySave.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        log.info("材料出库单json:"+jsonArraySave.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return jsonArraySave; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |