Your Name %!s(int64=5) %!d(string=hai) anos
pai
achega
81c4adc34a
Modificáronse 3 ficheiros con 8 adicións e 3 borrados
  1. 1 1
      apps/AppInfo/admin.py
  2. 1 1
      apps/AppInfo/models.py
  3. 6 1
      apps/Equipment/views.py

+ 1 - 1
apps/AppInfo/admin.py

@@ -601,7 +601,7 @@ class PersonPickAdmin(admin.ModelAdmin):
 @admin.register(Store_Manage)
 class StoreManageAdmin(admin.ModelAdmin):
     # 列表页面显示字段
-    list_display = ['name','rtype','spec','rese','farm','upl_time']
+    list_display = ['name','rtype','spec','rese','graden','upl_time']
     # 搜索项:
     search_fields = ['name']
 

+ 1 - 1
apps/AppInfo/models.py

@@ -522,7 +522,7 @@ class Store_Manage(models.Model):
     rtype = models.CharField(u'物料类别', max_length=20, blank=True, null=True)
     spec = models.CharField(u'规格', max_length=20, blank=True, null=True)
     rese = models.CharField(u'库存', max_length=20, blank=True, null=True)
-    farm = models.ForeignKey(FarmList,blank=True, null=True,verbose_name=u'所属农场')
+    graden = models.ForeignKey(GardenArea,blank=True, null=True,verbose_name=u'所属农场')
     upl_time = models.DateTimeField(u'创建时间', blank=True, null=True)
 
     class Meta:

+ 6 - 1
apps/Equipment/views.py

@@ -2248,7 +2248,8 @@ class Repertory_View(ListView):
     def get(self,request):
         return render(request, 'backstageNet/production/repertoryManage.html', context={})
     def post(self,request):
-         #库存id
+        uid = request.user.id
+        #库存id
         store_id = request.POST.get('id')
         #物料名称
         name = request.POST.get('name')
@@ -2258,6 +2259,8 @@ class Repertory_View(ListView):
         spec = request.POST.get('spec')
         #库存
         rese = request.POST.get('rese')
+        #园区
+        graden = request.POST.get('graden')
         #修改
         if store_id:
             try:
@@ -2274,11 +2277,13 @@ class Repertory_View(ListView):
         else:
             #新增
             try:
+                gradens=GardenArea.objects.get(name=graden,user=uid)
                 Store_Manage.objects.create(
                     name=name,
                     rtype=rtype,
                     spec=spec,
                     rese=rese,
+                    graden=gradens
                 )
                 data = "1"
             except Exception as e: