| 
					
				 | 
			
			
				@@ -360,8 +360,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         tWhgenleg.setfStatus("T"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 结余件数 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         tWhgenleg.setfQtyblc(warehousebillsitems.getfQty()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        System.out.println("主表新增:" + warehouseBills.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        System.out.println("要添加的总账:" + tWhgenleg.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return tWhgenlegMapper.insertTWhgenleg(tWhgenleg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -403,10 +401,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 业务编码 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             warehouseBills.setfBillno(billNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // 存货编码 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            Date time = new Date(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            warehouseBills.setfBscorpno(bscorpno); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if ("SJRK".equals(billsType)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                // 存货编码 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                Date time = new Date(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                warehouseBills.setfBscorpno(bscorpno); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             tWarehouseBillsMapper.insertTWarehousebills(warehouseBills); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             fPid = warehouseBills.getfId(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1269,7 +1269,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<Map<String, Object>> tWhgenlegs = tWhgenlegMapper.selectStorageFeeItemList(tWarehouseBills); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (tWhgenlegs.size() != 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            System.out.println(tWhgenlegs); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Map<String, Object> mapItem = getWarehouseItems(tWarehouseBills, tWhgenlegs, loginUser); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (mapItem.containsKey("error")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1644,7 +1643,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         tWarehousebillsfeesMapper.deleteByFPid(tWarehousebills.getfId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         JSONArray warehouseJSON = JSONArray.parseArray(warehousebillsitems); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        System.out.println(warehousebillsitemsList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (StringUtils.isNotEmpty(warehousebillsitemsList)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int i = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (TWarehousebillsitems wb : warehousebillsitemsList) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1658,9 +1656,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         return AjaxResult.error("第" + i + "行撤销数大于库存结余数"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } else if ("SJCKRevoke".equals(billsType)) { // 撤销出库 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    System.out.println("第" + i + "条数主表的类型" + billsType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    System.out.println("第" + i + "条数库存总账的:" + tWhgenle.toString()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if (StringUtils.isNotNull(tWhgenle)) { // 非空 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         updateTWhgenlegData(wb, tWhgenle.getfId(), billsType); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } else { 
			 |