| 
														
															@@ -478,6 +478,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     } else { 
														 | 
														
														 | 
														
															                     } else { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                         wbItem.setfBillstatus(10L); 
														 | 
														
														 | 
														
															                         wbItem.setfBillstatus(10L); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     } 
														 | 
														
														 | 
														
															                     } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                    wbItem.setfMblno(warehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     wbItem.setfPid(fPid); 
														 | 
														
														 | 
														
															                     wbItem.setfPid(fPid); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     wbItem.setCreateBy(loginUser.getUser().getUserName()); 
														 | 
														
														 | 
														
															                     wbItem.setCreateBy(loginUser.getUser().getUserName()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     wbItem.setCreateTime(new Date()); 
														 | 
														
														 | 
														
															                     wbItem.setCreateTime(new Date()); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -670,6 +671,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             wbItem.setCreateTime(new Date()); 
														 | 
														
														 | 
														
															             wbItem.setCreateTime(new Date()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             wbItem.setfBillno(warehouseBills.getfBillno()); 
														 | 
														
														 | 
														
															             wbItem.setfBillno(warehouseBills.getfBillno()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             wbItem.setCreateBy(loginUser.getUser().getUserName()); 
														 | 
														
														 | 
														
															             wbItem.setCreateBy(loginUser.getUser().getUserName()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            wbItem.setfMblno(warehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem); 
														 | 
														
														 | 
														
															             tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         } 
														 | 
														
														 | 
														
															         } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) { 
														 | 
														
														 | 
														
															         if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) { 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -1157,6 +1159,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setfBillstatus(40L); 
														 | 
														
														 | 
														
															                 item.setfBillstatus(40L); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setUpdateBy(loginUser.getUser().getUserName()); 
														 | 
														
														 | 
														
															                 item.setUpdateBy(loginUser.getUser().getUserName()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setUpdateTime(new Date()); 
														 | 
														
														 | 
														
															                 item.setUpdateTime(new Date()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                item.setfMblno(tWarehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(item); 
														 | 
														
														 | 
														
															                 num = tWarehousebillsitemsMapper.updateTWarehousebillsitems(item); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 // 添加状态log 
														 | 
														
														 | 
														
															                 // 添加状态log 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 insertTWarehousebillsLog(item, 40L, loginUser); 
														 | 
														
														 | 
														
															                 insertTWarehousebillsLog(item, 40L, loginUser); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -1503,6 +1506,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 if(item.getfSerialNumber()==null ||  item.getfSerialNumber().equals("")){ 
														 | 
														
														 | 
														
															                 if(item.getfSerialNumber()==null ||  item.getfSerialNumber().equals("")){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                     item.setfSerialNumber(serialNumber); 
														 | 
														
														 | 
														
															                     item.setfSerialNumber(serialNumber); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 } 
														 | 
														
														 | 
														
															                 } 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+                item.setfMblno(tWarehouseBills.getfMblno());// 入库更新库存前执行update更新明细的提单号等于主表的提单号 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setfBillstatus(status); 
														 | 
														
														 | 
														
															                 item.setfBillstatus(status); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setUpdateTime(new Date()); 
														 | 
														
														 | 
														
															                 item.setUpdateTime(new Date()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                 item.setUpdateBy(loginUser.getUser().getUserName()); 
														 | 
														
														 | 
														
															                 item.setUpdateBy(loginUser.getUser().getUserName()); 
														 |