lines-num lines-num-new"> 34 
+          <td class="border border-black px-4 py-2">OK</td>
35 
+          <td class="border border-black px-4 py-2">OK</td>
36 
+        </tr>
37 
+      </tbody>
38 
+    </table>
39 
+  </div>

+ 45 - 0
app/report/templates/report/_dimen_bal.html
Просмотреть файл 

@@ -0,0 +1,45 @@
1 
+  <div class="overflow-x-auto">
2 
+    <table class="table-auto border-collapse border border-black w-full text-sm text-center">
3 
+      <thead>
4 
+        <tr>
5 
+          <th class="border border-black px-4 py-2">No.</th>
6 
+          <th class="border border-black px-4 py-2">Inspection item<br>検査項目</th>
7 
+          <th class="border border-black px-4 py-2">Standard<br>規格</th>
8 
+          <th class="border border-black px-4 py-2">Actual<br>実測値</th>
9 
+          <th class="border border-black px-4 py-2">Judgement<br>判定</th>
10 
+        </tr>
11 
+      </thead>
12 
+      <tbody>
13 
+        <!-- Row for No.1 -->
14 
+        <tr>
15 
+          <td rowspan="5" class="border border-black px-4 py-2">No.1</td>
16 
+          <td class="border border-black px-4 py-2" rowspan=3>Dimension(mm)<br>寸法（ミリ）</td>
17 
+          <td class="border border-black px-4 py-2">D510.00 +3.00,-3.00</td>
18 
+          <td class="border border-black px-4 py-2">510.75</td>
19 
+          <td class="border border-black px-4 py-2">OK</td>
20 
+        </tr>
21 
+        <tr>
22 
+          <td class="border border-black px-4 py-2">T25.00 +1.00,-1.00</td>
23 
+          <td class="border border-black px-4 py-2">25.49</td>
24 
+          <td class="border border-black px-4 py-2">OK</td>
25 
+        </tr>
26 
+        <tr>
27 
+          <td class="border border-black px-4 py-2">H152.40 +0.25,+0.10</td>
28 
+          <td class="border border-black px-4 py-2">152.56</td>
29 
+          <td class="border border-black px-4 py-2">OK</td>
30 
+        </tr>
31 
+        <tr>
32 
+          <td class="border border-black px-4 py-2">Balance (g)<br>バランス（グラム）</td>
33 
+          <td class="border border-black px-4 py-2">200</td>
34 
+          <td class="border border-black px-4 py-2">44.30</td>
35 
+          <td class="border border-black px-4 py-2">OK</td>
36 
+        </tr>
37 
+        <tr>
38 
+          <td class="border border-black px-4 py-2">Weight (g)<br>重量（g）</td>
39 
+          <td class="border border-black px-4 py-2">5,000</td>
40 
+          <td class="border border-black px-4 py-2">5100.00</td>
41 
+          <td class="border border-black px-4 py-2">OK</td>
42 
+        </tr>
43 
+      </tbody>
44 
+    </table>
45 
+  </div>

+ 60 - 0
app/report/templates/report/_hardness_outin.html
Просмотреть файл 

@@ -0,0 +1,60 @@
1 
+  <div class="overflow-x-auto">
2 
+    <table class="table-auto border-collapse border-none border-black w-full text-sm text-center">
3 
+      <thead>
4 
+        <tr>
5 
+          <th colspan="6" class="border-none border-black px-4 py-2">Hardness: OB-80Kg, OUT: 0.39 - 0.62 (100 K) IN: 0.42 - 0.67 (100 K-)</th>
6 
+        </tr>
7 
+        <tr>
8 
+          <th colspan="6" class="border border-black px-4 py-2">結合度</th>
9 
+        </tr>
10 
+        <tr>
11 
+          <td rowspan="2" class="border border-black px-4 py-2 font-bold">Sample No.<br>サンプル番号</td>
12 
+          <td rowspan="2" class="border border-black px-4 py-2 font-bold">Out/In<br>外/内</td>
13 
+          <td colspan="3" class="border border-black px-4 py-2 font-bold">Check point<br>チェックポイント</td>
14 
+          <td rowspan="2" class="border border-black px-4 py-2 font-bold">AVG<br>平均</td>
15 
+          <td rowspan="2" class="border border-black px-4 py-2 font-bold">Judgement<br>判定</td>
16 
+        </tr>
17 
+        <tr>
18 
+          <td class="border border-black px-4 py-2 font-bold">1</td>
19 
+          <td class="border border-black px-4 py-2 font-bold">2</td>
20 
+          <td class="border border-black px-4 py-2 font-bold">3</td>
21 
+        </tr>
22 
+      </thead>
23 
+      <tbody>
24 
+        <tr>
25 
+          <td rowspan="2" class="border border-black px-4 py-2">1</td>
26 
+          <td class="border border-black px-4 py-2">Out<br>外</td>
27 
+          <td class="border border-black px-4 py-2">0.40</td>
28 
+          <td class="border border-black px-4 py-2">0.42</td>
29 
+          <td class="border border-black px-4 py-2">0.44</td>
30 
+          <td class="border border-black px-4 py-2">0.42</td>
31 
+          <td class="border border-black px-4 py-2">OK</td>
32 
+        </tr>
33 
+        <tr>
34 
+          <td class="border border-black px-4 py-2">In<br>内</td>
35 
+          <td class="border border-black px-4 py-2">0.49</td>
36 
+          <td class="border border-black px-4 py-2">0.50</td>
37 
+          <td class="border border-black px-4 py-2">0.49</td>
38 
+          <td class="border border-black px-4 py-2">0.49</td>
39 
+          <td class="border border-black px-4 py-2">OK</td>
40 
+        </tr>
41 
+        <tr>
42 
+          <td rowspan="2" class="border border-black px-4 py-2">2</td>
43 
+          <td class="border border-black px-4 py-2">Out<br>外</td>
44 
+          <td class="border border-black px-4 py-2">0.44</td>
45 
+          <td class="border border-black px-4 py-2">0.44</td>
46 
+          <td class="border border-black px-4 py-2">0.45</td>
47 
+          <td class="border border-black px-4 py-2">0.44</td>
48 
+          <td class="border border-black px-4 py-2">OK</td>
49 
+        </tr>
50 
+        <tr>
51 
+          <td class="border border-black px-4 py-2">In<br>内</td>
52 
+          <td class="border border-black px-4 py-2">0.55</td>
53 
+          <td class="border border-black px-4 py-2">0.53</td>
54 
+          <td class="border border-black px-4 py-2">0.54</td>
55 
+          <td class="border border-black px-4 py-2">0.54</td>
56 
+          <td class="border border-black px-4 py-2">OK</td>
57 
+        </tr>
58 
+      </tbody>
59 
+    </table>
60 
+  </div>

+ 48 - 0
app/report/templates/report/_hardnessboth.html
Просмотреть файл 

@@ -0,0 +1,48 @@
1 
+  <div class="overflow-x-auto">
2 
+    <table class="table-auto border-collapse border-none w-full text-sm text-center">
3 
+      <thead>
4 
+        <tr>
5 
+          <th colspan="7" class="border-none border-black px-4 py-2">Hardness: RH-60Kg, OUT: 26.50 - 56.51 (320 J)</th>
6 
+        </tr>
7 
+        <tr>
8 
+          <th colspan="7" class="border border-black px-4 py-2">結合度</th>
9 
+        </tr>
10 
+        <tr>
11 
+          <td rowspan="2" class="border border-black px-4 py-2 font-bold">Sample No.<br>サンプル番号</td>
12 
+          <td rowspan="2" class="border border-black px-4 py-2 font-bold">Side<br>面</td>
13 
+          <td colspan="3" class="border border-black px-4 py-2 font-bold">Check point<br>チェックポイント</td>
14 
+          <td rowspan="2" class="border border-black px-4 py-2 font-bold">AVG<br>平均</td>
15 
+          <td rowspan="2" class="border border-black px-4 py-2 font-bold">Judgement<br>判定</td>
16 
+        </tr>
17 
+        <tr>
18 
+          <td class="border border-black px-4 py-2 font-bold">1</td>
19 
+          <td class="border border-black px-4 py-2 font-bold">2</td>
20 
+          <td class="border border-black px-4 py-2 font-bold">3</td>
21 
+        </tr>
22 
+      </thead>
23 
+      <tbody>
24 
+        <!-- Data Rows -->
25 
+        <!-- Row Template -->
26 
+        <!-- Repeat the following structure for all data rows -->
27 
+        <tr>
28 
+          <td rowspan="2" class="border border-black px-4 py-2">1</td>
29 
+          <td class="border border-black px-4 py-2">Side A<br>A面</td>
30 
+          <td class="border border-black px-4 py-2">62.60</td>
31 
+          <td class="border border-black px-4 py-2">53.50</td>
32 
+          <td class="border border-black px-4 py-2">42.50</td>
33 
+          <td class="border border-black px-4 py-2">52.87</td>
34 
+          <td class="border border-black px-4 py-2">OK</td>
35 
+        </tr>
36 
+        <tr>
37 
+          <td class="border border-black px-4 py-2">Side B<br>B面</td>
38 
+          <td class="border border-black px-4 py-2">63.20</td>
39 
+          <td class="border border-black px-4 py-2">53.00</td>
40 
+          <td class="border border-black px-4 py-2">48.30</td>
41 
+          <td class="border border-black px-4 py-2">54.83</td>
42 
+          <td class="border border-black px-4 py-2">OK</td>
43 
+        </tr>
44 
+        <!-- Repeat similar structure for remaining rows -->
45 
+      </tbody>
46 
+    </table>
47 
+  </div>
48 
+

+ 42 - 0
app/report/templates/report/_hardnessout.html
Просмотреть файл 

@@ -0,0 +1,42 @@
1 
+ <div class="overflow-x-auto">
2 
+    <table class="table-auto border-collapse border-none  w-full text-sm text-left">
3 
+      <thead>
4 
+        <tr class="bg-gray-200">
5 
+          <th colspan="5" class="border border-gray-400 px-4 py-2 text-center">Hardness: OB-80Kg, OUT: 0.45 - 0.62 (36 M+)</th>
6 
+        </tr>
7 
+        <tr>
8 
+          <th colspan="5" class="border-none border-gray-400 px-4 py-2">結合度</th>
9 
+        </tr>
10 
+        <tr class="bg-gray-100">
11 
+          <th class='border-none'></th>
12 
+          <th colspan="4" class="border border-gray-400 px-4 py-2 text-center">Check point<br> チェックポイント</th>
13 
+        </tr>
14 
+        <tr class="bg-gray-200">
15 
+          <th class="border border-gray-400 px-4 py-2">Sample No. <br>サンプル番号</th>
16 
+          <th class="border border-gray-400 px-4 py-2">1</th>
17 
+          <th class="border border-gray-400 px-4 py-2">2</th>
18 
+          <th class="border border-gray-400 px-4 py-2">3</th>
19 
+          <th class="border border-gray-400 px-4 py-2">AVG <br>平均</th>
20 
+          <th class="border border-gray-400 px-4 py-2">Judgement <br> 判定</th>
21 
+        </tr>
22 
+      </thead>
23 
+      <tbody>
24 
+        <tr>
25 
+          <td class="border border-gray-400 px-4 py-2">1</td>
26 
+          <td class="border border-gray-400 px-4 py-2">0.48</td>
27 
+          <td class="border border-gray-400 px-4 py-2">0.49</td>
28 
+          <td class="border border-gray-400 px-4 py-2">0.51</td>
29 
+          <td class="border border-gray-400 px-4 py-2">0.49</td>
30 
+          <td class="border border-gray-400 px-4 py-2">OK</td>
31 
+        </tr>
32 
+        <tr class="bg-gray-100">
33 
+          <td class="border border-gray-400 px-4 py-2">2</td>
34 
+          <td class="border border-gray-400 px-4 py-2">0.50</td>
35 
+          <td class="border border-gray-400 px-4 py-2">0.49</td>
36 
+          <td class="border border-gray-400 px-4 py-2">0.51</td>
37 
+          <td class="border border-gray-400 px-4 py-2">0.50</td>
38 
+          <td class="border border-gray-400 px-4 py-2">OK</td>
39 
+        </tr>
40 
+      </tbody>
41 
+    </table>
42 
+  </div>

+ 39 - 0
app/report/templates/report/_t8p.html
Просмотреть файл 

@@ -0,0 +1,39 @@
1 
+ <div class="overflow-x-auto">
2 
+    <table class="table-auto border-collapse border border-black w-full text-sm text-center">
3 
+      <thead>
4 
+        <tr>
5 
+          <th class="border border-black px-4 py-2" rowspan="2">No.</th>
6 
+          <th class="border border-black px-4 py-2" rowspan="2">Inspection item<br>検査項目</th>
7 
+          <th class="border border-black px-4 py-2" rowspan="2">Standard<br>規格</th>
8 
+          <th class="border border-black px-4 py-2" colspan="8">Actual (mm)<br>実測値（ミリ）</th>
9 
+          <th class="border border-black px-4 py-2" rowspan="2">T. deviation<br>T.偏差</th>
10 
+        </tr>
11 
+        <tr>
12 
+          <th class="border border-black px-4 py-2">1</th>
13 
+          <th class="border border-black px-4 py-2">2</th>
14 
+          <th class="border border-black px-4 py-2">3</th>
15 
+          <th class="border border-black px-4 py-2">4</th>
16 
+          <th class="border border-black px-4 py-2">5</th>
17 
+          <th class="border border-black px-4 py-2">6</th>
18 
+          <th class="border border-black px-4 py-2">7</th>
19 
+          <th class="border border-black px-4 py-2">8</th>
20 
+        </tr>
21 
+      </thead>
22 
+      <tbody>
23 
+        <tr>
24 
+          <td class="border border-black px-4 py-2">No.1</td>
25 
+          <td class="border border-black px-4 py-2">Thickness(mm)<br>厚さ（ミリ）</td>
26 
+          <td class="border border-black px-4 py-2">20.00 +0.15,-0.00</td>
27 
+          <td class="border border-black px-4 py-2">20.09</td>
28 
+          <td class="border border-black px-4 py-2">20.08</td>
29 
+          <td class="border border-black px-4 py-2">20.09</td>
30 
+          <td class="border border-black px-4 py-2">20.09</td>
31 
+          <td class="border border-black px-4 py-2">20.09</td>
32 
+          <td class="border border-black px-4 py-2">20.10</td>
33 
+          <td class="border border-black px-4 py-2">20.09</td>
34 
+          <td class="border border-black px-4 py-2">20.09</td>
35 
+          <td class="border border-black px-4 py-2">0.02</td>
36 
+        </tr>
37 
+      </tbody>
38 
+    </table>
39 
+  </div>

+ 65 - 1
app/report/templates/report/coi.html
Просмотреть файл 

@@ -16,7 +16,7 @@
16 16 
     </div>
17 17 
     <div class="flex items-center gap-2 mb-4">
18 18 
       <label for="lot-number" class="text-gray-700 font-medium">Lot No. :</label>
19 
-      <input id="lot-number" type="text" class="border border-gray-300 rounded px-4 py-2 focus:outline-blue-500" placeholder="Enter Lot No." name='lot_no'>
19 
+      <input id="lot-number" type="text" class="border border-gray-300 rounded px-4 py-2 focus:outline-blue-500" placeholder="Enter Lot No." name='lot_no' required>
20 20 
       <button class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" type="submit" name="search_lot">
21 21 
         🔍
22 22 
       </button>
 
@@ -64,5 +64,69 @@
64 64 
       </button>
65 65 
     </div>
66 66 
   </form>
67 
+  {{ result }}
68 
+
69 
+  <div class="bg-white shadow-md rounded-md p-4">
70 
+
71 
+                <table class="w-full text-left border-collapse border border-gray-300">
72 
+                    <tbody>
73 
+                        <tr class="bg-blue-100">
74 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Product Code :</td>
75 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ result.PRO1 }}</td>
76 
+                        </tr>
77 
+                        <tr>
78 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Lot No. :</td>
79 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ result.PRO2 }}</td>
80 
+                        </tr>
81 
+                        <tr class="bg-blue-100">
82 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Customer :</td>
83 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ result.PRO1C }}</td>
84 
+                        </tr>
85 
+                        <tr>
86 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Pcs. :</td>
87 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ pcs }}</td>
88 
+                        </tr>
89 
+                        <tr class="bg-blue-100">
90 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Shape | Size :</td>
91 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ size_str }}</td>
92 
+                        </tr>
93 
+                        <tr>
94 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Specification :</td>
95 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">{{ spec }}</td>
96 
+                        </tr>
97 
+                        <tr class="bg-blue-100">
98 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Inspection Date :</td>
99 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700">22/06/2024</td>
100 
+                        </tr>
101 
+                        <tr>
102 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Inspection Indicate1 :</td>
103 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700"></td>
104 
+                        </tr>
105 
+                        <tr class="bg-blue-100">
106 
+                            <td class="border border-gray-300 px-4 py-2 font-medium text-gray-700">Inspection Indicate2 :</td>
107 
+                            <td class="border border-gray-300 px-4 py-2 text-gray-700"></td>
108 
+                        </tr>
109 
+                    </tbody>
110 
+                </table>
111 
+                    </div>
67 112 
 </div>
113 
+{% include "report/_hardnessout.html" %}
114 
+<div class="border-t border-gray-300 my-4"></div>
115 
+{% include "report/_hardness_outin.html" %}
116 
+<div class="border-t border-gray-300 my-4"></div>
117 
+{% include "report/_hardnessboth.html" %}
118 
+<div class="border-t border-gray-300 my-4"></div>
119 
+{% include "report/_dimen.html" %}
120 
+<div class="border-t border-gray-300 my-4"></div>
121 
+{% include "report/_dimen_app.html" %}
122 
+<div class="border-t border-gray-300 my-4"></div>
123 
+{% include "report/_dimen_bal.html" %}
124 
+<div class="border-t border-gray-300 my-4"></div>
125 
+{% include "report/_dim_bl_app_hard.html" %}
126 
+<div class="border-t border-gray-300 my-4"></div>
127 
+{% include "report/_dim_bal_app_rot_hard.html" %}
128 
+<div class="border-t border-gray-300 my-4"></div>
129 
+{% include "report/_t8p.html" %}
130 
+<div class="border-t border-gray-300 my-4"></div>
131 
+{% include "report/_cen.html" %}
68 132 
 {% endblock %}

+ 18 - 1
app/report/views.py
Просмотреть файл 

@@ -3,11 +3,12 @@ from django.core.paginator import Paginator
3 3 
 from django.contrib import messages
4 4 
 from core.models import Report
5 5 
 from core.forms import ReportForm
6 
-from core.utils import ConfigurableCRUDView
6 
+from core.utils import ConfigurableCRUDView, queryFromMaster
7 7 
 from .filters import ReportFilter
8 8 
 from .forms import ExportOptionsForm
9 9 
 from pprint import pprint
10 10
11 
+
11 12 
 def index(request):
12 13 
     reports = Report.objects.all()
13 14 
     report_filter = ReportFilter(request.GET, queryset=reports)
 
@@ -60,6 +61,22 @@ class ReportCRUDView(ConfigurableCRUDView):
60 61 
 def coi_view(request):
61 62 
     pprint(f"xxxx method = xxx {request.method}")
62 63 
     if request.method == "POST":
64 
+        if 'search_lot' in request.POST:
65 
+            lot_no = request.POST.get('lot_no', None)
66 
+            if lot_no:
67 
+                results = queryFromMaster(lot_no)
68 
+                first_result = results[0] if results else None
69 
+                try:
70 
+                    pcs = int(first_result.PRO5) - int(first_result.PRO27)
71 
+                except:
72 
+                    pcs = 0
73 
+                size_str = f"{first_result.PRO10}x{first_result.PRO11}x{first_result.PRO12}";
74 
+                spec = f"{first_result.PRO13} {first_result.PRO14} {first_result.PRO15} {first_result.PRO16} {first_result.PRO17} {first_result.PRO18}"
75 
+                return render(request, 'report/coi.html', {'result': first_result,
76 
+                                                           'pcs':pcs,
77 
+                                                           'size_str': size_str,
78 
+                                                           'spec': spec})
79 
+
63 80 
         exports = request.POST.getlist("exports")  # Retrieve the list of selected values
64 81 
         pprint(f"Selected Export Options: {exports}")
65 82 
         messages.success(request, "Request Sent")

tum/farmster2 - Gogs: Simplico Git Service
Ana Sayfa Keşfet Yardım
Giriş Yap
tum
/
farmster2
İzle 1
Yıldızla 0
Çatalla 0
Kod Sorunlar 0 Değişiklik İstekleri 0 İşlemeler 2 Sürümler 0 Wiki

Açıklama Yok

Dal: master
Dallar Biçim İmleri
farmster2
/
tsconfig.app...

tsconfig.app.json 287B
Kalıcı Bağlantı Geçmiş Ham

12345678910111213141516 
  1. /* To learn more about this file see: https://angular.io/config/tsconfig. */
    2. 

  2. {
    3. 

  3.   "extends": "./tsconfig.json",
    4. 

  4.   "compilerOptions": {
    5. 

  5.     "outDir": "./out-tsc/app",
    6. 

  6.     "types": []
    7. 

  7.   },
    8. 

  8.   "files": [
    9. 

  9.     "src/main.ts",
    10. 

  10.     "src/polyfills.ts"
    11. 

  11.   ],
    12. 

  12.   "include": [
    13. 

  13.     "src/**/*.d.ts"
    14. 

  14.   ]
    15. 

  15. }
    16. 

  16.