diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbClassstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbClassstandardController.java
new file mode 100644
index 00000000..35633865
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbClassstandardController.java
@@ -0,0 +1,20 @@
+package org.nl.wms.masterdata_manage.controller.master;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 基础数据分类标准表 前端控制器
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+@RestController
+@RequestMapping("/mdPbClassstandard")
+public class MdPbClassstandardController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbMeasureunitController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbMeasureunitController.java
new file mode 100644
index 00000000..3668e397
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbMeasureunitController.java
@@ -0,0 +1,20 @@
+package org.nl.wms.masterdata_manage.controller.master;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 计量单位表 前端控制器
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+@RestController
+@RequestMapping("/mdPbMeasureunit")
+public class MdPbMeasureunitController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/common/enums/MaterialEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/common/enums/MaterialEnum.java
new file mode 100644
index 00000000..171c4885
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/common/enums/MaterialEnum.java
@@ -0,0 +1,40 @@
+package org.nl.wms.masterdata_manage.master.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.utils.MapOf;
+import org.nl.modules.common.exception.BadRequestException;
+
+import java.util.Map;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/4 20:11
+ */
+@AllArgsConstructor
+@Getter
+public enum MaterialEnum {
+ //出入库
+ Material_QUALITY(MapOf.of("一等品","1","二等瓶","2")),
+
+ ;
+ private Map code;
+
+ public String code(String desc){
+ String code = this.getCode().get(desc);
+ if (StringUtils.isEmpty(desc)){
+ throw new BadRequestException(this.name()+"当前类型"+desc+"未定义");
+ }
+ return code;
+ }
+ public String desc(String code){
+ Map map = this.getCode();
+ for (Map.Entry entry : map.entrySet()) {
+ if (entry.getValue().equals(code)){
+ return code;
+ }
+ }
+ throw new BadRequestException(this.name()+"当前类型"+code+"未定义");
+ }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdcs.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdcs.xls
deleted file mode 100644
index 62a75564..00000000
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdcs.xls and /dev/null differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdme.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdme.xls
deleted file mode 100644
index cf19a466..00000000
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdme.xls and /dev/null differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdpb.xls
deleted file mode 100644
index 52df3b86..00000000
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/mdpb.xls and /dev/null differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbClassstandardService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbClassstandardService.java
new file mode 100644
index 00000000..39999858
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbClassstandardService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.masterdata_manage.service.master;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.masterdata_manage.service.master.dao.MdPbClassstandard;
+
+/**
+ *
+ * 基础数据分类标准表 服务类
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+public interface IMdPbClassstandardService extends IService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbMeasureunitService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbMeasureunitService.java
new file mode 100644
index 00000000..6ec231c9
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbMeasureunitService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.masterdata_manage.service.master;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
+
+/**
+ *
+ * 计量单位表 服务类
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+public interface IMdPbMeasureunitService extends IService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbClassstandard.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbClassstandard.java
new file mode 100644
index 00000000..adb46f7a
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbClassstandard.java
@@ -0,0 +1,116 @@
+package org.nl.wms.masterdata_manage.service.master.dao;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 基础数据分类标准表
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("md_pb_classstandard")
+public class MdPbClassstandard implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 分类标识
+ */
+ private String class_id;
+
+ /**
+ * 分类编码
+ */
+ private String class_code;
+
+ /**
+ * 分类长编码
+ */
+ private String long_class_code;
+
+ /**
+ * 分类名称
+ */
+ private String class_name;
+
+ /**
+ * 分类简要描述
+ */
+ private String class_desc;
+
+ /**
+ * 上级分类标识
+ */
+ private String parent_class_id;
+
+ /**
+ * 子部门数目
+ */
+ private String sub_count;
+
+ /**
+ * 是否叶子
+ */
+ private Boolean is_leaf;
+
+ /**
+ * 是否可修改
+ */
+ private Boolean is_modify;
+
+ /**
+ * 级别
+ */
+ private String class_level;
+
+ /**
+ * 外部标识
+ */
+ private String ext_id;
+
+ /**
+ * 外部上级标识
+ */
+ private String ext_parent_id;
+
+ /**
+ * 创建人
+ */
+ private String create_id;
+
+ /**
+ * 创建人姓名
+ */
+ private String create_name;
+
+ /**
+ * 创建时间
+ */
+ private LocalDateTime create_time;
+
+ /**
+ * 修改人
+ */
+ private String update_id;
+
+ /**
+ * 修改人姓名
+ */
+ private String update_name;
+
+ /**
+ * 修改时间
+ */
+ private LocalDateTime update_time;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbMeasureunit.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbMeasureunit.java
new file mode 100644
index 00000000..fcee0abb
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbMeasureunit.java
@@ -0,0 +1,88 @@
+package org.nl.wms.masterdata_manage.service.master.dao;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ *
+ * 计量单位表
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("md_pb_measureunit")
+public class MdPbMeasureunit implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 计量单位标识
+ */
+ private String measure_unit_id;
+
+ /**
+ * 编码
+ */
+ private String unit_code;
+
+ /**
+ * 名称
+ */
+ private String unit_name;
+
+ /**
+ * 数据精度
+ */
+ private BigDecimal qty_precision;
+
+ /**
+ * 是否启用
+ */
+ private Boolean is_used;
+
+ /**
+ * 创建人
+ */
+ private String create_id;
+
+ /**
+ * 创建人姓名
+ */
+ private String create_name;
+
+ /**
+ * 创建时间
+ */
+ private Date create_time;
+
+ /**
+ * 修改人
+ */
+ private String update_id;
+
+ /**
+ * 修改人姓名
+ */
+ private String update_name;
+
+ /**
+ * 修改时间
+ */
+ private Date update_time;
+
+ /**
+ * 外部标识
+ */
+ private String ext_id;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.java
new file mode 100644
index 00000000..ce3b9dcd
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.masterdata_manage.service.master.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.masterdata_manage.service.master.dao.MdPbClassstandard;
+
+/**
+ *
+ * 基础数据分类标准表 Mapper 接口
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+public interface MdPbClassstandardMapper extends BaseMapper {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.xml
new file mode 100644
index 00000000..26fad0cd
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbMeasureunitMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbMeasureunitMapper.java
new file mode 100644
index 00000000..5c361629
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbMeasureunitMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.masterdata_manage.service.master.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
+
+/**
+ *
+ * 计量单位表 Mapper 接口
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+public interface MdPbMeasureunitMapper extends BaseMapper {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbMeasureunitMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbMeasureunitMapper.xml
new file mode 100644
index 00000000..da1dc851
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbMeasureunitMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbClassstandardServiceImpl.java
new file mode 100644
index 00000000..99d482f7
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbClassstandardServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.masterdata_manage.service.master.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.masterdata_manage.service.master.IMdPbClassstandardService;
+import org.nl.wms.masterdata_manage.service.master.dao.MdPbClassstandard;
+import org.nl.wms.masterdata_manage.service.master.dao.mapper.MdPbClassstandardMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 基础数据分类标准表 服务实现类
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+@Service
+public class MdPbClassstandardServiceImpl extends ServiceImpl implements IMdPbClassstandardService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbMeasureunitServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbMeasureunitServiceImpl.java
new file mode 100644
index 00000000..7399e4f4
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbMeasureunitServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.masterdata_manage.service.master.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService;
+import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
+import org.nl.wms.masterdata_manage.service.master.dao.mapper.MdPbMeasureunitMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 计量单位表 服务实现类
+ *
+ *
+ * @author generator
+ * @since 2023-05-05
+ */
+@Service
+public class MdPbMeasureunitServiceImpl extends ServiceImpl implements IMdPbMeasureunitService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_ACSTOLMSTYPE4.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_ACSTOLMSTYPE4.wql
new file mode 100644
index 00000000..59be55ed
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_ACSTOLMSTYPE4.wql
@@ -0,0 +1,207 @@
+[交易说明]
+ 交易名: ACS请求WMS
+ 所属模块:
+ 功能简述:
+ 版权所有:
+ 表引用:
+ 版本经历:
+
+[数据库]
+ --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库
+
+[IO定义]
+ #################################################
+ ## 表字段对应输入参数
+ #################################################
+ 输入.flag TYPEAS s_string
+ 输入.sale_order_name TYPEAS s_string
+ 输入.product_name TYPEAS s_string
+ 输入.box_length TYPEAS s_string
+ 输入.box_width TYPEAS s_string
+ 输入.box_high TYPEAS s_string
+ 输入.point_code TYPEAS s_string
+ 输入.row_num TYPEAS s_string
+
+
+[临时表]
+ --这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+ --所有中间过程变量均可在此处定义
+
+[业务过程]
+
+ ##########################################
+ # 1、输入输出检查 #
+ ##########################################
+
+
+ ##########################################
+ # 2、主过程前处理 #
+ ##########################################
+
+
+ ##########################################
+ # 3、业务主过程 #
+ ##########################################
+
+ IF 输入.flag = "1"
+ QUERY
+ SELECT
+ max(po.row_num) AS row_num
+ FROM
+ sch_base_point po
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = po.vehicle_code
+ WHERE
+ po.point_type = '9'
+
+ OPTION 输入.sale_order_name <> ""
+ sub.sale_order_name = 输入.sale_order_name
+ ENDOPTION
+
+ OPTION 输入.product_name <> ""
+ sub.product_name = 输入.product_name
+ ENDOPTION
+
+ OPTION 输入.box_length <> ""
+ sub.box_length = 输入.box_length
+ ENDOPTION
+
+ OPTION 输入.box_width <> ""
+ sub.box_width = 输入.box_width
+ ENDOPTION
+
+ OPTION 输入.box_high <> ""
+ sub.box_high = 输入.box_high
+ ENDOPTION
+
+ GROUP BY po.row_num
+
+ ORDER BY po.row_num ASC
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "2"
+ QUERY
+ SELECT
+ po.point_code
+ FROM
+ sch_base_point po
+ WHERE
+ IFNULL( po.vehicle_code, '' ) = ''
+ AND
+ po.point_type = '9'
+ AND
+ po.lock_type = '1'
+ OPTION 输入.row_num <> ""
+ po.row_num = 输入.row_num
+ ENDOPTION
+
+ AND NOT EXISTS (
+ SELECT
+ *
+ FROM
+ sch_base_task
+ WHERE
+ ( point_code1 = po.point_code OR point_code2 = po.point_code )
+ AND task_status < '07'
+ AND is_delete = '0'
+ )
+
+ ORDER BY po.out_order_seq,po.layer_num
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "3"
+ QUERY
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ po.row_num
+ FROM
+ sch_base_point po
+ WHERE
+ po.is_delete = '0'
+ AND is_used = '1'
+ AND po.point_type = '9'
+ GROUP BY
+ po.row_num
+ ) a
+ WHERE
+ NOT EXISTS (
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ row_num
+ FROM
+ sch_base_point po2
+ WHERE
+ IFNULL( po2.vehicle_code, '' ) <> ''
+ AND po2.point_type = '9'
+ GROUP BY
+ po2.row_num
+ ) b
+ WHERE
+ b.row_num = a.row_num
+ )
+
+ ORDER BY row_num ASC
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "4"
+ QUERY
+ SELECT
+ point2.*
+ FROM
+ sch_base_point point1
+ LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num
+ WHERE
+ IFNULL( point2.vehicle_code, '' ) <> ''
+ AND point1.out_order_seq < point2.out_order_seq
+ AND point2.point_type = '9'
+
+ OPTION 输入.point_code <> ""
+ point1.point_code = 输入.point_code
+ ENDOPTION
+
+ UNION
+
+ SELECT
+ point2.*
+ FROM
+ sch_base_point point1
+ LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num
+ WHERE
+ IFNULL( point2.vehicle_code, '' ) = ''
+ AND point1.out_order_seq < point2.out_order_seq
+ AND point2.point_type = '9'
+
+ OPTION 输入.point_code <> ""
+ point1.point_code = 输入.point_code
+ ENDOPTION
+
+ AND EXISTS (
+ SELECT
+ *
+ FROM
+ sch_base_task
+ WHERE
+ ( point_code1 = point2.point_code OR point_code2 = point2.point_code )
+ AND task_status < '07'
+ AND is_delete = '0'
+ )
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_INCHARGE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_INCHARGE.wql
new file mode 100644
index 00000000..bcdce16f
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_INCHARGE.wql
@@ -0,0 +1,100 @@
+[交易说明]
+ 交易名: 入库冲销分页查询
+ 所属模块:
+ 功能简述:
+ 版权所有:
+ 表引用:
+ 版本经历:
+
+[数据库]
+ --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库
+
+[IO定义]
+ #################################################
+ ## 表字段对应输入参数
+ #################################################
+ 输入.flag TYPEAS s_string
+ 输入.begin_time TYPEAS s_string
+ 输入.end_time TYPEAS s_string
+ 输入.bill_code TYPEAS s_string
+ 输入.stor_id TYPEAS s_string
+ 输入.sap_pcsn TYPEAS s_string
+ 输入.pcsn TYPEAS s_string
+ 输入.create_mode TYPEAS s_string
+ 输入.bill_type TYPEAS s_string
+ 输入.in_stor_id TYPEAS f_string
+
+
+[临时表]
+ --这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+ --所有中间过程变量均可在此处定义
+
+[业务过程]
+
+ ##########################################
+ # 1、输入输出检查 #
+ ##########################################
+
+
+ ##########################################
+ # 2、主过程前处理 #
+ ##########################################
+
+
+ ##########################################
+ # 3、业务主过程 #
+ ##########################################
+
+ IF 输入.flag = "1"
+ PAGEQUERY
+ SELECT DISTINCT
+ ios.*
+ FROM
+ ST_IVT_IOStorInv ios
+ LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
+ WHERE
+ ios.is_delete = '0'
+ AND ios.io_type = '0'
+ AND ios.bill_status = '99'
+ AND ios.is_writeoff = '0'
+ AND ios.bill_type = '0002'
+ and ios.stor_id in 输入.in_stor_id
+
+ OPTION 输入.bill_code <> ""
+ ios.bill_code like 输入.bill_code
+ ENDOPTION
+
+ OPTION 输入.stor_id <> ""
+ ios.stor_id = 输入.stor_id
+ ENDOPTION
+
+ OPTION 输入.sap_pcsn <> ""
+ sub.sap_pcsn like 输入.sap_pcsn
+ ENDOPTION
+
+ OPTION 输入.pcsn <> ""
+ dis.pcsn like 输入.pcsn
+ ENDOPTION
+
+ OPTION 输入.bill_type <> ""
+ ios.bill_type = 输入.bill_type
+ ENDOPTION
+
+ OPTION 输入.create_mode <> ""
+ ios.create_mode = 输入.create_mode
+ ENDOPTION
+
+ OPTION 输入.begin_time <> ""
+ ios.input_time >= 输入.begin_time
+ ENDOPTION
+
+ OPTION 输入.end_time <> ""
+ ios.input_time <= 输入.end_time
+ ENDOPTION
+
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
\ No newline at end of file
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_RAWASSISTISTOR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_RAWASSISTISTOR.wql
new file mode 100644
index 00000000..04a79af2
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -0,0 +1,985 @@
+[交易说明]
+ 交易名: 基础点位分页查询
+ 所属模块:
+ 功能简述:
+ 版权所有:
+ 表引用:
+ 版本经历:
+
+[数据库]
+ --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库
+
+[IO定义]
+ #################################################
+ ## 表字段对应输入参数
+ #################################################
+ 输入.flag TYPEAS s_string
+ 输入.begin_time TYPEAS s_string
+ 输入.end_time TYPEAS s_string
+ 输入.material_search TYPEAS s_string
+ 输入.bill_code TYPEAS s_string
+ 输入.create_mode TYPEAS s_string
+ 输入.stor_id TYPEAS s_string
+ 输入.sap_pcsn TYPEAS s_string
+ 输入.pcsn TYPEAS s_string
+ 输入.col_num TYPEAS s_string
+ 输入.bill_status TYPEAS s_string
+ 输入.bill_type TYPEAS s_string
+ 输入.box_no TYPEAS s_string
+ 输入.container_name TYPEAS s_string
+ 输入.package_box_sn TYPEAS s_string
+ 输入.iostorinv_id TYPEAS s_string
+ 输入.iostorinvdtl_id TYPEAS s_string
+ 输入.sale_order_name TYPEAS s_string
+ 输入.material_code TYPEAS s_string
+ 输入.sect_id TYPEAS s_string
+ 输入.point_code TYPEAS s_string
+ 输入.row_num TYPEAS s_string
+ 输入.sql_str TYPEAS f_string
+ 输入.in_stor_id TYPEAS f_string
+
+
+[临时表]
+ --这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+ --所有中间过程变量均可在此处定义
+
+[业务过程]
+
+ ##########################################
+ # 1、输入输出检查 #
+ ##########################################
+
+
+ ##########################################
+ # 2、主过程前处理 #
+ ##########################################
+
+
+ ##########################################
+ # 3、业务主过程 #
+ ##########################################
+
+ IF 输入.flag = "1"
+ PAGEQUERY
+ SELECT DISTINCT
+ ios.*
+ FROM
+ ST_IVT_IOStorInv ios
+ LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
+ WHERE
+ ios.is_delete = '0'
+ AND
+ ios.io_type = '0'
+ AND ios.stor_id in 输入.in_stor_id
+
+ OPTION 输入.bill_code <> ""
+ ios.bill_code like 输入.bill_code
+ ENDOPTION
+ OPTION 输入.sap_pcsn <> ""
+ sub.sap_pcsn like 输入.sap_pcsn
+ ENDOPTION
+ OPTION 输入.pcsn <> ""
+ dis.pcsn like 输入.pcsn
+ ENDOPTION
+ OPTION 输入.stor_id <> ""
+ ios.stor_id = 输入.stor_id
+ ENDOPTION
+ OPTION 输入.bill_type <> ""
+ ios.bill_type = 输入.bill_type
+ ENDOPTION
+ OPTION 输入.create_mode <> ""
+ ios.create_mode = 输入.create_mode
+ ENDOPTION
+ OPTION 输入.bill_status <> ""
+ ios.bill_status = 输入.bill_status
+ ENDOPTION
+ OPTION 输入.begin_time <> ""
+ ios.input_time >= 输入.begin_time
+ ENDOPTION
+ OPTION 输入.end_time <> ""
+ ios.input_time <= 输入.end_time
+ ENDOPTION
+
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
+
+ IF 输入.flag = "2"
+ PAGEQUERY
+ SELECT
+ sale_order_name,
+ customer_name,
+ customer_description,
+ package_box_sn,
+ quanlity_in_box,
+ container_name,
+ product_name,
+ product_description,
+ width,
+ thickness,
+ net_weight,
+ net_weight AS plan_qty,
+ sap_pcsn
+ FROM
+ pdm_bi_subpackagerelation sub
+ WHERE
+ sub.status = '0'
+ OPTION 输入.begin_time <> ""
+ sub.date_of_FG_inbound >= 输入.begin_time
+ ENDOPTION
+ OPTION 输入.end_time <> ""
+ sub.date_of_FG_inbound <= 输入.end_time
+ ENDOPTION
+ OPTION 输入.bill_code <> ""
+ sub.sale_order_name = 输入.bill_code
+ ENDOPTION
+ OPTION 输入.package_box_sn <> ""
+ sub.package_box_sn = 输入.package_box_sn
+ ENDOPTION
+ OPTION 输入.sap_pcsn <> ""
+ sub.sap_pcsn = 输入.sap_pcsn
+ ENDOPTION
+ OPTION 输入.container_name <> ""
+ sub.container_name = 输入.container_name
+ ENDOPTION
+ OPTION 输入.material_search <> ""
+ (
+ sub.product_name like 输入.material_search
+ OR
+ sub.product_description like 输入.material_search
+ )
+ ENDOPTION
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
+
+ IF 输入.flag = "3"
+ QUERY
+ SELECT DISTINCT
+ dtl.*,
+ sub.*,
+ mb.material_code,
+ mb.material_name,
+ mst.bill_code
+ FROM
+ st_ivt_iostorinvdtl dtl
+ LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
+ LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dtl.pcsn AND dtl.box_no = sub.package_box_sn
+ where
+ mst.bill_code = 输入.bill_code
+ OPTION 输入.open_flag = "1"
+ dtl.bill_status < '40'
+ ENDOPTION
+ OPTION 输入.open_flag = "2"
+ dtl.bill_status IN ('30','40')
+ ENDOPTION
+ ORDER BY
+ dtl.box_no,dtl.pcsn
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "4"
+ QUERY
+ SELECT
+ dis.*,
+ mb.material_code,
+ mb.material_name,
+ po.point_code,
+ po.point_name,
+ sub.sap_pcsn
+ FROM
+ st_ivt_iostorinvdis dis
+ INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
+ LEFT JOIN SCH_BASE_POINT po ON po.point_id = dis.point_id
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
+ where
+ dis.box_no = 输入.package_box_sn
+ AND
+ dis.iostorinv_id = 输入.iostorinv_id
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "5"
+ QUERY
+ SELECT
+ dis.iostorinv_id,
+ dis.material_id,
+ mb.material_code,
+ mb.material_name,
+ dis.pcsn,
+ dis.seq_no,
+ dis.storagevehicle_code,
+ dis.plan_qty,
+ dis.struct_code,
+ dis.struct_code AS new_struct_code,
+ task.task_status AS work_status,
+ task.task_code,
+ po.point_code,
+ po.point_code AS new_point_code,
+ po.point_name,
+ dis.iostorinvdis_id,
+ dis.task_id,
+ dis.box_no,
+ sub.sap_pcsn
+ FROM
+ st_ivt_iostorinvdis dis
+ INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
+ LEFT JOIN sch_base_point po ON po.point_id = dis.point_id
+ LEFT JOIN sch_base_task task ON task.task_id = dis.task_id AND task.is_delete = '0'
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
+ WHERE
+ dis.task_id <> ''
+ AND
+ dis.task_id is not null
+ AND
+ dis.iostorinvdtl_id = 输入.iostorinvdtl_id
+ OPTION 输入.is_finish = "1"
+ dis.work_status < '99' AND task.task_status < '99'
+ ENDOPTION
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "6"
+ QUERY
+ SELECT
+ bucket.*,
+ detail.label,
+ mb.material_code,
+ mb.material_name
+ FROM
+ st_ivt_iostorinvdisdtl disdtl
+ LEFT JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = disdtl.bucketunique
+ LEFT JOIN sys_dict detail ON detail.`value` = bucket.storagevehicle_type
+ INNER JOIN sys_dict dict ON dict.dict_id = detail.dict_id
+ AND dict.`name` LIKE 'MD_BUCKET_TYPE%'
+ INNER JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id
+ WHERE
+ disdtl.storagevehicle_code = 输入.storagevehicle_code
+ AND
+ disdtl.iostorinv_id = 输入.iostorinv_id
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "7"
+ QUERY
+ SELECT DISTINCT
+ sa.*
+ FROM
+ st_ivt_structattr sa
+ LEFT JOIN st_ivt_sectattr se ON se.sect_id = sa.sect_id
+ LEFT JOIN st_ivt_structrelamaterial sm ON sm.sect_id = sa.sect_id
+ WHERE
+ se.sect_type_attr = '00'
+ AND sa.lock_type = '00'
+ AND sa.is_used = '1'
+ AND sa.is_delete = '0'
+ AND ( sa.storagevehicle_code IS NULL OR sa.storagevehicle_code = '' )
+ AND sa.height = 输入.height
+ OPTION 输入.sect_flag = "1"
+ sm.material_type_id = 输入.material_type_id
+ ENDOPTION
+ OPTION 输入.sect_id <> ""
+ sa.sect_id = 输入.sect_id
+ ENDOPTION
+ OPTION 输入.stor_id <> ""
+ sa.stor_id = 输入.stor_id
+ ENDOPTION
+ order by sa.struct_code
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "8"
+ PAGEQUERY
+ SELECT
+ pp.CREATE_DATE AS receive_date,
+ pp.VBILLCODE AS source_bill_code,
+ mb.material_code,
+ mb.material_name,
+ class.class_desc,
+ mb.material_id,
+ pp.QTY AS receive_qty,
+ ( CASE WHEN a.real_qty IS NULL THEN pp.QTY ELSE ( pp.QTY - a.real_qty ) END ) AS need_qty,
+ mu.unit_name AS qty_unit_name,
+ '采购订单' AS source_type_name,
+ mu.measure_unit_id AS qty_unit_id,
+ pp.id AS source_billdtl_id,
+ 'PO' AS source_bill_type,
+ 'PCS_IF_PurchaseOrderProc' AS source_bill_table,
+ pp.id AS base_billdtl_id,
+ 'PO' AS base_bill_type,
+ '' AS base_bill_code,
+ 'PCS_IF_PurchaseOrderProc' AS base_bill_table
+ FROM
+ pcs_if_purchaseorderproc pp
+ LEFT JOIN md_me_materialbase mb ON mb.ext_id = pp.ITEM_ID
+ INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
+ INNER JOIN md_pb_measureunit mu ON mu.ext_id = pp.M_UNIT_ID
+ LEFT JOIN ( SELECT dtl.source_billdtl_id, SUM( dtl.real_qty ) AS real_qty FROM st_ivt_iostorinvdtl dtl GROUP BY source_billdtl_id ) a ON a.source_billdtl_id = pp.id
+ WHERE
+ pp.proc_status IN ( '01', '02' )
+ AND
+ pp.DR='0'
+ AND
+ mb.material_type_id IN 输入.clsss_ids
+ OPTION 输入.material_search <> ""
+ (mb.material_code like 输入.material_search
+ OR
+ mb.material_name like 输入.material_search)
+ ENDOPTION
+ OPTION 输入.bill_code <> ""
+ pp.VBILLCODE like 输入.bill_code
+ ENDOPTION
+ OPTION 输入.begin_time <> ""
+ pp.CREATE_DATE >= 输入.begin_time
+ ENDOPTION
+ OPTION 输入.end_time <> ""
+ pp.CREATE_DATE <= 输入.end_time
+ ENDOPTION
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
+
+ IF 输入.flag = "9"
+ PAGEQUERY
+ SELECT
+ mst.input_time AS receive_date,
+ mst.bill_code AS source_bill_code,
+ mb.material_code,
+ mb.material_name,
+ class.class_desc,
+ mb.material_id,
+ disdtl.pcsn,
+ disdtl.real_qty AS need_qty,
+ disdtl.qty_unit_name,
+ detail.label AS source_type_name,
+ disdtl.qty_unit_id,
+ disdtl.iostorinvdtl_id AS source_billdtl_id,
+ mst.bill_type AS source_bill_type,
+ 'st_ivt_iostorinvdtl' AS source_bill_table,
+ disdtl.bucketunique,
+ disdtl.storagevehicle_code,
+ disdtl.quality_scode,
+ disdtl.ivt_level,
+ disdtl.is_active,
+ dtl.base_billdtl_id,
+ dtl.base_bill_type,
+ dtl.base_bill_code,
+ dtl.base_bill_table
+
+ FROM
+ st_ivt_iostorinvdisdtl disdtl
+ INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = disdtl.iostorinv_id
+ LEFT JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = disdtl.iostorinvdtl_id
+ LEFT JOIN sys_dict detail ON detail.`value` = mst.bill_type AND detail.code LIKE 'ST_INV_TYPE%'
+ INNER JOIN md_me_materialbase mb ON mb.material_id = disdtl.material_id
+ INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
+ WHERE
+ mst.bill_status = '99'
+ AND mst.io_type = '0'
+ AND mst.bill_type not in ('000501','000401','000601')
+ OPTION 输入.material_search <> ""
+ (mb.material_code like 输入.material_search
+ OR
+ mb.material_name like 输入.material_search)
+ ENDOPTION
+ OPTION 输入.bill_code <> ""
+ mst.bill_code like 输入.bill_code
+ ENDOPTION
+ OPTION 输入.query_type <> ""
+ mst.bill_type = 输入.query_type
+ ENDOPTION
+ OPTION 输入.begin_time <> ""
+ mst.input_time >= 输入.begin_time
+ ENDOPTION
+ OPTION 输入.end_time <> ""
+ mst.input_time <= 输入.end_time
+ ENDOPTION
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
+
+ IF 输入.flag = "10"
+ QUERY
+ SELECT
+ bucket.*,
+ mb.material_code,
+ '0' AS is_new,
+ '' AS bill_code
+ FROM
+ md_pb_bucketrecord bucket
+ LEFT JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id
+ WHERE
+ bucket.status = '03'
+ AND
+ bucket.storagevehicle_code = 输入.storagevehicle_code
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "11"
+ QUERY
+ SELECT
+ count(sa2.struct_code) AS num,
+ sa2.block_num,
+ sa2.row_num,
+ sa2.placement_type
+ FROM
+ st_ivt_structivt ivt
+ INNER JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn
+ LEFT JOIN st_ivt_structattr sa ON sa.struct_code = ivt.struct_code
+ LEFT JOIN st_ivt_structattr sa2 ON sa2.row_num = sa.row_num AND sa2.block_num = sa.block_num
+ LEFT JOIN md_me_materialbase mb ON mb.material_id = ivt.material_id
+ WHERE
+ IFNULL(sa2.storagevehicle_code,'') = ''
+ AND
+ sa2.lock_type = '1'
+ AND
+ sa2.is_delete = '0'
+ AND
+ sa2.is_used = '1'
+ AND
+ sa2.sect_id = 输入.sect_id
+ OPTION 输入.material_code <> ""
+ mb.material_code = 输入.material_code
+ ENDOPTION
+ OPTION 输入.sale_order_name <> ""
+ sub.sale_order_name = 输入.sale_order_name
+ ENDOPTION
+ OPTION 输入.col_num <> ""
+ sa2.layer_num = 输入.col_num
+ ENDOPTION
+ GROUP BY
+ sa2.block_num,sa2.row_num,sa2.placement_type
+ ORDER BY
+ sa2.placement_type desc,num
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "12"
+ QUERY
+ SELECT
+ *
+ FROM
+ pdm_bi_slittingproductionplan plan
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = plan.container_name
+ WHERE
+ IFNULL( sub.container_name, '' ) = ''
+ AND
+ plan.is_delete = '0'
+ AND
+ plan.status < '09'
+ OPTION 输入.sale_order_name <> ""
+ plan.sale_order_name = 输入.sale_order_name
+ ENDOPTION
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "13"
+ QUERY
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ sa.block_num,
+ sa.row_num,
+ sa.placement_type,
+ COUNT( sa.struct_code ) AS struct_num
+ FROM
+ st_ivt_structattr sa
+ WHERE
+ sa.is_delete = '0'
+ AND is_used = '1'
+ AND sa.sect_id = 输入.sect_id
+
+ OPTION 输入.col_num <> ""
+ sa.layer_num = 输入.col_num
+ ENDOPTION
+
+ GROUP BY
+ sa.block_num,
+ sa.row_num,
+ sa.placement_type
+ ) a
+ WHERE
+ NOT EXISTS (
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ block_num,
+ row_num,
+ placement_type
+ FROM
+ st_ivt_structattr sa2
+ WHERE
+ sa2.lock_type <> '1'
+ OR IFNULL( sa2.storagevehicle_code, '' ) <> ''
+ GROUP BY
+ sa2.block_num,
+ sa2.row_num,
+ sa2.placement_type
+ ) b
+ WHERE
+ b.block_num = a.block_num
+ AND
+ b.row_num = a.row_num
+ AND
+ b.placement_type = a.placement_type
+ )
+ 输入.sql_str
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "14"
+ QUERY
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ sa.block_num,
+ sa.row_num,
+ sa.placement_type,
+ COUNT( sa.struct_code ) AS struct_num
+ FROM
+ st_ivt_structattr sa
+ WHERE
+ sa.is_delete = '0'
+ AND is_used = '1'
+ AND placement_type = '01'
+ AND sa.sect_id = 输入.sect_id
+
+ OPTION 输入.col_num <> ""
+ sa.layer_num = 输入.col_num
+ ENDOPTION
+ GROUP BY
+ sa.block_num,
+ sa.row_num,
+ sa.placement_type
+ ) a
+ WHERE
+ EXISTS (
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ block_num,
+ row_num,
+ placement_type
+ FROM
+ st_ivt_structattr sa2
+ WHERE
+ sa2.lock_type = '1'
+ AND sa2.is_used = '1'
+ AND sa2.is_delete = '0'
+ AND IFNULL( sa2.storagevehicle_code, '' ) = ''
+ GROUP BY
+ sa2.block_num,
+ sa2.row_num,
+ sa2.placement_type
+ ) b
+ WHERE
+ b.block_num = a.block_num
+ AND
+ b.row_num = a.row_num
+ AND
+ b.placement_type = a.placement_type
+ )
+ 输入.sql_str
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "15"
+ PAGEQUERY
+ SELECT DISTINCT
+ ios.*
+ FROM
+ ST_IVT_IOStorInv ios
+ LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
+ WHERE
+ ios.is_delete = '0'
+ AND
+ ios.io_type = '1'
+ AND
+ ios.is_writeoff = '0'
+ AND
+ ios.bill_status = '99'
+ AND
+ ios.bill_type = '1001'
+ AND
+ ios.stor_id in 输入.in_stor_id
+
+ OPTION 输入.bill_code <> ""
+ ios.bill_code like 输入.bill_code
+ ENDOPTION
+ OPTION 输入.stor_id <> ""
+ ios.stor_id = 输入.stor_id
+ ENDOPTION
+ OPTION 输入.pcsn <> ""
+ dis.pcsn like 输入.pcsn
+ ENDOPTION
+ OPTION 输入.sap_pcsn <> ""
+ sub.sap_pcsn like 输入.sap_pcsn
+ ENDOPTION
+ OPTION 输入.bill_type <> ""
+ ios.bill_type = 输入.bill_type
+ ENDOPTION
+ OPTION 输入.create_mode <> ""
+ ios.create_mode = 输入.create_mode
+ ENDOPTION
+ OPTION 输入.bill_status <> ""
+ ios.bill_status = 输入.bill_status
+ ENDOPTION
+ OPTION 输入.begin_time <> ""
+ ios.input_time >= 输入.begin_time
+ ENDOPTION
+ OPTION 输入.end_time <> ""
+ ios.input_time <= 输入.end_time
+ ENDOPTION
+
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
+
+ IF 输入.flag = "16"
+ QUERY
+ SELECT
+ sale_order_name,
+ customer_name,
+ customer_description,
+ package_box_sn,
+ quanlity_in_box,
+ container_name,
+ product_name,
+ product_description,
+ width,
+ thickness,
+ net_weight,
+ net_weight AS plan_qty,
+ sap_pcsn
+ FROM
+ pdm_bi_subpackagerelation sub
+ WHERE
+ sub.status = '0'
+ OPTION 输入.package_box_sn <> ""
+ sub.package_box_sn = 输入.package_box_sn
+ ENDOPTION
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "17"
+ QUERY
+ SELECT
+ *
+ FROM
+ st_ivt_iostorinvdis dis
+ LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+ WHERE
+ dis.box_no = 输入.box_no
+ AND work_status < '99'
+ AND ( struct_id <> '' AND struct_id IS NOT NULL )
+ AND mst.is_delete = '0'
+ AND mst.bill_status < '99'
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "18"
+ QUERY
+ SELECT
+ *
+ FROM
+ st_ivt_iostorinvdis dis
+ LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+ WHERE
+ dis.box_no = 输入.box_no
+ AND work_status < '99'
+ AND mst.is_delete = '0'
+ AND mst.bill_status < '99'
+ AND IFNULL(struct_code,'') <> ''
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "19"
+ SELECT
+ po2.point_code
+ FROM
+ sch_base_point po
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = po.vehicle_code
+ LEFT JOIN sch_base_point po2 ON po2.row_num = po.row_num
+ WHERE
+ IFNULL( po2.vehicle_code, '' ) = ''
+ AND
+ po2.point_type = '9'
+ OPTION 输入.sale_order_name <> ""
+ sub.sale_order_name = 输入.sale_order_name
+ ENDOPTION
+ AND NOT EXISTS (
+ SELECT
+ *
+ FROM
+ sch_base_task
+ WHERE
+ ( point_code1 = po2.point_code OR point_code2 = po2.point_code )
+ AND task_status < '07'
+ AND is_delete = '0'
+ )
+ ORDER BY po2.out_order_seq
+
+ ENDSELECT
+ ENDIF
+
+ IF 输入.flag = "20"
+ QUERY
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ po.row_num
+ FROM
+ sch_base_point po
+ WHERE
+ po.is_delete = '0'
+ AND is_used = '1'
+ AND po.point_type = '9'
+ GROUP BY
+ po.row_num
+ ) a
+ WHERE
+ NOT EXISTS (
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ row_num
+ FROM
+ sch_base_point po2
+ WHERE
+ IFNULL( po2.vehicle_code, '' ) <> ''
+ AND po2.point_type = '9'
+ GROUP BY
+ po2.row_num
+ ) b
+ WHERE
+ b.row_num = a.row_num
+ )
+
+ ORDER BY row_num ASC
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "21"
+ QUERY
+ SELECT
+ sa.block_num,
+ sa.row_num,
+ sa.placement_type
+ FROM
+ st_ivt_structattr sa
+ WHERE
+ sa.sect_code = 'KTP01'
+ AND IFNULL( sa.storagevehicle_code, '' ) = ''
+ AND sa.lock_type = '1'
+ AND sa.is_delete = '0'
+ AND sa.is_used = '1'
+ GROUP BY
+ sa.block_num,
+ sa.row_num,
+ sa.placement_type
+ ORDER BY
+ sa.block_num DESC
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "22"
+ QUERY
+ SELECT
+ sa.block_num,
+ sa.row_num,
+ sa.placement_type
+ FROM
+ st_ivt_structattr sa
+ WHERE
+ sa.sect_code = 'KTP01'
+ AND IFNULL( sa.storagevehicle_code, '' ) <> ''
+ AND sa.lock_type = '1'
+ AND sa.is_delete = '0'
+ GROUP BY
+ sa.block_num,
+ sa.row_num,
+ sa.placement_type
+ ORDER BY
+ sa.block_num DESC
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "23"
+ QUERY
+ SELECT
+ point2.*
+ FROM
+ sch_base_point point1
+ LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num
+ WHERE
+ IFNULL( point2.vehicle_code, '' ) <> ''
+ AND point1.out_order_seq < point2.out_order_seq
+ AND point2.point_type = '9'
+
+ OPTION 输入.point_code <> ""
+ point1.point_code = 输入.point_code
+ ENDOPTION
+
+ UNION
+
+ SELECT
+ point2.*
+ FROM
+ sch_base_point point1
+ LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num
+ WHERE
+ IFNULL( point2.vehicle_code, '' ) = ''
+ AND point1.out_order_seq < point2.out_order_seq
+ AND point2.point_type = '9'
+
+ OPTION 输入.point_code <> ""
+ point1.point_code = 输入.point_code
+ ENDOPTION
+
+ AND EXISTS (
+ SELECT
+ *
+ FROM
+ sch_base_task
+ WHERE
+ ( point_code1 = point2.point_code OR point_code2 = point2.point_code )
+ AND task_status < '07'
+ AND is_delete = '0'
+ )
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "24"
+ SELECT
+ max(po.row_num) AS row_num
+ FROM
+ sch_base_point po
+ LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = po.vehicle_code
+ WHERE
+ po.point_type = '9'
+
+ OPTION 输入.sale_order_name <> ""
+ sub.sale_order_name = 输入.sale_order_name
+ ENDOPTION
+
+ GROUP BY po.row_num
+
+ ORDER BY po.row_num ASC
+
+ ENDSELECT
+ ENDIF
+
+ IF 输入.flag = "25"
+ SELECT
+ po.point_code
+ FROM
+ sch_base_point po
+ WHERE
+ IFNULL( po.vehicle_code, '' ) = ''
+ AND
+ po.point_type = '9'
+ OPTION 输入.row_num <> ""
+ po.row_num = 输入.row_num
+ ENDOPTION
+
+ AND NOT EXISTS (
+ SELECT
+ *
+ FROM
+ sch_base_task
+ WHERE
+ ( point_code1 = po.point_code OR point_code2 = po.point_code )
+ AND task_status < '07'
+ AND is_delete = '0'
+ )
+
+ ORDER BY po.out_order_seq
+ ENDSELECT
+ ENDIF
+
+ IF 输入.flag = "26"
+ QUERY
+ SELECT
+ *
+ FROM
+ st_ivt_iostorinvdtl dtl
+ LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id
+ WHERE
+ box_no = 输入.box_no
+ AND dtl.bill_status < '99'
+ AND mst.is_delete = '0'
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "27"
+ QUERY
+ SELECT DISTINCT
+ package_box_sn
+ FROM
+ pdm_bi_subpackagerelation
+ WHERE
+ sale_order_name = 输入.sale_order_name
+ AND `status` = '0'
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "28"
+ QUERY
+ SELECT
+ *
+ FROM
+ st_ivt_iostorinvdis dis
+ LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+ WHERE
+ work_status = '00'
+ AND
+ box_no = 输入.box_no
+ AND
+ IFNULL(task_id,'') = ''
+ AND
+ mst.is_delete = '0'
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+
+
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_STORPUBLIC.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_STORPUBLIC.wql
new file mode 100644
index 00000000..977acca3
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_STORPUBLIC.wql
@@ -0,0 +1,78 @@
+[交易说明]
+ 交易名:
+ 所属模块:
+ 功能简述:
+ 版权所有:
+ 表引用:
+ 版本经历:
+
+[数据库]
+ --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库
+
+[IO定义]
+ #################################################
+ ## 表字段对应输入参数
+ #################################################
+ 输入.flag TYPEAS s_string
+ 输入.struct_id TYPEAS s_string
+ 输入.material_id TYPEAS s_string
+ 输入.pcsn TYPEAS s_string
+ 输入.quality_scode TYPEAS s_string
+ 输入.storagevehicle_code TYPEAS s_string
+
+
+[临时表]
+ --这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+ --所有中间过程变量均可在此处定义
+
+[业务过程]
+
+ ##########################################
+ # 1、输入输出检查 #
+ ##########################################
+
+
+ ##########################################
+ # 2、主过程前处理 #
+ ##########################################
+
+
+ ##########################################
+ # 3、业务主过程 #
+ ##########################################
+
+ IF 输入.flag = "1"
+ QUERY
+ SELECT
+ ivt.*
+ FROM
+ st_ivt_structivt ivt
+ LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id
+ WHERE
+ 1=1
+
+ OPTION 输入.struct_id <> ""
+ ivt.struct_id = 输入.struct_id
+ ENDOPTION
+
+ OPTION 输入.material_id <> ""
+ ivt.material_id = 输入.material_id
+ ENDOPTION
+
+ OPTION 输入.pcsn <> ""
+ ivt.pcsn = 输入.pcsn
+ ENDOPTION
+
+ OPTION 输入.quality_scode <> ""
+ ivt.quality_scode = 输入.quality_scode
+ ENDOPTION
+
+ OPTION 输入.storagevehicle_code <> ""
+ attr.storagevehicle_code = 输入.storagevehicle_code
+ ENDOPTION
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
\ No newline at end of file
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/ST_PUB_QUERY_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/ST_PUB_QUERY_01.wql
new file mode 100644
index 00000000..770e517f
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/ST_PUB_QUERY_01.wql
@@ -0,0 +1,126 @@
+[交易说明]
+ 交易名: 物料更新接口
+ 所属模块:
+ 功能简述:
+ 版权所有:
+ 表引用:
+ 版本经历:
+
+[数据库]
+ --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库
+
+[IO定义]
+ #################################################
+ ## 表字段对应输入参数
+ #################################################
+ //sql类型
+ 输入.flag TYPEAS s_string
+ //
+ 输入.id TYPEAS s_string
+ //
+ 输入.material_id TYPEAS s_string
+ //
+ 输入.point_code TYPEAS s_string
+ //
+ 输入.ids TYPEAS f_string
+[临时表]
+ --这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+ --所有中间过程变量均可在此处定义
+
+[业务过程]
+
+ ##########################################
+ # 1、输入输出检查 #
+ ##########################################
+
+
+ ##########################################
+ # 2、主过程前处理 #
+ ##########################################
+
+
+ ##########################################
+ # 3、业务主过程 #
+ ##########################################
+
+ IF 输入.flag = "1"
+ QUERY
+ SELECT
+ struct.struct_id,
+ struct.struct_name,
+ struct.struct_code,
+ struct.sect_id,
+ struct.sect_name,
+ struct.stor_id,
+ struct.stor_code,
+ struct.stor_name,
+ sect.sect_code
+ FROM
+ ST_IVT_StructAttr struct
+ left join ST_IVT_SectAttr sect on sect.sect_id=struct.sect_id
+ WHERE
+ struct.is_delete = '0'
+ AND struct.is_used = '1'
+ AND sect.is_used='1'
+ OPTION 输入.id <> ""
+ struct.struct_id = 输入.id
+ ENDOPTION
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "2"
+ QUERY
+ SELECT
+ mater.material_id
+ FROM
+ md_me_materialbase mater
+ WHERE
+ mater.is_delete = '0'
+ AND mater.is_used = '1'
+ OPTION 输入.material_id <> ""
+ mater.material_id = 输入.material_id
+ ENDOPTION
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "3"
+ QUERY
+ SELECT
+ struct.struct_id,
+ struct.struct_code,
+ point.point_code,
+ point.point_id,
+ struct.storagevehicle_code
+ FROM
+ SCH_BASE_Point point
+ left join ST_IVT_StructAttr struct on point.source_id=struct.struct_id
+ WHERE 1=1
+ OPTION 输入.id <> ""
+ struct.struct_id = 输入.id
+ ENDOPTION
+ OPTION 输入.point_code <> ""
+ point.point_code = 输入.point_code
+ ENDOPTION
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "4"
+ QUERY
+ SELECT
+ max(value) AS CODE,
+ max(label) AS NAME
+ FROM
+ sys_dict
+ WHERE
+ 1 = 1
+ AND CODE LIKE '%INV_TYPE%'
+
+ group by value
+ ENDSELECT
+ ENDQUERY
+ ENDIF
\ No newline at end of file
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/ST_REGION_IN_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/ST_REGION_IN_01.wql
new file mode 100644
index 00000000..1ad23276
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/ST_REGION_IN_01.wql
@@ -0,0 +1,151 @@
+[交易说明]
+ 交易名: 区域入库分页查询
+ 所属模块:
+ 功能简述:
+ 版权所有:
+ 表引用:
+ 版本经历:
+
+[数据库]
+ --指定数据库,为空采用默认值,默认为db.properties中列出的第一个库
+
+[IO定义]
+ #################################################
+ ## 表字段对应输入参数
+ #################################################
+ 输入.flag TYPEAS s_string
+ 输入.bill_code TYPEAS s_string
+ 输入.bill_status TYPEAS s_string
+ 输入.vehicle_code TYPEAS s_string
+ 输入.material_code TYPEAS s_string
+ 输入.pcsn TYPEAS s_string
+ 输入.start_point_code TYPEAS s_string
+ 输入.end_point_code TYPEAS s_string
+ 输入.start_region_code TYPEAS s_string
+ 输入.end_region_code TYPEAS s_string
+ 输入.region_code TYPEAS s_string
+
+[临时表]
+ --这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+ --所有中间过程变量均可在此处定义
+
+[业务过程]
+
+ ##########################################
+ # 1、输入输出检查 #
+ ##########################################
+
+
+ ##########################################
+ # 2、主过程前处理 #
+ ##########################################
+
+
+ ##########################################
+ # 3、业务主过程 #
+ ##########################################
+
+ IF 输入.flag = "1"
+ PAGEQUERY
+ SELECT
+ ios.*,
+ mater.material_code,
+ mater.material_name,
+ unit.unit_name,
+ region1.region_name AS start_region_name,
+ region2.region_name AS end_region_name,
+ point1.point_name AS start_point_name,
+ point2.point_name AS end_point_name
+ FROM
+ ST_IVT_regionIO ios
+ LEFT JOIN md_me_materialbase mater ON mater.material_id = ios.material_id
+ LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ios.qty_unit_id
+ LEFT JOIN SCH_BASE_Region region1 ON region1.region_id = ios.start_region_id
+ LEFT JOIN SCH_BASE_Region region2 ON region2.region_id = ios.end_region_id
+ LEFT JOIN sch_base_point point1 ON point1.point_code = ios.start_point_code
+ LEFT JOIN sch_base_point point2 ON point2.point_code = ios.end_point_code
+ WHERE
+ ios.is_delete = '0'
+ AND ios.io_type = '0'
+
+ OPTION 输入.bill_code <> ""
+ ios.bill_code like 输入.bill_code
+ ENDOPTION
+
+ OPTION 输入.bill_status <> ""
+ ios.bill_status = 输入.bill_status
+ ENDOPTION
+
+ OPTION 输入.vehicle_code <> ""
+ ios.vehicle_code like 输入.vehicle_code
+ ENDOPTION
+
+ OPTION 输入.pcsn <> ""
+ ios.pcsn like 输入.pcsn
+ ENDOPTION
+
+ OPTION 输入.material_code <> ""
+ (mater.material_code like 输入.material_code or
+ mater.material_name like 输入.material_code)
+ ENDOPTION
+
+ OPTION 输入.start_point_code <> ""
+ (point1.point_code like 输入.start_point_code or
+ point1.point_name like 输入.start_point_code)
+ ENDOPTION
+
+ OPTION 输入.end_point_code <> ""
+ (point2.point_code like 输入.end_point_code or
+ point2.point_name like 输入.end_point_code)
+ ENDOPTION
+
+ OPTION 输入.start_region_code <> ""
+ (region1.region_code like 输入.start_region_code or
+ region1.region_name like 输入.start_region_code)
+ ENDOPTION
+
+ OPTION 输入.end_region_code <> ""
+ (region2.region_code like 输入.end_region_code or
+ region2.region_name like 输入.end_region_code)
+ ENDOPTION
+
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
+
+ IF 输入.flag = "2"
+ QUERY
+ SELECT
+ point.*
+ FROM
+ sch_base_point point
+ LEFT JOIN SCH_BASE_Region region ON point.region_id = region.region_id
+ WHERE
+ point.point_status = '00'
+ AND point.lock_type = '00'
+ AND point.is_used = '1'
+ AND point.is_delete = '0'
+
+ OPTION 输入.region_code <> ""
+ region.region_code = 输入.region_code
+ ENDOPTION
+
+ order by point.point_code DESC
+
+ ENDSELECT
+ ENDQUERY
+ ENDIF
+
+ IF 输入.flag = "3"
+ QUERY
+ SELECT DISTINCT
+ package_box_sn
+ FROM
+ pdm_bi_subpackagerelation
+ where
+ status = '0'
+ ENDSELECT
+ ENDQUERY
+ ENDIF