| 
														
															@@ -672,7 +672,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             tWarehouseBills.setCreateTime(new Date()); 
														 | 
														
														 | 
														
															             tWarehouseBills.setCreateTime(new Date()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             tWarehouseBills.setfBsdeptid(loginUser.getUser().getDeptId()); 
														 | 
														
														 | 
														
															             tWarehouseBills.setfBsdeptid(loginUser.getUser().getDeptId()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             // 已入账 
														 | 
														
														 | 
														
															             // 已入账 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            tWarehouseBills.setfBillstatus("7"); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            tWarehouseBills.setfBillstatus("2"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             tWarehouseBills.setfBilltype(billsType); 
														 | 
														
														 | 
														
															             tWarehouseBills.setfBilltype(billsType); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             tWarehouseBillsMapper.insertTWarehousebills(tWarehouseBills); 
														 | 
														
														 | 
														
															             tWarehouseBillsMapper.insertTWarehousebills(tWarehouseBills); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             fPid = tWarehouseBills.getfId(); 
														 | 
														
														 | 
														
															             fPid = tWarehouseBills.getfId(); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -750,6 +750,32 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             } 
														 | 
														
														 | 
														
															             } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        // 查询所有库存明细 修改仓库主表状态 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        int  notInStorage=0; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        int  Stored=0; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        tWarehousebillsitems.setfPid(fPid); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        List<TWarehousebillsitems> warehousebillsitemsList1 =tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        for(TWarehousebillsitems item:warehousebillsitemsList1){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            if(item.getfBillstatus()==null){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                notInStorage++; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            }else if(item.getfBillstatus().equals("6")) { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                Stored++; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            } else if(item.getfBillstatus().equals("1")){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                notInStorage++; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        // 录入库存明细整体状态 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        TWarehouseBills warehouseBill=new TWarehouseBills(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        warehouseBill.setfId(fPid); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        if(Objects.equals(Stored,0)){ // 未入库 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            warehouseBill.setfItemsStatus("1"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        } else if(Objects.equals(notInStorage,0)){ // 已入库 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            warehouseBill.setfItemsStatus("6"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        } else { // 有已入库、有未入库 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            warehouseBill.setfItemsStatus("2"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBill); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         // 添加成功 主键返回 前台 
														 | 
														
														 | 
														
															         // 添加成功 主键返回 前台 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         return AjaxResult.success("成功",fPid); 
														 | 
														
														 | 
														
															         return AjaxResult.success("成功",fPid); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     } 
														 | 
														
														 | 
														
															     } 
														 |