Merge remote-tracking branch 'origin/master'

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

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

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

@@ -29,11 +29,13 @@
         </template>
       </el-table-column>
       <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="guadansum" label="订单已挂单数量" width="160" />
-      <el-table-column label="所需数量" width="160" >
+      <el-table-column label="所需数量" width="160">
         <template slot-scope="scope">
-          {{scope.row.forder_SUBNUM - scope.row.guadansum}}
+          {{ scope.row.forder_SUBNUM - scope.row.guadansum }}
         </template>
       </el-table-column>
       <el-table-column prop="fmaterial_NAME" label="物料名称" width="180" show-overflow-tooltip />