|  | @@ -3310,13 +3310,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 | 
	
		
			
				|  |  |          Date time = new Date();
 | 
	
		
			
				|  |  |          if (StringUtils.isNotEmpty(warehouseBills.getfChargetype()) && "0".equals(warehouseBills.getfChargetype())) {
 | 
	
		
			
				|  |  |              time = tWarehousebillsitemsMapper.selecMinBsDateByFPid(tWarehousebillsitems.getfPid());
 | 
	
		
			
				|  |  | -            if (tWarehousebillsitems.getBsdate() != null) {
 | 
	
		
			
				|  |  | -                tWarehousebillsitems.setfBsdate(tWarehousebillsitems.getBsdate());
 | 
	
		
			
				|  |  | +            if (tWarehousebillsitems.getfBsdate() != null) {
 | 
	
		
			
				|  |  | +                tWarehousebillsitems.setfBsdate(tWarehousebillsitems.getfBsdate());
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          } else if (StringUtils.isNotEmpty(warehouseBills.getfChargetype()) && "1".equals(warehouseBills.getfChargetype())) {
 | 
	
		
			
				|  |  | -            if (tWarehousebillsitems.getBsdate() != null) {
 | 
	
		
			
				|  |  | -                time = tWarehousebillsitems.getBsdate();
 | 
	
		
			
				|  |  | -                tWarehousebillsitems.setfBsdate(tWarehousebillsitems.getBsdate());
 | 
	
		
			
				|  |  | +            if (tWarehousebillsitems.getfBsdate() != null) {
 | 
	
		
			
				|  |  | +                time = tWarehousebillsitems.getfBsdate();
 | 
	
		
			
				|  |  | +                tWarehousebillsitems.setfBsdate(tWarehousebillsitems.getfBsdate());
 | 
	
		
			
				|  |  | +                warehousebillsitems.setfBsdate(tWarehousebillsitems.getfBsdate());
 | 
	
		
			
				|  |  |              } else {
 | 
	
		
			
				|  |  |                  time = warehousebillsitems.getfBsdate();
 | 
	
		
			
				|  |  |              }
 | 
	
	
		
			
				|  | @@ -3339,6 +3340,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 | 
	
		
			
				|  |  |          if ("SJRK".equals(billsType)) {
 | 
	
		
			
				|  |  |              tWarehousebillsitems.setfOriginalbilldate(warehousebillsitems.getfBsdate());//入库时间
 | 
	
		
			
				|  |  |              warehousebillsitems.setfOriginalbilldate(warehousebillsitems.getfBsdate());
 | 
	
		
			
				|  |  | +            warehousebillsitems.setfChargedate(warehousebillsitems.getfBsdate());
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              // 前端参数先赋值,否则影响库存查询
 | 
	
		
			
				|  |  |              warehousebillsitems.setfQty(tWarehousebillsitems.getfQty());
 |