diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java index f2f2bd57..2d52c679 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java @@ -460,6 +460,7 @@ public class WmsToErpServiceImpl implements WmsToErpService { jo.put("input_optid", SecurityUtils.getCurrentUserId()); jo.put("input_optname", SecurityUtils.getNickName()); jo.put("input_time", DateUtil.now()); + jo.put("proc_status", "01"); try { otherPorc.insert(jo); } catch (Exception e) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql index dbf7463c..a3253ae9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql @@ -118,7 +118,7 @@ FROM V_HHL_OTHERS_IN_VIEW pp WHERE - 1=1 + DR = '0' ENDSELECT ENDQUERY ENDIF diff --git a/mes/qd/src/views/wms/pcs/otherorderproc/importOrder.vue b/mes/qd/src/views/wms/pcs/otherorderproc/importOrder.vue index 4b737e55..8d6df053 100644 --- a/mes/qd/src/views/wms/pcs/otherorderproc/importOrder.vue +++ b/mes/qd/src/views/wms/pcs/otherorderproc/importOrder.vue @@ -32,7 +32,7 @@ import CRUD, { header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' import DateRangePicker from '@/components/DateRangePicker/index' -import crudOrderproc from "@/api/wms/pcs/orderproc"; +import crudOrderproc from '@/api/wms/pcs/otherorderproc' export default { name: 'importOrder', diff --git a/mes/qd/src/views/wms/pcs/otherorderproc/index.vue b/mes/qd/src/views/wms/pcs/otherorderproc/index.vue index f87ca0c5..07aaf97f 100644 --- a/mes/qd/src/views/wms/pcs/otherorderproc/index.vue +++ b/mes/qd/src/views/wms/pcs/otherorderproc/index.vue @@ -109,6 +109,7 @@ + @@ -140,7 +141,7 @@ import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import importOrder from '@/views/wms/pcs/orderproc/importOrder' +import importOrder from '@/views/wms/pcs/otherorderproc/importOrder.vue' import DateRangePicker from '@/components/DateRangePicker' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css'