root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ludj
2022-12-22 14:52:43 +08:00
parent 25162d821d
commit af89a2522b
4 changed files with 6 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
View File

@@ -192,7 +192,7 @@ public class WorkorderServiceImpl implements WorkordeService {
JSONArray orderArr = wo.query("device_id = '" + param.getString("device_id") + "' and order_status = '02'").getResultJSONArray(0);
if (ObjectUtil.isNotEmpty(orderArr)) throw new BadRequestException("当前设备正在生产中");
json.put("order_status", "02");
json.put("order_status", "2");
json.put("update_optid", currentUserId);
json.put("update_optname", nickName);
json.put("update_time", now);

2
lms/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -162,4 +162,4 @@ sa-token:
loki:
url: http://localhost:3100/loki/api/v1
systemName: lms
systemName: lms

2
lms/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -122,7 +122,7 @@ https://juejin.cn/post/6844903775631572999
<!--生产环境:打印控制台和输出到文件-->
<springProfile name="prod">
<root level="debug">
<root level="info">
<appender-ref ref="asyncFileAppender"/>
<appender-ref ref="lokiAppender"/>
</root>

74
lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
View File

@@ -84,81 +84,13 @@
</el-form>
</el-card>
<el-card class="box-card" shadow="always">
<div slot="header" class="clearfix">
<span style="font-weight: bold;font-size: 15px;">库存信息:</span>
<!-- <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
</el-form-item>
</el-form>
</el-card>
<el-card class="box-card" shadow="always">
<div slot="header" class="clearfix">
<span style="font-weight: bold;font-size: 15px;">库存信息:</span>
<!-- <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
</el-form-item>
</el-form>
</el-card>
<!--表格渲染-->
<el-card class="box-card" shadow="always">
<!--<el-card class="box-card" shadow="always">
<div slot="header" class="clearfix">
<span style="font-weight: bold;font-size: 15px;">更新记录:</span>
<!-- <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>-->
&lt;!&ndash; <el-button style="float: right; padding: 3px 10px;" type="text">操作按钮</el-button>&ndash;&gt;
</div>
<el-table
ref="table"
@@ -179,7 +111,7 @@
<el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
<el-table-column prop="nick_name" label="操作人" align="center"/>
</el-table>
</el-card>
</el-card>-->
<!--<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确定</el-button>