employee list增加last_check_time

hb_server/apps/hrm/serializers.py

@@ -11,6 +11,7 @@ class EmployeeSerializer(DynamicFieldsSerializerMixin, ModelSerializer):
     name = serializers.CharField(source='user.name', read_only=True)
     dept_ = OrganizationSimpleSerializer(source='user.dept', read_only=True)
     is_atwork = serializers.BooleanField(source='user.is_atwork', read_only=True)
+    last_check_time = serializers.DateTimeField(source='user.last_check_time', read_only=True)
     class Meta:
         model = Employee
         exclude = ['face_data']

hb_server/apps/inm/models.py

@@ -2,6 +2,7 @@ from django.db import models
 from django.db.models.base import Model
 import django.utils.timezone as timezone
 from django.db.models.query import QuerySet
+from apps.pum.models import PuOrder
 from apps.system.models import CommonADModel, CommonAModel, CommonBModel, Organization, User, Dict, File
 from utils.model import SoftModel, BaseModel
 from simple_history.models import HistoricalRecords
@@ -78,6 +79,7 @@ class FIFO(CommonADModel):
         User, verbose_name='审核人', on_delete=models.CASCADE, null=True, blank=True)
     inout_date = models.DateField('出入库日期', null=True, blank=True)
     remark = models.CharField('备注', max_length=1000, default='')
+    pu_order = models.ForeignKey(PuOrder, verbose_name='关联采购订单', null=True, blank=True)
 
 
 class FIFOItem(BaseModel):

hb_server/apps/pum/models.py

@@ -5,7 +5,7 @@ from django.db.models.query import QuerySet
 from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File
 from utils.model import SoftModel, BaseModel
 from simple_history.models import HistoricalRecords
-
+from apps.mtm.models import Material
 
 
 class Vendor(CommonAModel):
@@ -23,4 +23,20 @@ class Vendor(CommonAModel):
         verbose_name_plural = verbose_name
 
     def __str__(self):
-        return self.name
+        return self.name
+
+class PuOrder(CommonAModel):
+    """
+    采购订单信息
+    """
+    number = models.CharField('订单编号', max_length=100, unique=True)
+    vendor = models.ForeignKey(Vendor, verbose_name='供应商', on_delete=models.CASCADE)
+    class Meta:
+        verbose_name = '采购订单'
+        verbose_name_plural = verbose_name
+
+class PuOrderItem(CommonAModel):
+    """
+    采购订单具体项目
+    """
+    pass

hb_server/apps/sam/models.py

@@ -58,7 +58,7 @@ class Order(CommonAModel):
     count = models.PositiveIntegerField('所需数量', default=0)
     planed_count = models.PositiveIntegerField('已排数量', default=0)
     delivered_count = models.PositiveIntegerField('已交货数量', default=0)
-    delivery_date = models.DateField('交货日期')
+    delivery_date = models.DateField('截止交货日期')
     need_mtest = models.BooleanField('是否需要军检', default=False)
     class Meta:
         verbose_name = '订单信息'