| jcdm-main/src/main/java/com/jcdm/main/bs/material/service/IBsMaterialInfoService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/router/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/formula/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/formulaChild/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/material/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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 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 ++; } 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> 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' } 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> 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(); }, 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"/>
