Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java

@@ -136,7 +136,7 @@ public class ProductInstorServiceImpl implements ProductInstorService {
         mst_jo.put("stor_name", stor.getString("stor_name"));
         mst_jo.put("detail_count", box_rows.size());
         mst_jo.put("total_qty", "0");
-        mst_jo.put("bill_status", "30");
+        mst_jo.put("bill_status", "10"); // 生成
         String iostorinv_id = "";
 
         //查询该木箱是否存在未完成的入库单

lms/nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -222,7 +222,7 @@
         <el-table-column label="制单时间" align="center" prop="input_time" width="150" />
         <el-table-column label="修改人" align="center" prop="update_optname" />
         <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
-        <el-table-column label="分配人" align="center" prop="dis_optname" />
+        <el-table-column label="分配人" align="center" prop="dis_optname" width="140px" />
         <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
         <el-table-column label="确认人" align="center" prop="confirm_optname" width="150" />
         <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />

lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -633,7 +633,7 @@ export default {
         'iostorinv_id': this.mstrow.iostorinv_id
       }
       checkoutbill.allSetPoint(data).then(res => {
-        this.queryTableDdis(this.currentRow.iostorinvdtl_id)
+        // this.queryTableDdis(this.currentRow.iostorinvdtl_id)
         this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
         this.loadingSetAllPoint = false
       }).catch(() => {