diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
index fa61389e1..86346118b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
@@ -356,10 +356,10 @@ public class FeedingServiceImpl implements FeedingService {
break;
}
JSONObject map = new JSONObject();
- map.put("flag", "1");
+ map.put("flag", "4");
map.put("reging_id", reging_id);
map.put("point_location", cool_jo.getString("point_location"));
- //只找出箱点位
+ //只找入箱点位
map.put("point_type", "5");
JSONObject pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
index 665ec1b48..423409657 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
@@ -299,13 +299,14 @@
AND IFNULL(po.material_code,'') = ''
AND po.region_id = 输入.reging_id
AND po.point_location = 输入.point_location
+ AND po.point_type = 输入.point_type
AND NOT EXISTS (
SELECT
*
FROM
sch_base_task
WHERE
- ( point_code2 = point_code OR point_code4 = point_code )
+ (point_code1 = point_code OR point_code2 = point_code OR point_code4 = point_code )
AND task_status < '07'
AND is_delete = '0'
)
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
index 3c22b8385..f74410606 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
@@ -92,6 +92,11 @@ public class PointDto implements Serializable {
*/
private String vehicle_code;
+ /**
+ * 载具编码
+ */
+ private String material_code;
+
/**
* 载具数量
*/
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 87c38efc6..515930625 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -134,7 +134,7 @@
@change="hand"
/>
-
+
@@ -199,16 +199,16 @@
>
仓位同步
-->
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
@@ -366,7 +373,26 @@ import pagination from '@crud/Pagination'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
-const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+const defaultForm = {
+ point_id: null,
+ point_code: null,
+ material_code: null,
+ point_name: null,
+ point_type: null,
+ point_status: null,
+ lock_type: '1',
+ vehicle_code: null,
+ source_id: null,
+ remark: null,
+ is_used: null,
+ is_delete: null,
+ create_id: null,
+ create_name: null,
+ create_time: null,
+ update_optid: null,
+ update_optname: null,
+ update_time: null
+}
export default {
name: 'Point',
dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
@@ -483,7 +509,9 @@ export default {
this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag)
}
- if (flag === 1) { this.crud.toQuery() }
+ if (flag === 1) {
+ this.crud.toQuery()
+ }
},
getPointStatusList(id, flag) {
debugger