lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyongde
2024-06-19 18:10:05 +08:00
parent 10c682623c 71d7737f3a
commit 273f81fca5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java
View File

@@ -210,8 +210,9 @@ public class TaskUtils {
* @return * @return
*/ */
public static int convertMultiply(String needFullNumberStr) { public static int convertMultiply(String needFullNumberStr) {
String trim = needFullNumberStr.trim();
// 使用 "*" 来分割字符串 // 使用 "*" 来分割字符串
String[] parts = needFullNumberStr.split("\\*"); String[] parts = trim.split("\\*");
// 初始化结果为1 // 初始化结果为1
int result = 1; int result = 1;
for (String part : parts) { for (String part : parts) {

6
lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue
View File

@@ -29,11 +29,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="forder_NO" label="订单号" width="160" /> <el-table-column prop="forder_NO" label="订单号" width="160" />
<el-table-column prop="fsale_NO" label="客户" width="160" />
<el-table-column prop="fmatspec" label="物料规格" width="160" />
<el-table-column prop="forder_SUBNUM" label="订单数量" width="160" /> <el-table-column prop="forder_SUBNUM" label="订单数量" width="160" />
<el-table-column prop="guadansum" label="订单已挂单数量" width="160" /> <el-table-column prop="guadansum" label="订单已挂单数量" width="160" />
<el-table-column label="所需数量" width="160" > <el-table-column label="所需数量" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.forder_SUBNUM - scope.row.guadansum}} {{ scope.row.forder_SUBNUM - scope.row.guadansum }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="fmaterial_NAME" label="物料名称" width="180" show-overflow-tooltip /> <el-table-column prop="fmaterial_NAME" label="物料名称" width="180" show-overflow-tooltip />