|  | @@ -3,7 +3,7 @@ from erp.models import InboundBill, MaterialDetail, OutboundBill,OutMaterialDeta
 | 
	
		
			
				|  |  |  from django.db.models import Sum
 | 
	
		
			
				|  |  |  from django.db.models.signals import post_save, post_delete
 | 
	
		
			
				|  |  |  from django.dispatch import receiver
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +from decimal import Decimal
 | 
	
		
			
				|  |  |  class BoundListModel(models.Model):
 | 
	
		
			
				|  |  |      STATUS =( 
 | 
	
		
			
				|  |  |              ("100", '入库申请'), ("101", '入库同意'), ("102", '组盘中'), ("103", '部分入库'), ("104", '已入库'),
 | 
	
	
		
			
				|  | @@ -72,12 +72,12 @@ class BoundBatchModel(models.Model):
 | 
	
		
			
				|  |  |      goods_desc = models.CharField(max_length=255, verbose_name="商品描述")
 | 
	
		
			
				|  |  |      goods_std = models.CharField(default='待填写', max_length=255, verbose_name="商品标准",blank=True, null=True)
 | 
	
		
			
				|  |  |      goods_unit = models.CharField(default='待填写', max_length=255, verbose_name="商品单位")
 | 
	
		
			
				|  |  | -    goods_qty = models.BigIntegerField(default=0, verbose_name="商品数量")
 | 
	
		
			
				|  |  | +    goods_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'),  verbose_name="商品数量")
 | 
	
		
			
				|  |  |      goods_package = models.CharField(default='待填写', max_length=255, verbose_name="商品包装")
 | 
	
		
			
				|  |  | -    goods_in_qty = models.BigIntegerField(default=0, verbose_name="组盘入库数量")
 | 
	
		
			
				|  |  | -    goods_in_location_qty = models.BigIntegerField(default=0, verbose_name="库位入库数量")
 | 
	
		
			
				|  |  | -    goods_out_qty = models.BigIntegerField(default=0, verbose_name="出库数量")
 | 
	
		
			
				|  |  | -    goods_reserve_qty = models.BigIntegerField(default=0, verbose_name="预定出库数量")
 | 
	
		
			
				|  |  | +    goods_in_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'),  verbose_name="组盘入库数量")
 | 
	
		
			
				|  |  | +    goods_in_location_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'), verbose_name="库位入库数量")
 | 
	
		
			
				|  |  | +    goods_out_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'),  verbose_name="出库数量")
 | 
	
		
			
				|  |  | +    goods_reserve_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'),  verbose_name="预定出库数量")
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      status = models.IntegerField(choices=CONTAINER_STATUS, default=0, verbose_name='批次状态')
 | 
	
		
			
				|  |  |      container_number = models.IntegerField( default=0, verbose_name="托盘数目")
 | 
	
	
		
			
				|  | @@ -119,7 +119,7 @@ class OutBoundDemandModel(models.Model):
 | 
	
		
			
				|  |  |      goods_desc = models.CharField(max_length=255, verbose_name="商品描述")
 | 
	
		
			
				|  |  |      goods_std = models.CharField(default='待填写', max_length=255, verbose_name="商品标准",blank=True, null=True)
 | 
	
		
			
				|  |  |      goods_unit = models.CharField(default='待填写', max_length=255, verbose_name="商品单位")
 | 
	
		
			
				|  |  | -    goods_qty = models.BigIntegerField(default=0, verbose_name="计划数量")
 | 
	
		
			
				|  |  | +    goods_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'),  verbose_name="计划数量")
 | 
	
		
			
				|  |  |      working = models.BooleanField(default=False, verbose_name="是否在工作")
 | 
	
		
			
				|  |  |      creater = models.CharField(default='uesr', max_length=255, verbose_name="Who Created")
 | 
	
		
			
				|  |  |      create_time = models.DateTimeField(auto_now_add=True, verbose_name="Create Time")
 | 
	
	
		
			
				|  | @@ -138,8 +138,8 @@ class MaterialStatistics(models.Model):
 | 
	
		
			
				|  |  |      goods_desc = models.CharField(max_length=255, verbose_name="商品描述")
 | 
	
		
			
				|  |  |      goods_std = models.CharField(default='待填写', max_length=255, verbose_name="商品标准", blank=True, null=True)
 | 
	
		
			
				|  |  |      goods_unit = models.CharField(default='待填写', max_length=255, verbose_name="商品单位")
 | 
	
		
			
				|  |  | -    total_quantity = models.BigIntegerField(default=0, verbose_name="在库数量")
 | 
	
		
			
				|  |  | -    total_demanded_quantity = models.BigIntegerField(default=0, verbose_name="需求数量")
 | 
	
		
			
				|  |  | +    total_quantity = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'),  verbose_name="在库数量")
 | 
	
		
			
				|  |  | +    total_demanded_quantity = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'), verbose_name="需求数量")
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      def __str__(self):
 | 
	
		
			
				|  |  |          return f"{self.goods_code} - {self.goods_desc}"
 | 
	
	
		
			
				|  | @@ -215,8 +215,8 @@ class OutBatchModel(models.Model):
 | 
	
		
			
				|  |  |      goods_desc = models.CharField(max_length=255, verbose_name="商品描述")
 | 
	
		
			
				|  |  |      goods_std = models.CharField(default='待填写', max_length=255, verbose_name="商品标准",blank=True, null=True)
 | 
	
		
			
				|  |  |      goods_unit = models.CharField(default='待填写', max_length=255, verbose_name="商品单位")
 | 
	
		
			
				|  |  | -    goods_qty = models.BigIntegerField(default=0, verbose_name="商品数量")
 | 
	
		
			
				|  |  | -    goods_out_qty = models.BigIntegerField(default=0, verbose_name="出库数量")
 | 
	
		
			
				|  |  | +    goods_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'),  verbose_name="商品数量")
 | 
	
		
			
				|  |  | +    goods_out_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'),  verbose_name="出库数量")
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      status = models.IntegerField(choices=CONTAINER_STATUS, default=0, verbose_name='批次状态')
 | 
	
	
		
			
				|  | @@ -313,7 +313,7 @@ class BatchLogModel(models.Model):
 | 
	
		
			
				|  |  |      log_date = models.DateTimeField(verbose_name="日志日期")
 | 
	
		
			
				|  |  |      goods_code = models.CharField(max_length=255, verbose_name="商品编码")
 | 
	
		
			
				|  |  |      goods_desc = models.CharField(max_length=255, verbose_name="商品描述")
 | 
	
		
			
				|  |  | -    goods_qty = models.BigIntegerField(default=0, verbose_name="商品数量")
 | 
	
		
			
				|  |  | +    goods_qty = models.DecimalField(max_digits=10, decimal_places=3, default=Decimal('0'), verbose_name="商品数量")
 | 
	
		
			
				|  |  |      log_content = models.CharField(max_length=255, verbose_name="日志内容")
 | 
	
		
			
				|  |  |      creater = models.CharField(default='uesr', max_length=255, verbose_name="Who Created")
 | 
	
		
			
				|  |  |      openid = models.CharField(max_length=255, verbose_name="Openid")
 |