someupdate

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -142,7 +142,7 @@
                                         :data="data2"
                                         :columns="columns2"
                                         :max-height="200"
-                                        style="width: 500px"
+                                        style="width: 680px"
                                         highlight-row
                                         @on-current-change="handleRowChange1"
                                     ></Table>
@@ -316,18 +316,30 @@ export default {
                     },
                     width: 70,
                 },
+                 {
+                    title: "仓库",
+                    key: "wavehouse",
+                     width: 70,
+                },
                 {
-                    title: "储位编号",
+                    title: "储位",
                     key: "locationid",
+                     width: 70,
                 },
                 {
                     title: "工装编号",
                     key: "code",
+                     width: 160,
                 },
                 {
                     title: "工件编号",
                     key: "materialsn",
                 },
+                 {
+                    title: "下一工序",
+                    key: "route",
+                     width: 100,
+                },
             ],
             data2: [],
             orderDetail: {},

Server/Apis/Siger.ApiACC/Controllers/AutomationController.cs

@@ -619,6 +619,7 @@ namespace Siger.ApiACC.Controllers
                 if (fullAllMachine.Any() && cleanMachine.status == (int)Automation.MachineStatus.Waiting)
                 {
                     Logger.WriteLineError($"AutoProcess 清洗机空闲，创建普通设备下料到清洗机Task ");
+
                     //清洗机上料 为 任务触发 触发
                     if (tasklist != null && fullAllMachine.Where(p => p.section == tasklist.sectionid).Any())
                     {

Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs

@@ -151,7 +151,7 @@ namespace Siger.ApiACC.Controllers
             {
                 OrderNumber = monitor!=null? monitor.ordercode:"",
                 FixtureGuid = monitor != null ? monitor.fixtureguid:"",
-                FixtureName = monitor != null ? monitor.fixturename:"",
+                FixtureCode = monitor != null ? monitor.fixturename:"",
                 ProductCode = monitor != null ? monitor.productcode:"",
                 ProductName = monitor != null ? monitor.productname:"",
                 Sn = monitor != null ? monitor.sn:"",
@@ -397,6 +397,7 @@ namespace Siger.ApiACC.Controllers
                  fixturename=fixtureToolsObj.FixtureCode,
                  locationid=fixtureToolsObj.Location,
                  productcode=plan.product_code,
+                 productname=plan.product_name,
                  processid=0,
                  programnumber="",
                  remark ="手动任务-准备上料",