From 9562e6b8a5d1b703681074927efbd602b9f48108 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 16 一月 2024 13:50:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/bs/formula/index.vue | 2
jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java | 2
jcdm-ui/src/views/main/bs/material/index.vue | 18 ++++----
jcdm-ui/src/router/index.js | 2
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 31 ++++++++-------
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 11 +++++
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 2
7 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java
index 33f18f0..9740a82 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java
@@ -5,7 +5,7 @@
import java.util.List;
/**
- * 鐗╂枡淇℃伅Service鎺ュ彛
+ * Service鎺ュ彛
*
* @author yyt
* @date 2023-12-09
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 f74c05a..9fd7ff5 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
@@ -1,5 +1,8 @@
package com.jcdm.main.om.productionOrde.controller;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -97,6 +100,12 @@
@PostMapping("/orderSchedulingForBoxCode")
public AjaxResult addOrderSchedulingForBoxCode(@RequestBody OmProductionOrdeInfo omProductionOrdeInfo)
{
+ //鑾峰彇褰撳墠鏃堕棿
+ LocalDateTime date= LocalDateTime.now();
+ //鍒涘缓鏃ユ湡鏃堕棿瀵硅薄鏍煎紡鍖栧櫒锛屾棩鏈熸牸寮忕被浼硷細 2023-05-23 22:18:38
+ DateTimeFormatter formatter= DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ //灏嗘椂闂磋浆鍖栦负瀵瑰簲鏍煎紡鐨勫瓧绗︿覆
+ String fomateDate=date.format(formatter).toString();
Integer startCode = Integer.parseInt(omProductionOrdeInfo.getStartCode());//寮�濮嬬紪鍙�
Integer planQty = Math.toIntExact(omProductionOrdeInfo.getPlanQty());//璁″垝鏁伴噺
String dateTimeRule = omProductionOrdeInfo.getDateTimeRule();
@@ -108,7 +117,7 @@
bsOrderScheduling.setEngineNo(omProductionOrdeInfo.getTypeZ() + " "+dateTimeRule+ StringUtils.leftPad(String.valueOf(startCode),3, "0"));
bsOrderScheduling.setProductionStatus("1");
bsOrderScheduling.setOperator(getUserName());
-// bsOrderScheduling.setOperateTime(String.valueOf(new Date()));
+ bsOrderScheduling.setOperateTime(fomateDate);
bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling);
startCode ++;
}
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
index 96d6d33..4810be1 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -41,7 +41,7 @@
<if test="processesCode != null and processesCode != ''"> and processes_code like concat('%', #{processesCode}, '%')</if>
<if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
<if test="operationType != null and operationType != ''"> and operation_type like concat('%', #{operationType}, '%')</if>
- <if test="formulaCode != null and formulaCode != ''"> and formula_code like concat('%', #{formulaCode}, '%')</if>
+ <if test="formulaCode != null and formulaCode != ''"> and formula_code = #{formulaCode}</if>
</where>
</select>
diff --git a/jcdm-ui/src/router/index.js b/jcdm-ui/src/router/index.js
index d89fed5..f1a20fa 100644
--- a/jcdm-ui/src/router/index.js
+++ b/jcdm-ui/src/router/index.js
@@ -141,7 +141,7 @@
permissions: ['bs:formulaChild:list'],
children: [
{
- path: 'index/:formulaCode(\\d+)',
+ path: 'index',
component: () => import('@/views/main/bs/formulaChild/index'),
name: 'Data',
meta: { title: '閰嶆柟璇︽儏', activeMenu: '/main/bs/formulaChild' }
diff --git a/jcdm-ui/src/views/main/bs/formula/index.vue b/jcdm-ui/src/views/main/bs/formula/index.vue
index f64e24a..7eb5ac7 100644
--- a/jcdm-ui/src/views/main/bs/formula/index.vue
+++ b/jcdm-ui/src/views/main/bs/formula/index.vue
@@ -96,7 +96,7 @@
<!-- </el-table-column>-->
<el-table-column label="閰嶆柟缂栫爜" width="130" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
- <router-link :to="'/main/formula-data/index/' + scope.row.formulaCode" class="link-type">
+ <router-link :to="{path: '/main/formula-data/index/', query: {formulaCode: scope.row.formulaCode }}" class="link-type">
<span>{{ scope.row.formulaCode }}</span>
</router-link>
</template>
diff --git a/jcdm-ui/src/views/main/bs/formulaChild/index.vue b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
index 864b4eb..4134b5e 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -148,29 +148,31 @@
</el-table-column>
<el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
</el-table-column>
- <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
+<!-- <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
+ </el-table-column>-->
+ <el-table-column label="鎺掑簭" width="90" align="center" prop="stepSort">
</el-table-column>
- <el-table-column label="鎶�鏈姹�" width="150" :show-overflow-tooltip='true' align="center" prop="techRequirement">
+ <el-table-column label="鎶�鏈姹�" width="380" :show-overflow-tooltip='true' align="center" prop="techRequirement">
+ </el-table-column>
+ <el-table-column label="鍥剧墖" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-image-->
+ <!-- style="width: 100px; height: 100px"-->
+ <!-- :src="pjtUrl+scope.row.picture"-->
+ <!-- :fit="fit">-->
+ <!-- </el-image>-->
+ <!-- </template>-->
</el-table-column>
<el-table-column label="绫诲瀷" width="90" align="center" prop="operationType">
</el-table-column>
- <el-table-column label="鎺掑簭" width="90" align="center" prop="stepSort">
- </el-table-column>
+
<el-table-column label="鍙傛暟缂栫爜" width="130" align="center" prop="paramCode">
</el-table-column>
<el-table-column label="鐗╂枡缂栫爜" width="130" align="center" prop="materialCode">
</el-table-column>
<el-table-column label="閰嶆柟缂栫爜" width="130" align="center" prop="formulaCode">
</el-table-column>
- <el-table-column label="鍥剧墖" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
-<!-- <template slot-scope="scope">-->
-<!-- <el-image-->
-<!-- style="width: 100px; height: 100px"-->
-<!-- :src="pjtUrl+scope.row.picture"-->
-<!-- :fit="fit">-->
-<!-- </el-image>-->
-<!-- </template>-->
- </el-table-column>
+
<el-table-column label="澶囨敞" width="130" align="center" prop="remarks">
</el-table-column>
<el-table-column label="鍒涘缓鐢ㄦ埛" width="130" align="center" prop="createUser">
@@ -363,9 +365,10 @@
};
},
created() {
- const formulaCode = this.$route.params && this.$route.params.formulaCode;
+ let formulaCode = this.$route.query.formulaCode;
this.queryParams.formulaCode = formulaCode;
this.formulaCode = formulaCode;
+ this.form.formulaCode = formulaCode;
this.headerInformation();
this.getList();
},
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index ad04c8e..7e35df9 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -85,23 +85,23 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鐗╂枡缂栧彿" align="center" prop="materialCode" width="180">
</el-table-column>
- <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName" width="250">
+ <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName" width="220">
</el-table-column>
- <el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
+<!-- <el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
+ </el-table-column>-->
+
+ <el-table-column label="杞﹀瀷" align="center" prop="carType" width="120">
</el-table-column>
- <el-table-column label="鐗规畩浠ｇ爜" align="center" prop="mark" width="180">
- </el-table-column>
- <el-table-column label="杞﹀瀷" align="center" prop="carType" width="180">
- </el-table-column>
- <el-table-column label="绫诲瀷" align="center" prop="typeL">
+ <el-table-column label="鐗╂枡绫诲瀷" align="center" prop="typeL">
<template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
</template>
</el-table-column>
- <el-table-column label="鍨嬪彿" align="center" prop="typeZ" width="180">
+ <el-table-column label="浜у搧鍨嬪彿" align="center" prop="typeZ" width="150">
</el-table-column>
-
+ <el-table-column label="鐗规畩浠ｇ爜" align="center" prop="mark" width="120">
+ </el-table-column>
<el-table-column label="鍗曚綅" align="center" prop="unit" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
--
Gitblit v1.9.3