From e0a2b80807cc52e80bf632adba9cfcb6357025aa Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 02 二月 2024 08:36:58 +0800
Subject: [PATCH] 配瓦规则颜色设置
---
jcdm-main/src/main/java/com/jcdm/main/webservice/domain/Item.java | 2 +-
jcdm-ui/src/views/main/om/productionOrde/index.vue | 13 ++++++++-----
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 2 +-
jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java | 3 ++-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index 3357f1e..4e82039 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -100,7 +100,7 @@
}
/**
- * 鏂板鐢熶骇宸ュ崟
+ * 鐢熸垚鎸夐挳
*/
@PostMapping("/orderSchedulingForBoxCode")
public AjaxResult addOrderSchedulingForBoxCode(@RequestBody OmProductionOrdeInfo omProductionOrdeInfo)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/webservice/domain/Item.java b/jcdm-main/src/main/java/com/jcdm/main/webservice/domain/Item.java
index a50837b..244e13f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/webservice/domain/Item.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/webservice/domain/Item.java
@@ -11,7 +11,7 @@
private String WERKS;
private String LGORT;
private String ZHTH;
- private String GSTRP;
+ private Date GSTRP;
private String AUFNR;
private String PSMNG;
private String DISPO;
diff --git a/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java b/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
index 7bcd85e..3064159 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
@@ -120,7 +120,8 @@
ordeInfo.setProductionNotice(item.getZSCTZD());
ordeInfo.setTypeZ(item.getFERTH());
ordeInfo.setCreateUser(item.getZUSER());
- ordeInfo.setCreateTime(item.getZDATE());
+ //ordeInfo.setCreateTime(item.getZDATE());
+ ordeInfo.setDemandDate(item.getGSTRP());//寮�宸ユ棩鏈�
omProductionOrdeInfoService.insertOmProductionOrdeInfo(ordeInfo);
}
}
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 50e3228..5e8cb58 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -120,22 +120,25 @@
<el-table border v-loading="loading" :data="productionOrdeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鐢熶骇閫氱煡鍗曞彿" width="160" align="center" prop="productionNotice">
+ <el-table-column label="鐢熶骇閫氱煡鍗�" width="120" align="center" prop="productionNotice">
</el-table-column>
- <el-table-column label="鐢熶骇璁㈠崟" width="160" align="center">
+ <el-table-column label="鐢熶骇璁㈠崟" width="140" align="center">
<template slot-scope="scope">
<router-link :to="{path: '/main/orderScheduling-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
<span>{{ scope.row.workOrderNo }}</span>
</router-link>
</template>
</el-table-column>
- <el-table-column label="鏈哄瀷" width="160" align="center" prop="typeZ">
+ <el-table-column label="鏈哄瀷" width="100" align="center" prop="typeZ">
</el-table-column>
<el-table-column label="闇�姹傛暟閲�" align="center" prop="planQty">
</el-table-column>
<el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
+ </el-table-column>
+
+ <el-table-column label="寮�宸ユ棩鏈�" width="120" align="center" prop="demandDate">
</el-table-column>
<el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">
@@ -147,9 +150,9 @@
<el-table-column label="浜х嚎" align="center" prop="lineCode">
</el-table-column>
- <el-table-column label="閫氱煡鍗曞埗鍗曚汉" width="80" align="center" prop="createUser">
+ <el-table-column label="鍒跺崟浜�" width="80" align="center" prop="createUser">
</el-table-column>
- <el-table-column width="160" label="閫氱煡鐢熸垚鏃ユ湡" align="center" prop="createTime">
+ <el-table-column width="160" label="鎺ユ敹鏃ユ湡" align="center" prop="createTime">
</el-table-column>
<el-table-column label="鎴愬搧鎻忚堪" width="320" align="center" prop="productName">
</el-table-column>
--
Gitblit v1.9.3