mdf:修改组盘为混料

nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java

@@ -56,7 +56,7 @@ public class GroupController {
 
     @PostMapping
     @Log("新增组盘组盘")
-    public ResponseEntity<Object> create(@RequestBody JSONObject group) {
+    public ResponseEntity<Object> createSingle(@RequestBody JSONObject group) {
         Assert.noNullElements(new Object[]{group,group.get("material_id"),group.get("storagevehicle_code"),group.get("qty")},"请求参数不能为空");
         GroupPlate groupPlate = group.toJavaObject(GroupPlate.class);
         String storagevehicleCode = groupPlate.getStoragevehicle_code();

nladmin-ui/src/views/wms/basedata/group/AddDialog.vue

@@ -22,7 +22,7 @@
     </el-row>
 
     <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
-      <el-form-item label="载具编码" prop="bill_code">
+      <el-form-item label="载具编码" prop="storagevehicle_code">
         <label slot="label">载具编码:</label>
         <el-input v-model="form.storagevehicle_code" clearable style="width: 210px" />
       </el-form-item>
@@ -104,12 +104,12 @@
       <el-table-column show-overflow-tooltip width="260" prop="material_spec" label="物料规格" />
       <el-table-column show-overflow-tooltip width="180" prop="pcsn" label="批次号">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.pcsn" style="width: 150px;" ></el-input>
+          <el-input v-model="scope.row.pcsn" style="width: 150px;" />
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip width="180" prop="qty" label="数量">
         <template slot-scope="scope">
-          <el-input-number v-model="scope.row.qty" style="width: 150px;" ></el-input-number>
+          <el-input-number v-model="scope.row.qty" style="width: 150px;" />
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip width="150" prop="qty_unit_name" label="计量单位名称" />
@@ -126,7 +126,7 @@
       </el-table-column>
     </el-table>
 
-    <MaterialDialog :dialog-show.sync="dtlShow" :is-Single.sync="isSingle" @materialChoose="materialChoose" />
+    <MaterialDialog :dialog-show.sync="dtlShow" :is-single.sync="isSingle" @materialChoose="materialChoose" />
 
   </el-dialog>
 </template>
@@ -143,8 +143,6 @@ const defaultForm = {
   status: '10',
   ext_type: '0',
   remark: '',
-  biz_date: new Date(),
-  create_mode: '',
   tableData: []
 }
 
@@ -177,12 +175,6 @@ export default {
       rules: {
         storagevehicle_code: [
           { required: true, message: '载具不能为空', trigger: 'blur' }
-        ],
-        bill_type: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
-        ],
-        biz_date: [
-          { required: true, message: '业务日期不能为空', trigger: 'blur' }
         ]
       }
     }
@@ -239,10 +231,6 @@ export default {
     },
     materialChoose(row) {
       this.form.tableData = row
-      // this.form.tableData.material_name = row.material_name
-      // this.form.material_id = row.material_id
-      // this.form.material_code = row.material_code
-      // this.form.material_spec = row.material_spec
     },
     async insertEvent(row) {
       this.dtlShow = true