+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/procurement_dashboard.html b/shiftflow/templates/shiftflow/procurement_dashboard.html
new file mode 100644
index 0000000..6bc9e56
--- /dev/null
+++ b/shiftflow/templates/shiftflow/procurement_dashboard.html
@@ -0,0 +1,218 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+ План (сделки)
+ + +
+ {% for c in deal_cards %}
+
+
+
+ {% empty %}
+
+
+
+
+ {{ c.deal.number }}
+ {{ c.deal.company.name|default:"—" }}
+ {% if c.deal.due_date %}{{ c.deal.due_date|date:"d.m.Y" }}{% endif %}
+
+
+
+
+
+
+
+ | Позиция | +Заказано | + {% for op in op_columns %} +
+ {{ op.name }}
+ {{ op.code }}
+ |
+ {% endfor %}
+ Готово | +Отгружено | +
|---|---|---|---|---|
| {{ r.entity }} | +{{ r.need }} | + {% for cell in r.op_cells %} +
+ {% if cell.has %}
+ {{ cell.done }}/{{ r.need }}
+
+
+
+ {% else %}
+ —
+ {% endif %}
+ |
+ {% endfor %}
+
+ {{ r.ready }}/{{ r.need }}
+
+
+
+ |
+
+ {{ r.shipped }}/{{ r.need }}
+
+
+
+ |
+
Нет сделок по выбранным фильтрам.
+ {% endfor %}
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/procurement_print.html b/shiftflow/templates/shiftflow/procurement_print.html
new file mode 100644
index 0000000..ea4c595
--- /dev/null
+++ b/shiftflow/templates/shiftflow/procurement_print.html
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+ Снабжение
+ + +
+
+
+
+
+
+
+ | Компонент | +Тип | +К заказу | +Сделки | +Статус | ++ |
|---|---|---|---|---|---|
|
+ {{ r.component_label }}
+ |
+ + {% if r.type == 'raw' %}Сырьё{% elif r.type == 'purchased' %}Покупное{% elif r.type == 'casting' %}Литьё{% elif r.type == 'outsourced' %}Аутсорс{% else %}—{% endif %} + | ++ {{ r.required_qty }}{% if r.kind == 'raw' %} {{ r.unit }}{% endif %} + | ++ {% if r.deals and r.deals|length > 0 %} + {% for dn in r.deals|slice:":3" %} + {{ dn }} + {% endfor %} + {% if r.deals|length > 3 %} + … + {% endif %} + {% else %} + — + {% endif %} + | ++ {% if r.status == 'to_order' %} + К заказу + {% elif r.status == 'ordered' %} + Заказано + {% else %} + Закрыто + {% endif %} + | ++ {% if can_edit and not grouped and r.kind == 'component' %} + {% if r.status == 'to_order' %} + + {% elif r.status == 'ordered' %} + + {% else %} + — + {% endif %} + {% else %} + — + {% endif %} + | +
| Потребностей не найдено | |||||
+
+
+
+
+ Список к закупке от {% now "d.m.Y" %}
+ + {% for type_key, items in print_data.items %} ++ {% for code, label in type_labels.items %} + {% if code == type_key %}{{ label }}{% endif %} + {% endfor %} +
+| № п/п | +Сделка(и) | +Наименование | +Кол-во, шт | +Отметки | +
|---|---|---|---|---|
| {{ forloop.counter }} | ++ {% if item.deals %} + {{ item.deals|join:", " }} + {% else %} + - + {% endif %} + | +{{ item.component_label }} | +{{ item.required_qty }} | ++ |
Нет данных для печати по выбранным фильтрам.
+ {% endfor %} + + + \ No newline at end of file diff --git a/shiftflow/templates/shiftflow/product_detail.html b/shiftflow/templates/shiftflow/product_detail.html index 90dbb3d..70886b4 100644 --- a/shiftflow/templates/shiftflow/product_detail.html +++ b/shiftflow/templates/shiftflow/product_detail.html @@ -4,6 +4,18 @@
+
@@ -14,8 +26,8 @@
Добавить
{% endif %}
- {% if parent_id %}
- Назад
+ {% if back_url %}
+ Назад
{% else %}
Назад
{% endif %}
@@ -36,10 +48,20 @@
{% for ln in lines %}
- {{ entity }}
{{ entity.get_entity_type_display }}
- Состав
+ {% if ln.child.entity_type == 'product' or ln.child.entity_type == 'assembly' %}
+ Состав
+ {% endif %}
-
-
{% if request.GET.open == '1' %}
+ {% endif %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/product_info_casting.html b/shiftflow/templates/shiftflow/product_info_casting.html
index 653b545..b34ed96 100644
--- a/shiftflow/templates/shiftflow/product_info_casting.html
+++ b/shiftflow/templates/shiftflow/product_info_casting.html
@@ -1,8 +1,35 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/product_info_external.html b/shiftflow/templates/shiftflow/product_info_external.html
index 240daeb..c5dfae3 100644
--- a/shiftflow/templates/shiftflow/product_info_external.html
+++ b/shiftflow/templates/shiftflow/product_info_external.html
@@ -1,7 +1,35 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+ {{ entity.get_entity_type_display }}
+
+ {% include 'components/_add_to_deal.html' %}
+ Назад
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/product_info_outsourced.html b/shiftflow/templates/shiftflow/product_info_outsourced.html
index 2b114ea..f7a987e 100644
--- a/shiftflow/templates/shiftflow/product_info_outsourced.html
+++ b/shiftflow/templates/shiftflow/product_info_outsourced.html
@@ -1,8 +1,35 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+ {{ entity.get_entity_type_display }}
+
+ {% include 'components/_add_to_deal.html' %}
+ Назад
+
+
\ No newline at end of file
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/product_info_part.html b/shiftflow/templates/shiftflow/product_info_part.html
index 38807f8..57e6883 100644
--- a/shiftflow/templates/shiftflow/product_info_part.html
+++ b/shiftflow/templates/shiftflow/product_info_part.html
@@ -1,8 +1,35 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+ {{ entity.get_entity_type_display }}
+
+ {% include 'components/_add_to_deal.html' %}
+ Назад
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/product_info_purchased.html b/shiftflow/templates/shiftflow/product_info_purchased.html
index 74752d1..e927902 100644
--- a/shiftflow/templates/shiftflow/product_info_purchased.html
+++ b/shiftflow/templates/shiftflow/product_info_purchased.html
@@ -1,8 +1,35 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+ {{ entity.get_entity_type_display }}
+
+ {% include 'components/_add_to_deal.html' %}
+ Назад
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/products.html b/shiftflow/templates/shiftflow/products.html
index e39b508..d44ec57 100644
--- a/shiftflow/templates/shiftflow/products.html
+++ b/shiftflow/templates/shiftflow/products.html
@@ -12,16 +12,20 @@
{% endif %}
-
+
+
+
+
+ {{ entity.get_entity_type_display }}
+
+ {% include 'components/_add_to_deal.html' %}
+ Назад
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/workitem_detail.html b/shiftflow/templates/shiftflow/workitem_detail.html
new file mode 100644
index 0000000..a5abf7b
--- /dev/null
+++ b/shiftflow/templates/shiftflow/workitem_detail.html
@@ -0,0 +1,308 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+
+
+ Номенклатура снабжения
+Покупное / Аутсорс
+
+ Назад
+
+ {% if can_edit %}
+
+ {% endif %}
+
+
+
+
+
+
+
+
+| Тип | +Обозначение | +Наименование | +Заполнен | +
|---|---|---|---|
| {{ p.get_entity_type_display }} | +{{ p.drawing_number|default:"—" }} | +{{ p.name }} | ++ {% if p.passport_filled %} + + {% else %} + + {% endif %} + | +
| Пока ничего нет | |||
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/workitem_entity_list.html b/shiftflow/templates/shiftflow/workitem_entity_list.html
new file mode 100644
index 0000000..40593a3
--- /dev/null
+++ b/shiftflow/templates/shiftflow/workitem_entity_list.html
@@ -0,0 +1,29 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+
+
+ + + + {{ workitem.entity.drawing_number|default:"—" }} {{ workitem.entity.name }} + + {% if can_edit_entity %} + + + + {% endif %} +
+
+
+ Сделка № {{ workitem.deal.number }}
+
+
+ {% if user_role in 'admin,master,operator,prod_head' and close_url %}
+
+ {{ close_label|default:'Закрыть' }}
+
+ {% endif %}
+
+ {% if user_role in 'admin,technologist,master,clerk' %}
+ {% if workitem.entity.entity_type == 'product' or workitem.entity.entity_type == 'assembly' %}
+
+ Комплектация
+
+ {% endif %}
+ {% endif %}
+
+
+
+
+ {% if workitem.entity.entity_type == 'part' %}
+
+
+
+ {% else %}
+ Превью
+
+
+
+ {% endif %}
+
+ {% if workitem.entity.entity_type == 'product' or workitem.entity.entity_type == 'assembly' %}
+ Файлы
+
+ {% if workitem.entity.dxf_file %}
+
+ DXF/STEP
+
+ {% endif %}
+ {% if workitem.entity.pdf_main %}
+
+ PDF
+
+ {% endif %}
+ {% if not workitem.entity.dxf_file and not workitem.entity.pdf_main %}
+
+ —
+ {% endif %}
+
+
+
+ Паспорт сборки
+
+
+
+
+ Масса, кг
+ {{ passport.weight_kg|default:"—" }}
+
+
+ Покрытие
+ {{ passport.coating|default:"—" }}
+
+
+ Цвет
+ {{ passport.coating_color|default:"—" }}
+
+
+ Площадь покрытия, м²
+ {{ passport.coating_area_m2|default:"—" }}
+
+
+ Сварка
+ {% if passport.requires_welding %}Да{% else %}Нет{% endif %}
+
+
+ Покраска
+ {% if passport.requires_painting %}Да{% else %}Нет{% endif %}
+
+
+ Технические требования
+ {{ passport.technical_requirements|default:"—"|linebreaksbr }}
+
+
+ {% endif %}
+
+ Сварочные швы
+
+
+
+
+
+ | Наименование | +Катет, мм | +Длина, мм | +Кол-во | +
|---|---|---|---|
| {{ s.name }} | +{{ s.leg_mm }} | +{{ s.length_mm }} | +{{ s.quantity }} | +
| Швов нет | |||
+ Назад
+ {% if user_role in 'admin,technologist,master,operator' %}
+
+ {% endif %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/workitem_kitting.html b/shiftflow/templates/shiftflow/workitem_kitting.html
new file mode 100644
index 0000000..a78870b
--- /dev/null
+++ b/shiftflow/templates/shiftflow/workitem_kitting.html
@@ -0,0 +1,117 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+ {% include 'shiftflow/partials/_workitems_table.html' with workitems=workitems %}
+
+
+
+ + {{ entity.drawing_number|default:"—" }} {{ entity.name }} +
+
+ Сделка {{ deal.number }}
+
+
+ {% if can_edit_entity %}
+
+ Паспорт
+
+ {% endif %}
+
+ Назад
+
+
+
+
+
+
+
+ + Комплектация +
+
+ Сделка № {{ workitem.deal.number }} · {{ workitem.entity.drawing_number|default:"—" }} {{ workitem.entity.name }}
+
+
+
+ Назад
+
+ {% if draft %}
+
+ Печать
+
+
+ {% endif %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/workitem_kitting_print.html b/shiftflow/templates/shiftflow/workitem_kitting_print.html
new file mode 100644
index 0000000..003d22d
--- /dev/null
+++ b/shiftflow/templates/shiftflow/workitem_kitting_print.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Потребные компоненты
+
+ {% if to_location %}
+ Куда: {{ to_location.name }} · Кол-во: {{ qty_to_make }} шт
+ {% else %}
+ Склад участка не определён
+ {% endif %}
+
+
+
+
+
+
+
+
+ | Компонент | +Нужно | +Есть на участке | +К перемещению | +Не хватает | +Откуда взять | +
|---|---|---|---|---|---|
|
+ {{ r.entity.drawing_number|default:"—" }} {{ r.entity.name }}
+ {{ r.entity.get_entity_type_display }}
+ |
+ {{ r.need }} | +{{ r.have_to }} | +{{ r.to_move }} | ++ {% if r.missing > 0 %} + {{ r.missing }} + {% else %} + 0 + {% endif %} + | +
+ {% if r.sources %}
+
+ {% for s in r.sources %}
+
+ {% endfor %}
+
+ {% else %}
+ Нет остатков (под сделку/свободных)
+ {% endif %}
+ |
+
| Нет потребных компонентов (или кол-во = 0) | |||||
+
+
+
+ {% empty %}
+
+ {% endfor %}
+
+
+{% if auto_print %}
+
+{% endif %}
+
+
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/workitem_op_closing.html b/shiftflow/templates/shiftflow/workitem_op_closing.html
new file mode 100644
index 0000000..2d43015
--- /dev/null
+++ b/shiftflow/templates/shiftflow/workitem_op_closing.html
@@ -0,0 +1,47 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+
+ Перемещение на {{ to_location.name }}
+ + + {% for g in groups %} +С {{ g.from_location.name }}
+ | № | +Наименование | +К перемещению, шт | +Отметка | +
|---|---|---|---|
| {{ forloop.counter }} | +{{ it.entity.drawing_number|default:"—" }} {{ it.entity.name }} | +{{ it.quantity }} | ++ |
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/workshops_catalog.html b/shiftflow/templates/shiftflow/workshops_catalog.html
new file mode 100644
index 0000000..0a390a7
--- /dev/null
+++ b/shiftflow/templates/shiftflow/workshops_catalog.html
@@ -0,0 +1,43 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+
+
+ + Закрытие операции +
+ Назад к заданию +
+
+
+
+
+ {{ workitem.entity.drawing_number|default:"—" }} {{ workitem.entity.name }}
+ Сделка № {{ workitem.deal.number }}
+
+ Операция: {% if workitem.operation %}{{ workitem.operation.name }}{% else %}{{ workitem.stage|default:"—" }}{% endif %}
+
+ План: {{ workitem.quantity_plan }} · Факт: {{ workitem.quantity_done }} · Остаток: {{ remaining }}
+
+ Эта операция не списывает сырьё/комплектующие. Здесь фиксируется только факт выполнения.
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/shiftflow/templates/shiftflow/writeoffs.html b/shiftflow/templates/shiftflow/writeoffs.html
index d7c7b11..9e0d6ba 100644
--- a/shiftflow/templates/shiftflow/writeoffs.html
+++ b/shiftflow/templates/shiftflow/writeoffs.html
@@ -32,14 +32,30 @@
+
+
+ Справочник · Цеха
+ Назад +
+
+
+
+
+| № | +ID | +Цех | +Склад цеха | +Посты/станки | +
|---|---|---|---|---|
| {{ forloop.counter }} | +{{ ws.id }} | +{{ ws.name }} | +{{ ws.location.name|default:"—" }} | ++ {% if ws.machine_labels %} + {{ ws.machine_labels }} + {% else %} + — + {% endif %} + | +
| Цехов нет. | ||||
По производственным отчетам
-
- {% for card in report_cards %}
+