Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory
This commit is contained in:
		
						commit
						b9f9527ff2
					
				| 
						 | 
					@ -949,10 +949,11 @@ class MlogbInViewSet(BulkCreateModelMixin, BulkUpdateModelMixin, BulkDestroyMode
 | 
				
			||||||
        c_year2 = str(c_year)[-2:]
 | 
					        c_year2 = str(c_year)[-2:]
 | 
				
			||||||
        c_month = handle_date.month
 | 
					        c_month = handle_date.month
 | 
				
			||||||
        m_model = material_out.model
 | 
					        m_model = material_out.model
 | 
				
			||||||
        if m_model is None:
 | 
					        if 'm_model' in rule:
 | 
				
			||||||
            raise ParseError("生成编号出错:产品型号不能为空")
 | 
					            if m_model is None:
 | 
				
			||||||
        elif m_model and m_model.islower():
 | 
					                raise ParseError("生成编号出错:产品型号不能为空")
 | 
				
			||||||
            raise ParseError("生成编号出错:产品型号不能为小写")
 | 
					            elif m_model and m_model.islower():
 | 
				
			||||||
 | 
					                raise ParseError("生成编号出错:产品型号不能为小写")
 | 
				
			||||||
        # 按生产日志查询
 | 
					        # 按生产日志查询
 | 
				
			||||||
        wpr = (
 | 
					        wpr = (
 | 
				
			||||||
            Wpr.objects.filter(
 | 
					            Wpr.objects.filter(
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue