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

2022-12-13 11:08:58 +08:00
parent 7ac4f0c84a e0f1decfda
commit efdcbfda0a
8 changed files with 65 additions and 4 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/BakingController.java
@@ -31,6 +31,13 @@ public class BakingController {
        return new ResponseEntity<>(bakingService.ovenInAndOut(whereJson),HttpStatus.OK);
    }

+    @PostMapping("/query")
+    @Log("查询")
+    @ApiOperation("查询")
+    public ResponseEntity<Object> query(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(bakingService.query(whereJson),HttpStatus.OK);
+    }
+
    @PostMapping("/inCoolIvt")
    @Log("入冷却")
    @ApiOperation("入冷却")
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/BakingService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/BakingService.java
@@ -21,4 +21,5 @@ public interface BakingService {
    JSONObject release(JSONObject whereJson);


+    JSONObject query(JSONObject whereJson);
 }
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
@@ -472,4 +472,35 @@ public class BakingServiceImpl implements BakingService {
    public JSONObject release(JSONObject whereJson) {
        return null;
    }
+
+    @Override
+    public JSONObject query(JSONObject whereJson) {
+        WQLObject coolIvtTab = WQLObject.getWQLObject("ST_IVT_CoolPointIvt");
+        WQLObject hotIvtTab = WQLObject.getWQLObject("ST_IVT_HotPointIvt");
+        WQLObject pointIvtTab = WQLObject.getWQLObject("sch_base_point");
+
+        String point_code = whereJson.getString("point_code");
+        JSONObject json = new JSONObject();
+
+        JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(jsonCool.getString("container_name"))) {
+            json.put("container_name", jsonCool.getString("container_name"));
+        } else {
+            JSONObject jsonHot = hotIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0);
+            if (ObjectUtil.isNotEmpty(jsonHot.getString("container_name"))) {
+                json.put("container_name", jsonHot.getString("container_name"));
+            } else {
+                JSONObject jsonPoint = pointIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0);
+                if (ObjectUtil.isNotEmpty(jsonPoint.getString("material_code"))) {
+                    json.put("container_name", jsonPoint.getString("material_code"));
+                } else {
+                    json.put("container_name", "");
+                }
+            }
+        }
+        JSONObject result = new JSONObject();
+        result.put("data",json);
+        result.put("message","操作成功！");
+        return result;
+    }
 }
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java
@@ -56,7 +56,7 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
        String option = whereJson.getString("option");
        JSONObject point_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '"+point_code+"'").uniqueResult(0);
        if (ObjectUtil.isEmpty(point_jo)){
-            throw new BadRequestException("未查询到对应的点位设备！");
+            throw new BadRequestException("空轴点位不存在！");
        }
        if (option.equals("0")){
            point_jo.put("empty_vehicle_code","");
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql
@@ -89,6 +89,7 @@

                OPTION 输入.search <> ""
                    (vehicle_code like 输入.search or
+                     vehicle_code2 like 输入.search or
                     point_code1 like 输入.search or
                     point_code2 like 输入.search or
                     point_code3 like 输入.search or
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java
@@ -47,6 +47,7 @@ public class HotPointIvtServiceImpl implements HotPointIvtService {
        map.put("is_used", whereJson.get("is_used"));
        map.put("begin_time", whereJson.get("begin_time"));
        map.put("end_time", whereJson.get("end_time"));
+        map.put("point_location", whereJson.get("point_location"));

        JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code");
        return json;
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_HOTPOINTIVT.wql
@@ -26,6 +26,7 @@
 	输入.task_code			                TYPEAS s_string
 	输入.start_point_code			        TYPEAS s_string
 	输入.next_point_code			            TYPEAS s_string
+	输入.point_location			            TYPEAS s_string


 [临时表]
@@ -57,6 +58,9 @@
                st_ivt_hotpointivt hot
            WHERE
                1=1
+                OPTION 输入.point_location <> ""
+                    point_location = 输入.point_location
+                ENDOPTION
                OPTION 输入.point_code <> ""
                    point_code LIKE 输入.point_code
                ENDOPTION
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/pointIvt.vue
@@ -65,6 +65,22 @@
              @change="hand"
            />
          </el-form-item>
+          <el-form-item label="生产位置">
+            <el-select
+              v-model="query.point_location"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+            >
+              <el-option
+                v-for="item in dict.point_location"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
          <el-form-item label="入箱时间">
            <el-date-picker
              v-model="query.createTime"
@@ -137,7 +153,7 @@
      <!--表格渲染-->
      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
        <el-table-column type="selection" width="55" />
-        <el-table-column prop="point_code" width="100" label="点位编码" />
+        <el-table-column prop="point_code" width="160px" show-overflow-tooltip label="点位编码" />
        <el-table-column prop="point_status" label="点位状态">
          <template slot-scope="scope">
            {{ dict.label.sch_hot_point_status[scope.row.point_status] }}
@@ -148,11 +164,11 @@
            {{ dict.label.is_used[scope.row.is_used] }}
          </template>
        </el-table-column>
-        <el-table-column prop="container_name" label="母卷号" />
+        <el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip />
        <el-table-column prop="full_vehicle_code" label="母卷轴编码" min-width="100" show-overflow-tooltip />
        <el-table-column prop="pcsn" label="批次" />
        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
-        <el-table-column prop="instorage_time" label="入箱时间" />
+        <el-table-column prop="instorage_time" label="入箱时间" width="150px" show-overflow-tooltip />
        <el-table-column prop="product_area" label="生产区域">
          <template slot-scope="scope">
            {{ dict.label.product_area[scope.row.product_area] }}