From d2f6cf1b04c6e6bfd70701fd08ea604ed418c233 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Tue, 28 Sep 2021 17:03:18 +0800 Subject: [PATCH] tijiao --- hb_client/.env.development | 4 +- hb_client/src/router/index.js | 8 + hb_client/src/views/em/detection.vue | 12 +- hb_client/src/views/em/equipment.vue | 10 + hb_client/src/views/mtm/material.vue | 12 +- hb_client/src/views/mtm/materialdo.vue | 479 ++++++++++++++++++ hb_client/src/views/mtm/step.vue | 2 +- .../inm/migrations/0003_auto_20210928_1702.py | 41 ++ hb_server/apps/inm/models.py | 16 +- .../mtm/migrations/0018_material_count.py | 18 + hb_server/apps/mtm/models.py | 2 +- 11 files changed, 595 insertions(+), 9 deletions(-) create mode 100644 hb_client/src/views/mtm/materialdo.vue create mode 100644 hb_server/apps/inm/migrations/0003_auto_20210928_1702.py create mode 100644 hb_server/apps/mtm/migrations/0018_material_count.py diff --git a/hb_client/.env.development b/hb_client/.env.development index ef83e12..003a43c 100644 --- a/hb_client/.env.development +++ b/hb_client/.env.development @@ -2,8 +2,8 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:8000/api' -#VUE_APP_BASE_API = 'http://47.95.0.242:2222/api' +#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api' +VUE_APP_BASE_API = 'http://47.95.0.242:2222/api' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index 27e100a..48d89d0 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -93,6 +93,14 @@ export const asyncRoutes = [ name: 'material', component: () => import('@/views/mtm/material'), meta: { title: '物料清单', icon: 'example', perms: ['vendor_manage'] } + } + , + { + path: 'material/:id', + name: 'MaterialDO', + component: () => import('@/views/mtm/materialdo.vue'), + meta: { title: '绑定检查表', perms: ['vendor_manage'] }, + hidden: true }, { path: 'process', diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/detection.vue index e46d5f6..89d54b0 100644 --- a/hb_client/src/views/em/detection.vue +++ b/hb_client/src/views/em/detection.vue @@ -79,6 +79,16 @@ + + + @@ -248,7 +258,7 @@ - + + + + diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue index f56d69b..3f5cc05 100644 --- a/hb_client/src/views/mtm/material.vue +++ b/hb_client/src/views/mtm/material.vue @@ -74,7 +74,11 @@ width="220px" > + + diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue index 978f979..3d7f00e 100644 --- a/hb_client/src/views/mtm/step.vue +++ b/hb_client/src/views/mtm/step.vue @@ -621,7 +621,7 @@ recordformLists() { this.listQueryrecordform.step=this.stepid; - + this.listQueryrecordform.type=1; getrecordformList(this.listQueryrecordform).then((response) => { if (response.data) { this.recordformList = response.data; diff --git a/hb_server/apps/inm/migrations/0003_auto_20210928_1702.py b/hb_server/apps/inm/migrations/0003_auto_20210928_1702.py new file mode 100644 index 0000000..b6a77da --- /dev/null +++ b/hb_server/apps/inm/migrations/0003_auto_20210928_1702.py @@ -0,0 +1,41 @@ +# Generated by Django 3.2.6 on 2021-09-28 09:02 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('inm', '0002_fifo_inventory'), + ] + + operations = [ + migrations.AlterField( + model_name='inventory', + name='count', + field=models.IntegerField(default=0, verbose_name='仓库物料存量'), + ), + migrations.CreateModel( + name='Materials', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('count', models.IntegerField(default=0, verbose_name='存量')), + ('batch', models.CharField(blank=True, max_length=100, null=True, verbose_name='批次')), + ('effective', models.DateField(blank=True, null=True, verbose_name='有效期')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='materials_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('inventory', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='inm.inventory', verbose_name='仓库物料')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='materials_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '库存表', + 'verbose_name_plural': '库存表', + }, + ), + ] diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py index fa3fc91..9a320d1 100644 --- a/hb_server/apps/inm/models.py +++ b/hb_server/apps/inm/models.py @@ -25,16 +25,26 @@ class WareHouse(CommonAModel): class Inventory(CommonAModel): """ - 库存表 + 库存物料 """ material = models.ForeignKey(Material, on_delete=models.CASCADE, verbose_name='物料信息') - count = models.IntegerField('数量', default=0) + count = models.IntegerField('仓库物料存量', default=0) warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库') class Meta: verbose_name = '库存表' verbose_name_plural = verbose_name - +class Materials(CommonAModel): + """ + 物料批次 + """ + inventory = models.ForeignKey(Inventory, on_delete=models.CASCADE, verbose_name='仓库物料') + count = models.IntegerField('存量', default=0) + batch = models.CharField('批次', max_length=100, null=True, blank=True) + effective = models.DateField('有效期', null=True, blank=True) + class Meta: + verbose_name = '库存表' + verbose_name_plural = verbose_name class FIFO(CommonAModel): """ diff --git a/hb_server/apps/mtm/migrations/0018_material_count.py b/hb_server/apps/mtm/migrations/0018_material_count.py new file mode 100644 index 0000000..9089240 --- /dev/null +++ b/hb_server/apps/mtm/migrations/0018_material_count.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.6 on 2021-09-28 09:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0017_auto_20210928_1355'), + ] + + operations = [ + migrations.AddField( + model_name='material', + name='count', + field=models.IntegerField(default=0, verbose_name='物料总数'), + ), + ] diff --git a/hb_server/apps/mtm/models.py b/hb_server/apps/mtm/models.py index a9b1675..6fca06f 100644 --- a/hb_server/apps/mtm/models.py +++ b/hb_server/apps/mtm/models.py @@ -31,7 +31,7 @@ class Material(CommonAModel): sort_str = models.CharField('排序字符', max_length=100, null=True, blank=True) processes = models.JSONField('工艺流程', default=list, blank=True, null=True) unit = models.CharField('基准计量单位', choices=unit_choices, default='块', max_length=10) - + count = models.IntegerField('物料总数', default=0) class Meta: verbose_name = '物料表' verbose_name_plural = verbose_name