소스 검색

bug修复

andy 3 년 전
부모
커밋
b54f61b607

+ 2 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/LineCallController.java

@@ -38,6 +38,8 @@ public class LineCallController {
     public AjaxResult exec(@RequestBody LineCallForm lineCallForm) {
         List<AgvCallDTO> list = new ArrayList<>();
         AgvCallDTO agvCallDTO = new AgvCallDTO();
+        agvCallDTO.setLocationFrom(lineCallForm.getLocationFrom());
+        agvCallDTO.setLocationTo(lineCallForm.getLocationTo());
         agvCallDTO.setSku(lineCallForm.getSku());
         if (!StringUtils.isEmpty(lineCallForm.getQty())) {
             agvCallDTO.setQty(Double.parseDouble(lineCallForm.getQty()));

+ 13 - 3
ruoyi-ui/src/views/ams/lineCall/index.vue

@@ -129,7 +129,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="起点范围" prop="locationFrom">
-          <el-select style="width: 100%" v-model="form.locationFrom" placeholder="请选择供应商" clearable size="small">
+          <el-select style="width: 100%" v-model="form.locationFrom" placeholder="请选择起点范围" clearable size="small">
             <el-option
               v-for="dict in locationFromCombo"
               :key="dict.id"
@@ -139,7 +139,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="终点范围" prop="locationTo">
-          <el-select style="width: 100%" v-model="form.locationTo" placeholder="请选择供应商" clearable size="small">
+          <el-select style="width: 100%" v-model="form.locationTo" placeholder="请选择终点范围" clearable size="small">
             <el-option
               v-for="dict in locationToCombo"
               :key="dict.id"
@@ -293,7 +293,8 @@
           createTime: null,
           updateBy: null,
           updateTime: null,
-          remark: null
+          remark: null,
+          lineCallDetailsFormList: null
         };
         this.flowConfigDetailsList = [];
         this.resetForm("form");
@@ -369,6 +370,15 @@
                 }
               }
             }
+
+            let lineCallDetailsFormList = new Array();
+            for (let i = 0; i < this.flowConfigDetailsList.length; i++) {
+              let obj = new Object();
+              obj.lotattId = this.flowConfigDetailsList[i].lotattId
+              obj.lotattValue = this.flowConfigDetailsList[i].lotattValue
+              lineCallDetailsFormList.push(obj)
+            }
+            this.form.lineCallDetailsFormList = lineCallDetailsFormList
             exec(this.form).then(response => {
               if (response.code === 200) {
                 this.$modal.msgSuccess("执行成功");