From 474df3f5d8286f12e80a9fafd6d9a50449dc6ee5 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Mon, 15 May 2023 00:27:04 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=9C=8D=E5=8A=A1/=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BB=93=E5=BA=93=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/common/publish/AbstraceListener.java   |   5 +-
 .../common/publish/BussEventMulticaster.java  |   7 +-
 .../org/nl/common/publish/PublishEvent.java   |   8 -
 .../nl/common/publish/event/PointEvent.java   |  21 +-
 .../nl/common/publish/event/PublishEvent.java |  21 +
 .../nl/common/publish/event/VechlieEvent.java |  12 +-
 .../publish/listener/PointListener.java       |  17 -
 .../material}/MaterialsafeivtController.java  |   6 +-
 .../StructrelamaterialController.java         |   6 +-
 .../storage}/SectattrController.java          |  50 +-
 .../storage}/StorattrController.java          |  27 +-
 .../storage}/StructattrController.java        |  38 +-
 .../StructrelavehicletypeController.java      |   6 +-
 .../storage/IStIvtBsrealstorattrService.java  |  37 +
 .../storage/IStIvtSectattrService.java        |  47 ++
 .../storage/IStIvtStructattrService.java      |  37 +
 .../storage/dao/StIvtBsrealstorattr.java      |   4 +-
 .../service/storage/dao/StIvtSectattr.java    |  29 +-
 .../service/storage/dao/StIvtStructattr.java  |  25 +-
 .../dao/mapper/StIvtBsrealstorattrMapper.java |   4 +-
 .../dao/mapper/StIvtSectattrMapper.java       |  20 +
 .../dao/mapper/StIvtStructattrMapper.java     |   4 +-
 .../mapper/xml}/StIvtBsrealstorattrMapper.xml |   2 +-
 .../dao/mapper/xml/StIvtSectattrMapper.xml    |  46 ++
 .../dao/mapper/xml}/StIvtStructattrMapper.xml |   2 +-
 .../service/storage/dto/SectattrQuery.java    |  24 +
 .../service/storage/dto/StructarrQuery.java   |  26 +
 .../impl/StIvtBsrealstorattrServiceImpl.java  |  35 +
 .../impl/StIvtSectattrServiceImpl.java        | 131 ++++
 .../impl/StIvtStructattrServiceImpl.java      |  99 +++
 .../备份st/rest/StructivtController.java    |  93 ---
 .../java/org/nl/wms/procure_manage/pcs.xls    | Bin 221696 -> 221696 bytes
 .../java/org/nl/wms/product_manage/pdm.xls    | Bin 215040 -> 215040 bytes
 .../sch/service/impl/PointServiceImpl.java    |   8 +-
 .../java/org/nl/wms/scheduler_manage/sch.xls  | Bin 187392 -> 187392 bytes
 .../service/point/PointListener.java          |  16 +
 .../point/impl/SchBasePointServiceImpl.java   |   7 +-
 .../storage_manage/CHANGE_BILL_TYPE_ENUM.java |  43 ++
 .../nl/wms/storage_manage/ST_CHANGE_TYPE.java |  23 -
 .../org/nl/wms/storage_manage/StorEvent.java  |  12 +-
 .../wms/storage_manage/StorEventListener.java |  36 +-
 .../StIvtBsrealstorattrController.java        |  49 --
 .../storage/StIvtSectattrController.java      |  20 -
 .../storage/StIvtStructattrController.java    |  20 -
 .../record/dao/StIvtStructivtflow.java        |  34 +-
 .../record/dto/StIvtStructivtflowDto.java     |  79 +++
 .../service/IStIvtStructivtflowService.java   |   2 +
 .../impl/StIvtStructivtflowServiceImpl.java   |  60 ++
 .../storage/IStIvtBsrealstorattrService.java  |  16 -
 .../storage/IStIvtSectattrService.java        |  16 -
 .../storage/IStIvtStructattrService.java      |  16 -
 .../dao/mapper/StIvtSectattrMapper.java       |  16 -
 .../dao/mapper/StIvtSectattrMapper.xml        |   5 -
 .../impl/StIvtBsrealstorattrServiceImpl.java  |  20 -
 .../impl/StIvtSectattrServiceImpl.java        |  20 -
 .../impl/StIvtStructattrServiceImpl.java      |  20 -
 .../impl/StIvtIostorinvCpServiceImpl.java     |   9 +-
 .../StIvtIostorinvBcpController.java          |  88 +--
 .../iostorInv/IStIvtIostorinvBcpService.java  |  27 +-
 .../IStIvtIostorinvdisBcpService.java         |  25 -
 .../iostorInv/dao/StIvtIostorinvBcp.java      |  76 +-
 .../iostorInv/dao/StIvtIostorinvdisBcp.java   | 134 ----
 .../dao/mapper/StIvtIostorinvBcpMapper.java   |   7 +-
 .../mapper/StIvtIostorinvdisBcpMapper.java    |  20 -
 .../mapper/xml/StIvtIostorinvBcpMapper.xml    |  35 +
 .../mapper/xml/StIvtIostorinvdisBcpMapper.xml |  24 -
 .../iostorInv/dto/BcpIostorInvQuery.java      |   3 +-
 .../impl/StIvtIostorinvBcpServiceImpl.java    | 219 ++++--
 .../impl/StIvtIostorinvdisBcpServiceImpl.java |  31 -
 .../structIvt/IStIvtStructivtBcpService.java  |   8 +
 .../structIvt/dao/StIvtStructivtBcp.java      |   7 +-
 .../dao/mapper/StIvtStructivtBcpMapper.java   |   7 +
 .../mapper/xml/StIvtStructivtBcpMapper.xml    |  17 +
 .../impl/StIvtStructivtBcpServiceImpl.java    |  41 ++
 .../java/org/nl/wms/storage_manage/stivt.xls  | Bin 409088 -> 403456 bytes
 .../semiproduct/semiProductIn/AddDialog.vue   |  14 +-
 .../semiproduct/semiProductIn/AddDtl.vue      | 182 -----
 .../semiproduct/semiProductIn/DivDialog.vue   | 652 ------------------
 .../semiproduct/semiProductIn/ViewDialog.vue  |  27 +-
 .../semiproduct/semiProductIn/index.vue       |  66 +-
 80 files changed, 1318 insertions(+), 1828 deletions(-)
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/common/publish/PublishEvent.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PublishEvent.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/common/publish/listener/PointListener.java
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{备份st/rest => storage/controller/material}/MaterialsafeivtController.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{备份st/rest => storage/controller/material}/StructrelamaterialController.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{备份st/rest => storage/controller/storage}/SectattrController.java (51%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{备份st/rest => storage/controller/storage}/StorattrController.java (72%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{备份st/rest => storage/controller/storage}/StructattrController.java (57%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{备份st/rest => storage/controller/vehicle}/StructrelavehicletypeController.java (95%)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtBsrealstorattrService.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtSectattrService.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtStructattrService.java
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{storage_manage/basedata => masterdata_manage/storage}/service/storage/dao/StIvtBsrealstorattr.java (95%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{storage_manage/basedata => masterdata_manage/storage}/service/storage/dao/StIvtSectattr.java (83%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{storage_manage/basedata => masterdata_manage/storage}/service/storage/dao/StIvtStructattr.java (89%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{storage_manage/basedata => masterdata_manage/storage}/service/storage/dao/mapper/StIvtBsrealstorattrMapper.java (61%)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtSectattrMapper.java
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{storage_manage/basedata => masterdata_manage/storage}/service/storage/dao/mapper/StIvtStructattrMapper.java (60%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{storage_manage/basedata/service/storage/dao/mapper => masterdata_manage/storage/service/storage/dao/mapper/xml}/StIvtBsrealstorattrMapper.xml (58%)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{storage_manage/basedata/service/storage/dao/mapper => masterdata_manage/storage/service/storage/dao/mapper/xml}/StIvtStructattrMapper.xml (59%)
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/SectattrQuery.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtBsrealstorattrServiceImpl.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtSectattrServiceImpl.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtStructattrServiceImpl.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructivtController.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/PointListener.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHANGE_BILL_TYPE_ENUM.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/ST_CHANGE_TYPE.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtSectattrController.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java
 create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dto/StIvtStructivtflowDto.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtBsrealstorattrService.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtSectattrService.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtSectattrMapper.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtSectattrMapper.xml
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtBsrealstorattrServiceImpl.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtSectattrServiceImpl.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvdisBcpService.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvdisBcp.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvdisBcpMapper.java
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisBcpMapper.xml
 delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvdisBcpServiceImpl.java
 delete mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDtl.vue
 delete mode 100644 mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/AbstraceListener.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/AbstraceListener.java
index f7f15ec5..06b9e3b4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/AbstraceListener.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/AbstraceListener.java
@@ -1,9 +1,12 @@
 package org.nl.common.publish;
 
+import org.nl.common.publish.event.PublishEvent;
+
 /*
  * @author ZZQ
  * @Date 2023/4/28 13:40
  */
 public abstract class AbstraceListener<E extends PublishEvent> {
-    protected abstract void doEvent(E event);
+    //返回值用于回调函数
+    protected abstract String doEvent(E event);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java
index 885a57e9..48519586 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/BussEventMulticaster.java
@@ -1,6 +1,7 @@
 package org.nl.common.publish;
 
 import org.jetbrains.annotations.NotNull;
+import org.nl.common.publish.event.PublishEvent;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.stereotype.Component;
@@ -28,8 +29,12 @@ public class BussEventMulticaster implements BeanPostProcessor {
         }
         for (AbstraceListener listener : getListenerByEvent(event)) {
             if (sync){
-                listener.doEvent(event);
+                String result= listener.doEvent(event);
+                if (event.getCallback() !=null && result !=null){
+                    event.getCallback().accept(result);
+                };
             }else {
+                //TODO:异步回调
                 new Thread(()->{
                     listener.doEvent(event);
                 }).start();
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/PublishEvent.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/PublishEvent.java
deleted file mode 100644
index edcdb9cf..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/PublishEvent.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.nl.common.publish;
-
-/*
- * @author ZZQ
- * @Date 2023/4/28 13:39
- */
-public interface PublishEvent {
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java
index 1a5518c6..34ec253f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java
@@ -1,10 +1,27 @@
 package org.nl.common.publish.event;
 
-import org.nl.common.publish.PublishEvent;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Map;
+
 
 /*
  * @author ZZQ
  * @Date 2023/4/28 13:50
  */
-public class PointEvent implements PublishEvent {
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PointEvent<T> extends PublishEvent {
+
+    private String type;
+    private String point_code1;
+    private String point_code2;
+    private Map<String,String> extParam;
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PublishEvent.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PublishEvent.java
new file mode 100644
index 00000000..adcbbf27
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PublishEvent.java
@@ -0,0 +1,21 @@
+package org.nl.common.publish.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.function.Consumer;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/15 00:22
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public abstract class PublishEvent {
+
+    private Consumer callback = null;
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/VechlieEvent.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/VechlieEvent.java
index 2261704b..ea82f534 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/VechlieEvent.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/VechlieEvent.java
@@ -3,7 +3,8 @@ package org.nl.common.publish.event;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import org.nl.common.publish.PublishEvent;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 import java.util.Map;
@@ -12,14 +13,15 @@ import java.util.Map;
  * @author ZZQ
  * @Date 2023/4/28 13:50
  */
-@Builder
+@SuperBuilder
 @Data
 @AllArgsConstructor
-public class VechlieEvent implements PublishEvent {
+@NoArgsConstructor
+public class VechlieEvent extends PublishEvent {
 
-    String VechlieCode;
+    private String VechlieCode;
     //meterilaCode ,qty
-    List<Map> meterilas;
+    private List<Map> meterilas;
     //出还是入
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/listener/PointListener.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/listener/PointListener.java
deleted file mode 100644
index 57a18bf2..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/listener/PointListener.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.nl.common.publish.listener;
-
-import org.nl.common.publish.AbstraceListener;
-import org.nl.common.publish.event.PointEvent;
-import org.springframework.stereotype.Component;
-
-/*
- * @author ZZQ
- * @Date 2023/4/28 13:57
- */
-@Component
-public class PointListener extends AbstraceListener<PointEvent> {
-    @Override
-    protected void doEvent(PointEvent event) {
-        System.out.println("----事件触发-----");
-    }
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/MaterialsafeivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/MaterialsafeivtController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java
index 4f29ad90..3ec45201 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/MaterialsafeivtController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java
@@ -1,12 +1,12 @@
 
-package org.nl.wms.masterdata_manage.备份st.rest;
+package org.nl.wms.masterdata_manage.storage.controller.material;
 
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.anno.Log;
 import org.nl.wms.masterdata_manage.备份st.service.MaterialsafeivtService;
 import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
 import org.springframework.data.domain.Pageable;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelamaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelamaterialController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java
index d8f8161c..df34f982 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelamaterialController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java
@@ -1,12 +1,12 @@
 
-package org.nl.wms.masterdata_manage.备份st.rest;
+package org.nl.wms.masterdata_manage.storage.controller.material;
 
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.anno.Log;
 import org.nl.wms.masterdata_manage.备份st.service.StructrelamaterialService;
 import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
 import org.springframework.data.domain.Pageable;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/SectattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java
similarity index 51%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/SectattrController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java
index c7ada9bd..7fec72f7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/SectattrController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java
@@ -1,21 +1,27 @@
 
-package org.nl.wms.masterdata_manage.备份st.rest;
+package org.nl.wms.masterdata_manage.storage.controller.storage;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.备份st.service.SectattrService;
-import org.nl.wms.masterdata_manage.备份st.service.dto.SectattrDto;
-import org.springframework.data.domain.Pageable;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dto.SectattrQuery;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,56 +35,56 @@ import java.util.Map;
 @Slf4j
 public class SectattrController {
 
-    private final SectattrService sectattrService;
+    @Autowired
+    private IStIvtSectattrService isectattrService;
 
     @GetMapping
     @Log("查询库区")
     @ApiOperation("查询库区")
-    //@PreAuthorize("@el.check('sectattr:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(sectattrService.queryAll(whereJson,page),HttpStatus.OK);
+    public ResponseEntity<Object> query(SectattrQuery query, PageQuery page){
+        Page<StIvtSectattr> list = isectattrService.page(page.build(StIvtSectattr.class), query.build());
+        return new ResponseEntity<>(TableDataInfo.build(list),HttpStatus.OK);
     }
 
     @PostMapping
     @Log("新增库区")
     @ApiOperation("新增库区")
-    //@PreAuthorize("@el.check('sectattr:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody SectattrDto dto){
-        sectattrService.create(dto);
+    public ResponseEntity<Object> create(@Validated @RequestBody JSONObject form){
+        isectattrService.create(form);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
     @PutMapping
     @Log("修改库区")
     @ApiOperation("修改库区")
-    //@PreAuthorize("@el.check('sectattr:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody SectattrDto dto){
-        sectattrService.update(dto);
+    public ResponseEntity<Object> updateForm(@Validated @RequestBody JSONObject form){
+        isectattrService.updateForm(form);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
     @Log("删除库区")
     @ApiOperation("删除库区")
-    //@PreAuthorize("@el.check('sectattr:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        sectattrService.deleteAll(ids);
+        if (ids !=null && ids.length>0){
+            isectattrService.removeByIds(Arrays.asList(ids));
+        }
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @GetMapping("/getSect")
     @Log("查询库区下拉框")
     @ApiOperation("查询库区下拉框")
-    //@PreAuthorize("@el.check('materialtype:list')")
-    public ResponseEntity<Object> querySect(@RequestParam Map whereJson) {
-        return new ResponseEntity<>(sectattrService.getSect(whereJson), HttpStatus.OK);
+    public ResponseEntity<Object> querySect(@RequestParam JSONObject query) {
+        List<Map> list = isectattrService.getSect(query);
+        return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
     }
 
     @PutMapping("/changeActive")
     @Log("修改库区状态")
     @ApiOperation("修改库区状态")
     public ResponseEntity<Object> update(@RequestBody JSONObject json) {
-        sectattrService.changeActive(json);
+        isectattrService.changeActive(json);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StorattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java
similarity index 72%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StorattrController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java
index bb23c3ee..039ff89c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StorattrController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java
@@ -1,21 +1,26 @@
 
-package org.nl.wms.masterdata_manage.备份st.rest;
+package org.nl.wms.masterdata_manage.storage.controller.storage;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
 import org.nl.wms.masterdata_manage.备份st.service.StorattrService;
 import org.nl.wms.masterdata_manage.备份st.service.dto.StorattrDto;
-import org.springframework.data.domain.Pageable;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,14 +34,18 @@ import java.util.Map;
 @Slf4j
 public class StorattrController {
 
-    private final StorattrService storattrService;
+    @Autowired
+    protected IStIvtBsrealstorattrService stIvtBsrealstorattrService;
+    @Autowired
+    protected StorattrService storattrService;
 
-    @GetMapping
+
+    @PostMapping("/queryStor")
     @Log("查询仓库")
     @ApiOperation("查询仓库")
-    //@PreAuthorize("@el.check('Storattr:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(storattrService.queryAll(whereJson,page),HttpStatus.OK);
+    public ResponseEntity<Object> queryStor() {
+        List<StIvtBsrealstorattr> list = stIvtBsrealstorattrService.list(new QueryWrapper<StIvtBsrealstorattr>().eq("is_used", true));
+        return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
     }
 
     @PostMapping
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java
similarity index 57%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructattrController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java
index 1df0ee60..4325fb74 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructattrController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java
@@ -1,22 +1,25 @@
 
-package org.nl.wms.masterdata_manage.备份st.rest;
+package org.nl.wms.masterdata_manage.storage.controller.storage;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.备份st.service.StructattrService;
-import org.nl.wms.masterdata_manage.备份st.service.dto.StructattrDto;
-import org.springframework.data.domain.Pageable;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dto.StructarrQuery;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
+import java.util.Arrays;
 
 /**
 * @author zhouz
@@ -29,22 +32,23 @@ import java.util.Map;
 @Slf4j
 public class StructattrController {
 
-    private final StructattrService structattrService;
+    private final IStIvtStructattrService ivtStructattrService;
 
     @GetMapping
     @Log("查询仓位")
     @ApiOperation("查询仓位")
     //@PreAuthorize("@el.check('structattr:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(structattrService.queryAll(whereJson,page),HttpStatus.OK);
+    public ResponseEntity<Object> queryAll(StructarrQuery query, PageQuery page){
+        Page<StIvtStructattr> list = ivtStructattrService.page(page.build(StIvtStructattr.class), query.build());
+        return new ResponseEntity<>(TableDataInfo.build(list),HttpStatus.OK);
     }
 
     @PostMapping
     @Log("新增仓位")
     @ApiOperation("新增仓位")
     //@PreAuthorize("@el.check('structattr:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody StructattrDto dto){
-        structattrService.create(dto);
+    public ResponseEntity<Object> create(@Validated @RequestBody JSONObject form){
+        ivtStructattrService.create(form);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
@@ -52,8 +56,8 @@ public class StructattrController {
     @Log("修改仓位")
     @ApiOperation("修改仓位")
     //@PreAuthorize("@el.check('structattr:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody StructattrDto dto){
-        structattrService.update(dto);
+    public ResponseEntity<Object> updateForm(@Validated @RequestBody JSONObject form){
+        ivtStructattrService.updateForm(form);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
@@ -62,7 +66,9 @@ public class StructattrController {
     //@PreAuthorize("@el.check('structattr:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        structattrService.deleteAll(ids);
+        if (ids != null && ids.length>0){
+            ivtStructattrService.removeByIds(Arrays.asList(ids));
+        }
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
@@ -70,7 +76,7 @@ public class StructattrController {
     @Log("修改仓位状态")
     @ApiOperation("修改仓位状态")
     public ResponseEntity<Object> update(@RequestBody JSONObject json) {
-        structattrService.changeActive(json);
+        ivtStructattrService.changeActive(json);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelavehicletypeController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelavehicletypeController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java
index 3590e689..f0de9c20 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelavehicletypeController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java
@@ -1,13 +1,13 @@
 
-package org.nl.wms.masterdata_manage.备份st.rest;
+package org.nl.wms.masterdata_manage.storage.controller.vehicle;
 
 
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.anno.Log;
 import org.nl.wms.masterdata_manage.备份st.service.StructrelavehicletypeService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtBsrealstorattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtBsrealstorattrService.java
new file mode 100644
index 00000000..8aa1ad2a
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtBsrealstorattrService.java
@@ -0,0 +1,37 @@
+package org.nl.wms.masterdata_manage.storage.service.storage;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+
+/**
+ * <p>
+ * 实物库属性表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+public interface IStIvtBsrealstorattrService extends IService<StIvtBsrealstorattr> {
+
+    /**
+     * 创建
+     * @param form
+     * @return
+     */
+    String create(JSONObject form);
+
+    /**
+     * 修改
+     * @param form
+     * @return
+     */
+    String updateForm(JSONObject form);
+
+
+    /**
+     * 改变启用状态
+     * @param json
+     */
+    void changeActive(JSONObject json);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtSectattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtSectattrService.java
new file mode 100644
index 00000000..f9bbd4bf
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtSectattrService.java
@@ -0,0 +1,47 @@
+package org.nl.wms.masterdata_manage.storage.service.storage;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 库区属性表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+public interface IStIvtSectattrService extends IService<StIvtSectattr> {
+
+    /**
+     * 创建
+     * @param form
+     * @return
+     */
+    String create(JSONObject form);
+
+    /**
+     * 修改
+     * @param form
+     * @return
+     */
+    String updateForm(JSONObject form);
+
+    /**
+     * 改变启用状态
+     * @param json
+     */
+    void changeActive(JSONObject json);
+
+    /**
+     * 查询库区下拉选
+     * @param json
+     * @return
+     */
+    List<Map> getSect(JSONObject json);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtStructattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtStructattrService.java
new file mode 100644
index 00000000..26a7c8bd
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/IStIvtStructattrService.java
@@ -0,0 +1,37 @@
+package org.nl.wms.masterdata_manage.storage.service.storage;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+
+/**
+ * <p>
+ * 仓位属性表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+public interface IStIvtStructattrService extends IService<StIvtStructattr> {
+    /**
+     * 创建
+     * @param form
+     * @return
+     */
+    String create(JSONObject form);
+
+    /**
+     * 修改
+     * @param form
+     * @return
+     */
+    String updateForm(JSONObject form);
+
+
+    /**
+     * 改变启用状态
+     * @param json
+     */
+    void changeActive(JSONObject json);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtBsrealstorattr.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtBsrealstorattr.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtBsrealstorattr.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtBsrealstorattr.java
index cb31a349..fa06c949 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtBsrealstorattr.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtBsrealstorattr.java
@@ -1,5 +1,6 @@
-package org.nl.wms.storage_manage.basedata.service.storage.dao;
+package org.nl.wms.masterdata_manage.storage.service.storage.dao;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,6 +27,7 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 仓库标识
      */
+    @TableId(value = "stor_id")
     private String stor_id;
 
     /**
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtSectattr.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtSectattr.java
similarity index 83%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtSectattr.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtSectattr.java
index d24a0e47..56b58e0e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtSectattr.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtSectattr.java
@@ -1,11 +1,13 @@
-package org.nl.wms.storage_manage.basedata.service.storage.dao;
+package org.nl.wms.masterdata_manage.storage.service.storage.dao;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -25,7 +27,8 @@ public class StIvtSectattr implements Serializable {
     /**
      * 库区标识
      */
-    private Long sect_id;
+    @TableId(value = "sect_id")
+    private String sect_id;
 
     /**
      * 库区编码
@@ -55,7 +58,15 @@ public class StIvtSectattr implements Serializable {
     /**
      * 仓库标识
      */
-    private Long stor_id;
+    private String stor_id;
+    /**
+     * 仓库code
+     */
+    private String stor_code;
+    /**
+     * 仓库ming
+     */
+    private String stor_name;
 
     /**
      * 仓库类型
@@ -130,7 +141,7 @@ public class StIvtSectattr implements Serializable {
     /**
      * 创建时间
      */
-    private String create_time;
+    private Date create_time;
 
     /**
      * 修改人姓名
@@ -140,12 +151,8 @@ public class StIvtSectattr implements Serializable {
     /**
      * 修改时间
      */
-    private String update_time;
+    private Date update_time;
 
-    /**
-     * 是否删除
-     */
-    private String is_delete;
 
     /**
      * 背景色
@@ -170,12 +177,12 @@ public class StIvtSectattr implements Serializable {
     /**
      * 所在楼层
      */
-    private BigDecimal floor_no;
+    private Integer floor_no;
 
     /**
      * 是否启用
      */
-    private String is_used;
+    private Boolean is_used;
 
     /**
      * 外部标识
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtStructattr.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtStructattr.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtStructattr.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtStructattr.java
index 1aad54a9..7fa3e8c8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtStructattr.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/StIvtStructattr.java
@@ -1,11 +1,13 @@
-package org.nl.wms.storage_manage.basedata.service.storage.dao;
+package org.nl.wms.masterdata_manage.storage.service.storage.dao;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -25,6 +27,7 @@ public class StIvtStructattr implements Serializable {
     /**
      * 仓位标识
      */
+    @TableId(value = "struct_id")
     private String struct_id;
 
     /**
@@ -120,12 +123,12 @@ public class StIvtStructattr implements Serializable {
     /**
      * 是否临时仓位
      */
-    private String is_tempstruct;
+    private Boolean is_tempstruct;
 
     /**
      * 超限货位关联的货位编号
      */
-    private String control_point;
+    private String control_code;
 
     /**
      * 创建人
@@ -140,7 +143,7 @@ public class StIvtStructattr implements Serializable {
     /**
      * 创建时间
      */
-    private String create_time;
+    private Date create_time;
 
     /**
      * 修改人
@@ -155,12 +158,8 @@ public class StIvtStructattr implements Serializable {
     /**
      * 修改时间
      */
-    private String update_time;
+    private Date update_time;
 
-    /**
-     * 是否删除
-     */
-    private String is_delete;
 
     /**
      * 背景色
@@ -185,17 +184,13 @@ public class StIvtStructattr implements Serializable {
     /**
      * 是否启用
      */
-    private String is_used;
+    private Boolean is_used;
 
     /**
      * 是否判断高度
      */
     private String is_zdepth;
 
-    /**
-     * 存储载具标识
-     */
-    private String storagevehicle_id;
 
     /**
      * 存储载具号
@@ -205,7 +200,7 @@ public class StIvtStructattr implements Serializable {
     /**
      * 是否空载具
      */
-    private String is_emptyvehicle;
+    private Boolean is_emptyvehicle;
 
     /**
      * 载具数量
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtBsrealstorattrMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtBsrealstorattrMapper.java
similarity index 61%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtBsrealstorattrMapper.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtBsrealstorattrMapper.java
index b1ccb09d..fd48e52b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtBsrealstorattrMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtBsrealstorattrMapper.java
@@ -1,7 +1,7 @@
-package org.nl.wms.storage_manage.basedata.service.storage.dao.mapper;
+package org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
 
 /**
  * <p>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtSectattrMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtSectattrMapper.java
new file mode 100644
index 00000000..b34b2451
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtSectattrMapper.java
@@ -0,0 +1,20 @@
+package org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 库区属性表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+public interface StIvtSectattrMapper extends BaseMapper<StIvtSectattr> {
+
+    List<Map<String, String>>  getSectByStorQuery(Map<String,Object> query);
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtStructattrMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtStructattrMapper.java
similarity index 60%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtStructattrMapper.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtStructattrMapper.java
index 091d9e1e..2c9de372 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtStructattrMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/StIvtStructattrMapper.java
@@ -1,7 +1,7 @@
-package org.nl.wms.storage_manage.basedata.service.storage.dao.mapper;
+package org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
 
 /**
  * <p>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtBsrealstorattrMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtBsrealstorattrMapper.xml
similarity index 58%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtBsrealstorattrMapper.xml
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtBsrealstorattrMapper.xml
index 1bc02fdc..eb8e23ff 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtBsrealstorattrMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtBsrealstorattrMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtBsrealstorattrMapper">
+<mapper namespace="org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper.StIvtBsrealstorattrMapper">
 
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml
new file mode 100644
index 00000000..14ffda24
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtSectattrMapper.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper.StIvtSectattrMapper">
+
+    <select id="getSectByStorQuery" resultType="java.util.Map">
+        SELECT
+            st_ivt_sectattr.sect_name,
+            st_ivt_sectattr.sect_id,
+            st_ivt_sectattr.sect_code,
+            st_ivt_bsrealstorattr.stor_name,
+            st_ivt_bsrealstorattr.stor_id,
+            st_ivt_bsrealstorattr.stor_code
+        FROM
+            st_ivt_sectattr
+                LEFT JOIN st_ivt_bsrealstorattr stor ON st_ivt_sectattr.stor_id = stor.stor_id
+        WHERE
+            stor.is_used = '1'
+            <if test="is_virtualstore != null and is_virtualstore != ''">
+               and stor.is_virtualstore = #{is_virtualstore}
+            </if>
+            <if test="is_semi_finished != null and is_semi_finished != ''">
+               and stor.is_semi_finished = #{is_semi_finished}
+            </if>
+            <if test="is_productstore != null and is_productstore != ''">
+               and stor.is_productstore = #{is_productstore}
+            </if>
+            <if test="is_attachment != null and is_attachment != ''">
+               and stor.is_attachment = #{is_attachment}
+            </if>
+            <if test="is_reversed != null and is_reversed != ''">
+               and stor.is_reversed = #{is_reversed}
+            </if>
+            <if test="stor_id != null and stor_id != ''">
+               and stor.stor_id = #{stor_id}
+            </if>
+            <if test="stor_id != null and stor_id != ''">
+               and stor.stor_id = #{stor_id}
+            </if>
+            <if test="stor_id != null and stor_id != ''">
+               and stor.stor_id = #{stor_id}
+            </if>
+            <if test="sect_type_attr != null and stor_id != ''">
+               and st_ivt_sectattr.sect_type_attr = #{sect_type_attr}
+            </if>
+    </select>
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtStructattrMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtStructattrMapper.xml
similarity index 59%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtStructattrMapper.xml
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtStructattrMapper.xml
index 761ac988..d3d05f95 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtStructattrMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dao/mapper/xml/StIvtStructattrMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtStructattrMapper">
+<mapper namespace="org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper.StIvtStructattrMapper">
 
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/SectattrQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/SectattrQuery.java
new file mode 100644
index 00000000..31229e7a
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/SectattrQuery.java
@@ -0,0 +1,24 @@
+package org.nl.wms.masterdata_manage.storage.service.storage.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/14 17:13
+ */
+@Data
+public class SectattrQuery extends BaseQuery<StIvtSectattr> {
+
+    private String search;
+    private String stor_id;
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("search", QParam.builder().k(new String[]{"sect_code","sect_name"}).type(QueryTEnum.LK).build());
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java
new file mode 100644
index 00000000..73ffcfa2
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/dto/StructarrQuery.java
@@ -0,0 +1,26 @@
+package org.nl.wms.masterdata_manage.storage.service.storage.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/14 17:13
+ */
+@Data
+public class StructarrQuery extends BaseQuery<StIvtStructattr> {
+
+    private String search;
+    private String stor_id;
+    private String sect_id;
+    //struct.storagevehicle_code is null or struct.storagevehicle_code = ''
+    private String lock_type;
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("search", QParam.builder().k(new String[]{"struct_code","struct_name"}).type(QueryTEnum.LK).build());
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtBsrealstorattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtBsrealstorattrServiceImpl.java
new file mode 100644
index 00000000..e39fa188
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtBsrealstorattrServiceImpl.java
@@ -0,0 +1,35 @@
+package org.nl.wms.masterdata_manage.storage.service.storage.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper.StIvtBsrealstorattrMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 实物库属性表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+@Service
+public class StIvtBsrealstorattrServiceImpl extends ServiceImpl<StIvtBsrealstorattrMapper, StIvtBsrealstorattr> implements IStIvtBsrealstorattrService {
+
+    @Override
+    public String create(JSONObject form) {
+        return null;
+    }
+
+    @Override
+    public String updateForm(JSONObject form) {
+        return null;
+    }
+
+    @Override
+    public void changeActive(JSONObject json) {
+
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtSectattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtSectattrServiceImpl.java
new file mode 100644
index 00000000..78a1a0f6
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtSectattrServiceImpl.java
@@ -0,0 +1,131 @@
+package org.nl.wms.masterdata_manage.storage.service.storage.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.jsonwebtoken.lang.Assert;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper.StIvtSectattrMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 库区属性表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+@Service
+public class StIvtSectattrServiceImpl extends ServiceImpl<StIvtSectattrMapper, StIvtSectattr> implements IStIvtSectattrService {
+    //仓库
+    @Autowired
+    private IStIvtBsrealstorattrService storattrService;
+    //仓位
+    @Autowired
+    private IStIvtStructattrService structattrService;
+
+    @Override
+    public String create(JSONObject form) {
+        Assert.notNull(form,"参数不能为空");
+        StIvtSectattr one = this.getOne(new QueryWrapper<StIvtSectattr>().eq("sect_code",form.getString("sect_code")));
+        if (one != null) {
+            throw new BadRequestException("存在相同的仓库编号");
+        }
+        StIvtSectattr sectattr = form.toJavaObject(StIvtSectattr.class);
+        sectattr.setSect_id(IdUtil.getStringId());
+        sectattr.setCreate_id(SecurityUtils.getCurrentUserId());
+        sectattr.setCreate_name(SecurityUtils.getCurrentNickName());
+        sectattr.setCreate_time(new Date());
+        packageSectForm(form, sectattr);
+        this.save(sectattr);
+
+        return sectattr.getSect_id();
+    }
+
+    private void packageSectForm(JSONObject form, StIvtSectattr sectattr) {
+        StIvtBsrealstorattr storattr = storattrService.getOne(new QueryWrapper<StIvtBsrealstorattr>().eq("stor_id", form.getString("stor_id")));
+        sectattr.setStor_id(storattr.getStor_id());
+        sectattr.setStor_code(storattr.getStor_code());
+        sectattr.setStor_name(storattr.getStor_name());
+    }
+
+    @Override
+    public String updateForm(JSONObject form) {
+        Assert.notNull(form,"参数不能为空");
+
+        String sect_id = form.getString("sect_id");
+        StIvtSectattr one = this.getOne(new QueryWrapper<StIvtSectattr>().eq("sect_id", form.getString("sect_id")));
+        if (one == null) {
+            throw new BadRequestException(form.getString("sect_id")+"被删除，操作失败!");
+        }
+        StIvtSectattr sectattr = form.toJavaObject(StIvtSectattr.class);
+        packageSectForm(form, sectattr);
+        sectattr.setUpdate_id(SecurityUtils.getCurrentUserId());
+        sectattr.setUpdate_name(SecurityUtils.getCurrentNickName());
+        sectattr.setUpdate_time(new Date());
+        return sect_id;
+    }
+
+    @Override
+    @Transactional
+    public void changeActive(JSONObject form) {
+        Assert.notNull(form,"参数不能为空");
+
+        StIvtBsrealstorattr storattr = storattrService.getOne(new QueryWrapper<StIvtBsrealstorattr>().eq("stor_id", form.getString("stor_id")));
+        if (!storattr.getIs_used()){
+            throw new BadRequestException(form.getString("stor_id")+"该库区所属的仓库已禁用，请先启用该仓库!");
+        }
+
+        this.update(new UpdateWrapper<StIvtSectattr>()
+                .set("is_used",form.getString("is_used"))
+                .set("update_id",SecurityUtils.getCurrentUserId())
+                .set("update_name",SecurityUtils.getCurrentNickName())
+                .set("update_time",new Date())
+                .eq("sect_id",form.getString("sect_id")));
+
+        structattrService.update(new UpdateWrapper<StIvtStructattr>()
+                .set("is_used",form.getString("is_used"))
+                .set("update_id",SecurityUtils.getCurrentUserId())
+                .set("update_name",SecurityUtils.getCurrentNickName())
+                .set("update_time",new Date())
+                .eq("sect_id",form.getString("sect_id")));
+    }
+
+    @Override
+    public List<Map> getSect(JSONObject json) {
+        List<Map<String, String>> sects = this.baseMapper.getSectByStorQuery(json);
+        Map<String, List<Map<String, String>>> groupBy_stor_id = sects.stream().collect(Collectors.groupingBy(a -> (String)((Map)a).get("stor_id")));
+        List stor_ja = new ArrayList<>();
+        for (Map.Entry<String, List<Map<String, String>>> entry : groupBy_stor_id.entrySet()) {
+            Map stor_cas = new HashMap<>();
+            List<Map<String, String>> sectList = entry.getValue();
+            stor_cas.put("value", entry.getKey());
+            stor_cas.put("label", sectList.get(0).get("stor_name"));
+            List sect_ja = new ArrayList<>();
+            for (Map<String, String> map : sectList) {
+                Map sect_cas = new HashMap<>();
+                sect_cas.put("value", map.get("sect_id"));
+                sect_cas.put("label", map.get("sect_name"));
+                sect_ja.add(sect_cas);
+            }
+            stor_cas.put("children", sect_ja);
+            stor_ja.add(stor_cas);
+        }
+        return stor_ja;
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtStructattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtStructattrServiceImpl.java
new file mode 100644
index 00000000..7b5536e6
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/storage/impl/StIvtStructattrServiceImpl.java
@@ -0,0 +1,99 @@
+package org.nl.wms.masterdata_manage.storage.service.storage.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.jsonwebtoken.lang.Assert;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.mapper.StIvtStructattrMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 仓位属性表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-04
+ */
+@Service
+public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMapper, StIvtStructattr> implements IStIvtStructattrService {
+
+    @Autowired
+    private IStIvtSectattrService sectattrService;
+    @Autowired
+    private IStIvtBsrealstorattrService storattrService;
+
+    @Override
+    public String create(JSONObject form) {
+        Assert.notNull(form,"请求参数不能为空");
+        StIvtStructattr one = this.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", form.getString("struct_code")));
+        if (one != null) {
+            throw new BadRequestException("存在相同的库区编号");
+        }
+        StIvtStructattr structattr = form.toJavaObject(StIvtStructattr.class);
+        structattr.setStruct_id(IdUtil.getStringId());
+        structattr.setCreate_id(SecurityUtils.getCurrentUserId());
+        structattr.setCreate_name(SecurityUtils.getCurrentNickName());
+        structattr.setCreate_time(new Date());
+        packageFormByattr(form, structattr);
+        this.save(structattr);
+        return structattr.getStruct_id();
+    }
+
+    private void packageFormByattr(JSONObject form, StIvtStructattr structattr) {
+        库区仓库:{
+            StIvtSectattr sectarr = sectattrService.getOne(new QueryWrapper<StIvtSectattr>().eq("sect_id", form.getString("sect_id")));
+            structattr.setSect_id(sectarr.getSect_id());
+            structattr.setSect_code(sectarr.getSect_code());
+            structattr.setSect_name(sectarr.getSect_name());
+            structattr.setStor_id(sectarr.getStor_id());
+            structattr.setStor_code(sectarr.getStor_code());
+            structattr.setStor_name(sectarr.getStor_name());
+        }
+    }
+
+    @Override
+    public String updateForm(JSONObject form) {
+        Assert.notNull(form,"请求参数不能为空");
+        StIvtStructattr one = this.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", form.getString("struct_code")));
+        if (one == null) {
+            throw new BadRequestException(form.getString("struct_code")+"被删除，操作失败!");
+        }
+        StIvtStructattr structattr = form.toJavaObject(StIvtStructattr.class);
+        structattr.setUpdate_id(SecurityUtils.getCurrentUserId());
+        structattr.setUpdate_name(SecurityUtils.getCurrentNickName());
+        structattr.setUpdate_time(new Date());
+        packageFormByattr(form, structattr);
+        this.updateById(structattr);
+        return  structattr.getStruct_id();
+    }
+
+    @Override
+    public void changeActive(JSONObject form) {
+        Assert.notNull(form,"请求参数不能为空");
+        StIvtSectattr sectarr = sectattrService.getOne(new QueryWrapper<StIvtSectattr>().eq("sect_id", form.getString("sect_id")));
+        if (!sectarr.getIs_used()){
+            throw new BadRequestException("该仓位所属的库区已禁用，请先启用该库区!");
+        }
+
+        this.update(new UpdateWrapper<StIvtStructattr>()
+                .set("is_used",form.getString("is_used"))
+                .set("update_id",SecurityUtils.getCurrentUserId())
+                .set("update_name",SecurityUtils.getCurrentNickName())
+                .set("update_time",new Date())
+                .eq("struct_id",form.getString("struct_id")));
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructivtController.java
deleted file mode 100644
index 93528a7f..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructivtController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-
-package org.nl.wms.masterdata_manage.备份st.rest;
-
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
- import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.备份st.service.StructivtService;
-import org.nl.wms.masterdata_manage.备份st.service.dto.StructivtDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
-* @author geng by
-* @date 2022-06-02
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "库存管理管理")
-@RequestMapping("/api/structivt")
-@Slf4j
-public class StructivtController {
-
-    private final StructivtService structivtService;
-
-    @GetMapping
-    @Log("查询库存管理")
-    @ApiOperation("查询库存管理")
-    //@PreAuthorize("@el.check('structivt:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(structivtService.queryAll(whereJson,page),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增库存管理")
-    @ApiOperation("新增库存管理")
-    //@PreAuthorize("@el.check('structivt:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody StructivtDto dto){
-        structivtService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改库存管理")
-    @ApiOperation("修改库存管理")
-    //@PreAuthorize("@el.check('structivt:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody StructivtDto dto){
-        structivtService.update(dto);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除库存管理")
-    @ApiOperation("删除库存管理")
-    //@PreAuthorize("@el.check('structivt:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        structivtService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @GetMapping("/getStruct")
-    @Log("查询仓位下拉")
-    @ApiOperation("查询仓位下拉")
-    //@PreAuthorize("@el.check('structivt:list')")
-    public ResponseEntity<Object> getStruct(){
-        return new ResponseEntity<>(structivtService.getStruct(),HttpStatus.OK);
-    }
-
-    @PostMapping("/getStructById")
-    @Log("根据仓位id查询仓位信息")
-    @ApiOperation("根据仓位id查询仓位信息")
-    //@PreAuthorize("@el.check('structivt:list')")
-    public ResponseEntity<Object> getStructById(@RequestBody JSONObject param){
-        return new ResponseEntity<>(structivtService.getStructById(param),HttpStatus.OK);
-    }
-
-    @GetMapping("/getUnits")
-    @Log("查询计量单位下拉")
-    @ApiOperation("查询计量单位下拉")
-    //@PreAuthorize("@el.check('structivt:list')")
-    public ResponseEntity<Object> getUnits(){
-        return new ResponseEntity<>(structivtService.getUnits(),HttpStatus.OK);
-    }
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/pcs.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/pcs.xls
index 3a54ae55331ba498471503b040d98fd999a67b7f..f2e40e8d3c58ba3d4a9ffabe2ccc72c2e01fef28 100644
GIT binary patch
delta 47
zcmZoT!rO3!cS8;fo5Rh<#B0r)i&(ZXa<DQm7+RQFm^2%(wHvT80x{Ee12*Oh(Ey2i
B4rTxV

delta 47
zcmZoT!rO3!cS8;fTfqB{s{HcJMJ(GGIhYw3ql*lS1e*=m+6~wkftYE#0UPs$XaJ5H
B4z2(I

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls
index cdfa148f1c056a489f13a6f7bb951034c041f1c6..f19f70badcd7355078f31fe8ef1c82a5f1775a2b 100644
GIT binary patch
delta 33
ncmZpez}ql^cS8;fTS9NK`L*WeB9`_d7Dgau+Fr!M+~*7c&E*S7

delta 33
ncmZpez}ql^cS8;fn}fnGzJK-2MJ(+_EQ~<Rw7rOhxz8B@#`X&R

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/PointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/PointServiceImpl.java
index 17fe80a6..1b7d072e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/PointServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/PointServiceImpl.java
@@ -13,8 +13,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.ConstantParam;
 import org.nl.common.enums.StatusEnum;
-import org.nl.common.publish.event.PointEvent;
-import org.nl.common.publish.listener.PointListener;
 import org.nl.common.utils.MapOf;
 import org.nl.modules.common.exception.BadRequestException;
  import org.nl.common.utils.SecurityUtils;
@@ -42,7 +40,7 @@ import java.util.*;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class PointServiceImpl extends PointListener implements PointService {
+public class PointServiceImpl implements PointService {
 
     private final RegionService regionService;
     private final StructivtService structivtService;
@@ -343,8 +341,4 @@ public class PointServiceImpl extends PointListener implements PointService {
         return load_series;
     }
 
-    @Override
-    protected void doEvent(PointEvent event) {
-        super.doEvent(event);
-    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/sch.xls
index e02042b6ee5d31bb98f5f661f572df062060bef4..17e9be06fb695cda90132b7a606c42be83787805 100644
GIT binary patch
delta 29
lcmZqJ!QHTfdqWNjTf$++_G`_}MJ(+_ER5TWSeW{*0|2c23p@Y-

delta 29
lcmZqJ!QHTfdqWNj+XGGIz<>44MJ(+_ER5TWSeW{*0|2b53o-xz

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/PointListener.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/PointListener.java
new file mode 100644
index 00000000..23debd2c
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/PointListener.java
@@ -0,0 +1,16 @@
+package org.nl.wms.scheduler_manage.service.point;
+
+import org.nl.common.publish.AbstraceListener;
+import org.nl.common.publish.event.PublishEvent;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/12 11:30
+ */
+public class PointListener extends AbstraceListener {
+    //返回值用于回调
+    @Override
+    protected String doEvent(PublishEvent event) {
+        return null;
+    }
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java
index aa40ca0c..72567273 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java
@@ -14,11 +14,6 @@ import io.jsonwebtoken.lang.Assert;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.common.publish.BussEventMulticaster;
-import org.nl.common.publish.PublishEvent;
-import org.nl.common.publish.event.PointEvent;
-import org.nl.common.publish.event.VechlieEvent;
-import org.nl.common.publish.listener.PointListener;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
@@ -143,6 +138,6 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
         //如果是仓位点位，更新状态前，先去查询仓位点位所对应的库区是否启用，如果禁用抛出异常 //如果启用，则同步更新仓位的状态
         this.update(form);
         WQLObject.getWQLObject("sch_base_point").update(form);
-        BussEventMulticaster.Publish(new PointEvent());
+        //BussEventMulticaster.Publish(new PointEvent());
     }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHANGE_BILL_TYPE_ENUM.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHANGE_BILL_TYPE_ENUM.java
new file mode 100644
index 00000000..e6b10a6a
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/CHANGE_BILL_TYPE_ENUM.java
@@ -0,0 +1,43 @@
+package org.nl.wms.storage_manage;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.nl.common.utils.MapOf;
+
+import java.util.Map;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/10 11:41
+ */
+@AllArgsConstructor
+@Getter
+public enum CHANGE_BILL_TYPE_ENUM {
+    //出入库
+    IOSTORINV_IN_SEND("1","入库下发", MapOf.of("warehousing_qty",true),1),
+    IOSTORINV_IN_CACEL("2","入库取消",MapOf.of("warehousing_qty",false),1<<1),
+    IOSTORINV_IN_CONFIRM("3","入库确认",MapOf.of("warehousing_qty",false,"canuse_qty",true),1<<2),
+    IOSTORINV_OUT_SEND("1","出库下发",MapOf.of("frozen_qty",true,"canuse_qty",false),1<<3),
+    IOSTORINV_OUT_CACEL("2","出库取消",MapOf.of("frozen_qty",false,"canuse_qty",true),1<<4),
+    IOSTORINV_OUT_CONFIRM("3","出库确认",MapOf.of("frozen_qty",false),1<<5),
+    //移库
+    IMOVEINV_IN_SEND("1","移库入下发", MapOf.of("warehousing_qty",true),1<<6),
+    MOVEINV_IN_CACEL("2","移库入取消",MapOf.of("warehousing_qty",false),1<<7),
+    MOVEINV_IN_CONFIRM("3","移库入确认",MapOf.of("warehousing_qty",false,"canuse_qty",true),1<<8),
+    MOVEINV_OUT_SEND("1","移库出下发",MapOf.of("frozen_qty",true,"canuse_qty",false),1<<9),
+    MOVEINV_OUT_CACEL("2","移库出取消",MapOf.of("frozen_qty",false,"canuse_qty",true),1<<10),
+    IMOVEINV_OUT_CONFIRM("3","移库出确认",MapOf.of("frozen_qty",false),1<<11),
+    MOVEINV_IN("3","移库入库",MapOf.of(),1<<12),
+    MOVEINV_OUT("4","移库出库",MapOf.of(),1<<13),
+    CHECK_IN("3","盘点单出库",MapOf.of(),1<<14),
+    CHECK_OUT("4","盘点单回库",MapOf.of(),1<<15),
+    //损益
+    MOVEORLESS_IN("5","损溢单入库",MapOf.of("canuse_qty",true),1<<14),
+    MOVEORLESS_OUT("6","损溢单出库",MapOf.of("canuse_qty",false),1<<15),
+    ;
+    private String code;
+    private String desc;
+    //字段关系。根据单据状态判断字段是增加还是减少
+    private Map<String,Boolean> fieldRelation;
+    private int bitType;
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/ST_CHANGE_TYPE.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/ST_CHANGE_TYPE.java
deleted file mode 100644
index 4775c4a7..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/ST_CHANGE_TYPE.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.nl.wms.storage_manage;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/*
- * @author ZZQ
- * @Date 2023/5/10 11:41
- */
-@AllArgsConstructor
-@Getter
-public enum ST_CHANGE_TYPE {
-    IOSTORINV_IN("1","入库",""),
-    IOSTORINV_OUT("1","出库",""),
-    MOVEINV_IN("1","移库入库",""),
-    MOVEINV_OUT("1","移库出库",""),
-    MOVEORLESS_IN("1","损溢单入库",""),
-    MOVEORLESS_OUT("1","损溢单出库",""),
-    ;
-    private String code;
-    private String desc;
-    private String table;
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/StorEvent.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/StorEvent.java
index c9f39c15..b8a7bac5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/StorEvent.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/StorEvent.java
@@ -1,9 +1,10 @@
 package org.nl.wms.storage_manage;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import org.nl.common.publish.PublishEvent;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.nl.common.publish.event.PublishEvent;
 
 import java.math.BigDecimal;
 
@@ -12,16 +13,17 @@ import java.math.BigDecimal;
  * @Date 2023/5/10 11:37
  * 仓库物料事件
  */
-@Builder
+@SuperBuilder
 @AllArgsConstructor
+@NoArgsConstructor
 @Data
-public class StorEvent implements PublishEvent {
+public class StorEvent extends PublishEvent {
 
     private String struct_id;
     private String material_id;
     private String pcsn;
     private String bill_code;
-    public ST_CHANGE_TYPE ST_CHANGE_TYPE;
+    public CHANGE_BILL_TYPE_ENUM ST_CHANGE_TYPE;
     private BigDecimal change_qty;
     private BigDecimal result_qty;
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/StorEventListener.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/StorEventListener.java
index 4ab89bc8..d7f893db 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/StorEventListener.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/StorEventListener.java
@@ -1,19 +1,12 @@
 package org.nl.wms.storage_manage;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.publish.AbstraceListener;
-import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow;
-import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtIostordailyService;
 import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService;
-import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-
 /*
  * @author ZZQ
  * @Date 2023/5/10 11:39
@@ -26,27 +19,8 @@ public class StorEventListener extends AbstraceListener<StorEvent> {
     @Autowired
     IStIvtStructattrService structattrService;
     @Override
-    protected void doEvent(StorEvent event) {
-        StIvtStructivtflow flow = new StIvtStructivtflow();
-        基础数据封装: {
-            flow.setChange_id(IdUtil.getStringId());
-            flow.setMaterial_id(event.getMaterial_id());
-            flow.setPcsn(event.getPcsn());
-            flow.setBill_code(event.getBill_code());
-            flow.setBill_type_scode(event.ST_CHANGE_TYPE.getCode());
-            flow.setChange_qty(event.getChange_qty());
-            flow.setResult_qty(event.getResult_qty());
-            flow.setChange_person_name(SecurityUtils.getCurrentNickName());
-            flow.setChange_person_id(SecurityUtils.getCurrentUserId());
-            flow.setChange_time(new Date());
-        }
-        参数数据封装: {
-            StIvtStructattr struct = structattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_id", event.getStruct_id()));
-            flow.setStruct_id(event.getStruct_id());
-            flow.setStruct_name(struct.getStruct_name());
-            flow.setStruct_code(struct.getStruct_code());
-            flow.setStor_id(struct.getStor_id());
-        }
-        StructivtflowService.save(flow);
+    protected String doEvent(StorEvent event) {
+
+        return null;
     }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
deleted file mode 100644
index 49e77da2..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.nl.wms.storage_manage.basedata.controller.storage;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.TableDataInfo;
-import org.nl.common.anno.Log;
-import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 实物库属性表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@RequestMapping("/api/stIvtBsrealstorattr")
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "实物库属性表")
-@Slf4j
-public class StIvtBsrealstorattrController {
-
-    @Autowired
-    protected IStIvtBsrealstorattrService stIvtBsrealstorattrService;
-
-
-    @PostMapping("/queryStor")
-    @Log("查询仓库")
-    @ApiOperation("查询仓库")
-    public ResponseEntity<Object> queryStor() {
-        List<StIvtBsrealstorattr> list = stIvtBsrealstorattrService.list(new QueryWrapper<StIvtBsrealstorattr>().eq("is_used", true));
-        return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
-    }
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtSectattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtSectattrController.java
deleted file mode 100644
index 943dc9e1..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtSectattrController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.storage_manage.basedata.controller.storage;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 库区属性表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@RestController
-@RequestMapping("/stIvtSectattr")
-public class StIvtSectattrController {
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java
deleted file mode 100644
index e51fa187..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.storage_manage.basedata.controller.storage;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 仓位属性表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@RestController
-@RequestMapping("/stIvtStructattr")
-public class StIvtStructattrController {
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java
index 39b0c278..2029478f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dao/StIvtStructivtflow.java
@@ -45,27 +45,31 @@ public class StIvtStructivtflow implements Serializable {
     /**
      * 物料标识
      */
-    private String material_id;
+    private String material_code;
 
+    /**
+     * 物料规格
+     */
+    private String material_spec;
+
+    /**
+     * 批次
+     */
+    private String pcsn;
     /**
      * 品质类型
      */
     private String quality_scode;
 
-    /**
-     * 库存等级
-     */
-    private String ivt_level;
-
     /**
      * 是否可用
      */
     private Boolean is_active;
 
     /**
-     * 批次
+     * 库存等级
      */
-    private String pcsn;
+    private String ivt_level;
 
     /**
      * 仓库标识
@@ -75,7 +79,7 @@ public class StIvtStructivtflow implements Serializable {
     /**
      * 单据类型
      */
-    private String bill_type_scode;
+    private String bill_type;
 
     /**
      * 单据标识
@@ -93,24 +97,24 @@ public class StIvtStructivtflow implements Serializable {
     private String bill_table;
 
     /**
-     * 变动类型
+     * 变动类型：单据类型
      */
     private String change_type_scode;
 
     /**
      * 变动时间
      */
-    private Date change_time;
+    private Date create_time;
 
     /**
      * 变动人
      */
-    private String change_person_id;
+    private String create_id;
 
     /**
      * 变动人姓名
      */
-    private String change_person_name;
+    private String create_name;
 
     /**
      * 变动数
@@ -131,6 +135,10 @@ public class StIvtStructivtflow implements Serializable {
      * 车间标识
      */
     private String product_area;
+    /**
+     * 车间标识
+     */
+    private Boolean is_add;
 
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dto/StIvtStructivtflowDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dto/StIvtStructivtflowDto.java
new file mode 100644
index 00000000..fbda825c
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/dto/StIvtStructivtflowDto.java
@@ -0,0 +1,79 @@
+package org.nl.wms.storage_manage.basedata.service.record.dto;
+
+import lombok.Builder;
+import lombok.Data;
+import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 仓位库存变动记录表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-10
+ */
+@Data
+@Builder
+public class StIvtStructivtflowDto {
+
+    /**
+     * 仓位编码
+     */
+    private String struct_code;
+    /**
+     * 物料
+     */
+    private String material_id;
+
+    /**
+     * 批次
+     */
+    private String pcsn;
+
+    /**
+     * 单据编号
+     */
+    private String bill_code;
+
+    /**
+     * 单据对应业务表主表
+     */
+    private String bill_table;
+
+    /**
+     * 变动类型：单据类型
+     */
+    private CHANGE_BILL_TYPE_ENUM change_type_scode;
+
+    /**
+     * 变动数
+     */
+    private BigDecimal change_qty;
+
+    /**
+     * 结存数
+     */
+    private BigDecimal result_qty;
+    /**
+     * 期初数
+     */
+    private BigDecimal start_qty;
+
+    /**
+     * 数量计量单位标识
+     */
+    private String base_unit_name;
+    /**
+     * 载具编号
+     */
+    private String storagevehicle_code;
+    /**
+     * 当前任务编号
+     */
+    private String task_id;
+
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java
index 8a1780a5..7c56dbaf 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/IStIvtStructivtflowService.java
@@ -2,6 +2,7 @@ package org.nl.wms.storage_manage.basedata.service.record.service;
 
 import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IStIvtStructivtflowService extends IService<StIvtStructivtflow> {
 
+    void recordStructivtFlow(StIvtStructivtflowDto flowDto);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java
index f6a54627..8262c9f7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/record/service/impl/StIvtStructivtflowServiceImpl.java
@@ -1,10 +1,23 @@
 package org.nl.wms.storage_manage.basedata.service.record.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
+import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
+import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
 import org.nl.wms.storage_manage.basedata.service.record.dao.StIvtStructivtflow;
 import org.nl.wms.storage_manage.basedata.service.record.dao.mapper.StIvtStructivtflowBcpMapper;
+import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto;
 import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -17,4 +30,51 @@ import org.springframework.stereotype.Service;
 @Service
 public class StIvtStructivtflowServiceImpl extends ServiceImpl<StIvtStructivtflowBcpMapper, StIvtStructivtflow> implements IStIvtStructivtflowService {
 
+    @Autowired
+    private IStIvtStructattrService structattrService;
+    @Autowired
+    private IMdMeMaterialbaseService materialbaseService;
+
+    @Override
+    @Transactional
+    public void recordStructivtFlow(StIvtStructivtflowDto flowDto) {
+        StIvtStructivtflow flow = new StIvtStructivtflow();
+        StIvtStructattr struct_attr = structattrService.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", flowDto.getStruct_code()));
+        flow.setChange_id(IdUtil.getStringId());
+        物料信息: {
+            MdMeMaterialbase material = materialbaseService.getOne(new QueryWrapper<MdMeMaterialbase>().eq("material_id", flowDto.getMaterial_id()));
+            flow.setMaterial_code(material.getMaterial_code());
+            flow.setMaterial_spec(material.getMaterial_spec());
+            flow.setPcsn(flowDto.getPcsn());
+        }
+        仓库信息:{
+            flow.setStruct_code(struct_attr.getStruct_code());
+            flow.setStruct_id(struct_attr.getStruct_id());
+            flow.setStor_id(struct_attr.getStor_id());
+        }
+        flow.setBill_code(flowDto.getBill_code());
+        flow.setChange_type_scode(flowDto.getChange_type_scode().getCode());
+        flow.setBill_table(flowDto.getBill_table());
+        flow.setChange_qty(flowDto.getChange_qty());
+        flow.setResult_qty(flowDto.getResult_qty());
+        flow.setCreate_id(SecurityUtils.getCurrentUserId());
+        flow.setCreate_name(SecurityUtils.getCurrentNickName());
+        flow.setCreate_time(new Date());
+        this.save(flow);
+
+        struct_attr.setStoragevehicle_code(flowDto.getStoragevehicle_code());
+        struct_attr.setInv_code(flowDto.getBill_code());
+        struct_attr.setInv_type(flowDto.getChange_type_scode().getCode());
+        //判断如果在3个状态之内，更新操作
+        int tag = 1 << CHANGE_BILL_TYPE_ENUM.IMOVEINV_OUT_CONFIRM.getBitType()
+                | 1 << CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM.getBitType()
+                | 1 << CHANGE_BILL_TYPE_ENUM.MOVEINV_IN_CONFIRM.getBitType()
+                | 1 << CHANGE_BILL_TYPE_ENUM.CHECK_OUT.getBitType()
+                | 1 << CHANGE_BILL_TYPE_ENUM.IOSTORINV_OUT_CONFIRM.getBitType();
+        if ((tag &~ 1 << flowDto.getChange_type_scode().getBitType()) != tag){
+            struct_attr.setInv_code("");
+            struct_attr.setInv_type("");
+        }
+        structattrService.updateById(struct_attr);
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtBsrealstorattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtBsrealstorattrService.java
deleted file mode 100644
index 007db998..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtBsrealstorattrService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.storage_manage.basedata.service.storage;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
-
-/**
- * <p>
- * 实物库属性表 服务类
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-public interface IStIvtBsrealstorattrService extends IService<StIvtBsrealstorattr> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtSectattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtSectattrService.java
deleted file mode 100644
index cb6c8671..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtSectattrService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.storage_manage.basedata.service.storage;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr;
-
-/**
- * <p>
- * 库区属性表 服务类
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-public interface IStIvtSectattrService extends IService<StIvtSectattr> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java
deleted file mode 100644
index 40a7cc7e..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.storage_manage.basedata.service.storage;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
-
-/**
- * <p>
- * 仓位属性表 服务类
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-public interface IStIvtStructattrService extends IService<StIvtStructattr> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtSectattrMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtSectattrMapper.java
deleted file mode 100644
index 93105790..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtSectattrMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.storage_manage.basedata.service.storage.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr;
-
-/**
- * <p>
- * 库区属性表 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-public interface StIvtSectattrMapper extends BaseMapper<StIvtSectattr> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtSectattrMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtSectattrMapper.xml
deleted file mode 100644
index 40ec2c48..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/mapper/StIvtSectattrMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtSectattrMapper">
-
-</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtBsrealstorattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtBsrealstorattrServiceImpl.java
deleted file mode 100644
index 5ca4fc79..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtBsrealstorattrServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.storage_manage.basedata.service.storage.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtBsrealstorattrMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 实物库属性表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@Service
-public class StIvtBsrealstorattrServiceImpl extends ServiceImpl<StIvtBsrealstorattrMapper, StIvtBsrealstorattr> implements IStIvtBsrealstorattrService {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtSectattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtSectattrServiceImpl.java
deleted file mode 100644
index 6dff7080..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtSectattrServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.storage_manage.basedata.service.storage.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.storage_manage.basedata.service.storage.IStIvtSectattrService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtSectattr;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtSectattrMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 库区属性表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@Service
-public class StIvtSectattrServiceImpl extends ServiceImpl<StIvtSectattrMapper, StIvtSectattr> implements IStIvtSectattrService {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java
deleted file mode 100644
index 929959e1..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.storage_manage.basedata.service.storage.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.storage_manage.basedata.service.storage.IStIvtStructattrService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtStructattr;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.mapper.StIvtStructattrMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 仓位属性表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@Service
-public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMapper, StIvtStructattr> implements IStIvtStructattrService {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
index f85a4255..e76ab6c7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
@@ -1,6 +1,5 @@
 package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -12,20 +11,16 @@ import org.jetbrains.annotations.NotNull;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
-import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService;
 import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService;
 import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService;
-import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord;
 import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext;
 import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo;
 import org.nl.wms.storage_manage.IOSEnum;
-import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpService;
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvdisCpService;
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvdisdtlCpService;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java
index fa3d2d23..1e2a7cc8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java
@@ -52,8 +52,7 @@ public class StIvtIostorinvBcpController {
     @Log("查询入库单据")
     @ApiOperation("查询入库单据")
     public ResponseEntity<Object> query(BcpIostorInvQuery query, PageQuery page) {
-        Page<StIvtIostorinvBcp> list = stIvtIostorinvBcpService.page(page.build(StIvtIostorinvBcp.class), query.build());
-        return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
+        return new ResponseEntity<>(stIvtIostorinvBcpService.queryDtl(query,page), HttpStatus.OK);
     }
 
     @PostMapping("/create")
@@ -86,15 +85,6 @@ public class StIvtIostorinvBcpController {
     }
 
 
-
-    @PostMapping("/queryStor")
-    @Log("查询仓库")
-    @ApiOperation("查询仓库")
-    public ResponseEntity<Object> queryStor() {
-        return new ResponseEntity<>(semiProductInService.queryStor(), HttpStatus.OK);
-    }
-
-
     @PostMapping("/commit")
     @Log("出入单提交")
     @ApiOperation("出入单提交")
@@ -107,85 +97,25 @@ public class StIvtIostorinvBcpController {
     @Log("查询入库分配明细")
     @ApiOperation("查询入库分配明细")
     public ResponseEntity<Object> getIODtl(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(stIvtIostorinvBcpService.getInvDis(whereJson), HttpStatus.OK);
+        return new ResponseEntity<>(stIvtIostorinvBcpService.getIoDtl(whereJson.toJavaObject(BcpIostorInvQuery.class)), HttpStatus.OK);
     }
 
-    @PostMapping("/confirmvehicle")
-    @Log("组盘确认")
-    @ApiOperation("组盘确认")
-    public ResponseEntity<Object> confirmvehicle(@RequestBody JSONObject whereJson) {
-        semiProductInService.confirmvehicle(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/divStruct")
-    @Log("分配货位")
-    @ApiOperation("分配货位")
-    public ResponseEntity<Object> divStruct(@RequestBody JSONObject whereJson) {
-        semiProductInService.divStruct(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/unDivStruct")
-    @Log("取消分配货位")
-    @ApiOperation("取消分配货位")
-    public ResponseEntity<Object> unDivStruct(@RequestBody JSONObject whereJson) {
-        semiProductInService.unDivStruct(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/divPoint")
-    @Log("设置起点")
-    @ApiOperation("设置起点")
-    public ResponseEntity<Object> divPoint(@RequestBody JSONObject whereJson) {
-        semiProductInService.divPoint(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/delDis")
-    @Log("删除分配")
-    @ApiOperation("删除分配")
-    public ResponseEntity<Object> delDis(@RequestBody JSONObject whereJson) {
-        semiProductInService.delDis(whereJson);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/queryBoxMater")
-    @Log("查询箱内子卷")
-    @ApiOperation("查询箱内子卷")
-    public ResponseEntity<Object> queryBoxMater(@RequestBody JSONArray whereJson) {
-        return new ResponseEntity<>(semiProductInService.queryBoxMater(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/updateTask")
-    @Log("变更任务")
-    @ApiOperation("变更任务")
-    public ResponseEntity<Object> updateTask(@RequestBody Map<String,Object> whereJson) {
-        semiProductInService.updateTask(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
 
     @PostMapping("/confirm")
     @Log("完成单据")
     @ApiOperation("完成单据")
-    public ResponseEntity<Object> confirm(@RequestBody Map<String,Object> whereJson) {
-        semiProductInService.confirm(whereJson);
+    public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
+        stIvtIostorinvBcpService.confirm(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @PostMapping("/autoDis")
-    @Log("自动分配")
-    @ApiOperation("自动分配")
-    public ResponseEntity<Object> autoDis(@RequestBody JSONObject whereJson) {
-        semiProductInService.autoDis(whereJson);
+    @PostMapping("/confirmTask")
+    @Log("下发任务")
+    @ApiOperation("下发任务")
+    public ResponseEntity<Object> confirmTask(@RequestBody JSONObject whereJson) {
+        stIvtIostorinvBcpService.confirmTask(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @PostMapping("/getDisTask")
-    @Log("获取明细任务")
-    @ApiOperation("获取明细任务")
-    public ResponseEntity<Object> getDisTask(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(semiProductInService.getDisTask(whereJson), HttpStatus.OK);
-    }
 }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpService.java
index ee4b6e46..face3a2d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvBcpService.java
@@ -1,8 +1,10 @@
 package org.nl.wms.storage_manage.semimanage.service.iostorInv;
 
 import com.alibaba.fastjson.JSONObject;
+import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery;
 
 import java.util.List;
 import java.util.Map;
@@ -16,12 +18,29 @@ import java.util.Map;
  * @since 2023-05-10
  */
 public interface IStIvtIostorinvBcpService extends IService<StIvtIostorinvBcp> {
+
+
+    Object queryDtl(BcpIostorInvQuery query, PageQuery page);
+
+    List<Map> getIoDtl(BcpIostorInvQuery query);
     /**
      * 新增
      * @param form
      * @return
      */
-     String create(JSONObject form);
+     void create(JSONObject form);
+    /**
+     * 完成
+     * @param form
+     * @return
+     */
+     String confirm(JSONObject form);
+    /**
+     * 下发单据
+     * @param form
+     * @return
+     */
+     String confirmTask(JSONObject form);
     /**
      * 修改单据
      * @param form
@@ -29,10 +48,4 @@ public interface IStIvtIostorinvBcpService extends IService<StIvtIostorinvBcp> {
      */
      String updateBill(JSONObject form);
 
-    /**
-     * 获取分配明细
-     * @param form
-     * @return
-     */
-     List<Map> getInvDis(JSONObject form);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvdisBcpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvdisBcpService.java
deleted file mode 100644
index 6f6d3f79..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/IStIvtIostorinvdisBcpService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.nl.wms.storage_manage.semimanage.service.iostorInv;
-
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvdisBcp;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单分配表 服务类
- * </p>
- *
- * @author generator
- * @since 2023-05-10
- */
-public interface IStIvtIostorinvdisBcpService extends IService<StIvtIostorinvdisBcp> {
-    /**
-     * 查询明细
-     * @param query：
-     * iostorinv_id "1656252437415202816"
-     * @return
-     */
-    List<Map> getIostorinvdis(Map query);
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java
index 676d48bf..71444510 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvBcp.java
@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author generator
- * @since 2023-05-10
+ * @since 2023-05-11
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -42,7 +42,6 @@ public class StIvtIostorinvBcp implements Serializable {
 
     /**
      * 业务类型
-     * alter table st_ivt_iostorinv_bcp modify buss_type  varchar(5) generated always as (bill_type) stored;
      */
     private String buss_type;
 
@@ -50,10 +49,8 @@ public class StIvtIostorinvBcp implements Serializable {
      * 单据类型
      */
     private String bill_type;
-
-
     /**
-     * 单据状态
+     * 单据zhuangtai
      */
     private String bill_status;
 
@@ -62,6 +59,11 @@ public class StIvtIostorinvBcp implements Serializable {
      */
     private Date biz_date;
 
+    /**
+     * 关联单据
+     */
+    private String base_bill_code;
+
     /**
      * 车间标识
      */
@@ -112,32 +114,45 @@ public class StIvtIostorinvBcp implements Serializable {
      */
     private String struct_name;
 
+    /**
+     * 物料标识
+     */
+    private String material_id;
+
+    /**
+     * 批次
+     */
+    private String pcsn;
+
+    /**
+     * 品质类型
+     */
+    private String quality_scode;
 
     /**
      * 库存等级
      */
     private String ivt_level;
 
+    /**
+     * 是否可用
+     */
+    private Boolean is_active;
 
     /**
-     * 总数量
+     * 数量
      */
-    private BigDecimal total_qty;
-
-    /**
-     * 明细数
-     */
-    private Integer detail_count;
+    private BigDecimal plan_qty;
 
     /**
      * 数量计量单位标识
      */
-    private String qty_unit_id;
+    private String base_unit_id;
 
     /**
      * 数量计量单位名称
      */
-    private String qty_unit_name;
+    private String base_unit_name;
 
     /**
      * 创建人
@@ -169,6 +184,35 @@ public class StIvtIostorinvBcp implements Serializable {
      */
     private Date update_time;
 
+    /**
+     * 执行状态
+     */
+    private String work_status;
+
+    /**
+     * 任务标识
+     */
+    private String task_id;
+
+    /**
+     * 存储载具标识
+     */
+    private String storagevehicle_id;
+
+    /**
+     * 存储载具编码
+     */
+    private String storagevehicle_code;
+
+    /**
+     * 存储载具类型
+     */
+    private String storagevehicle_type;
+
+    /**
+     * 单重
+     */
+    private BigDecimal unit_weight;
 
     /**
      * 是否删除
@@ -179,6 +223,10 @@ public class StIvtIostorinvBcp implements Serializable {
      * 备注
      */
     private String remark;
+    /**
+     * 入库点
+     */
+    private String point_code;
 
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvdisBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvdisBcp.java
deleted file mode 100644
index c3dead2f..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/StIvtIostorinvdisBcp.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.nl.wms.storage_manage.semimanage.service.iostorInv.dao;
-
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 出入库单分配表
- * </p>
- *
- * @author generator
- * @since 2023-05-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("st_ivt_iostorinvdis_bcp")
-public class StIvtIostorinvdisBcp implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 出入单分配标识
-     */
-    @TableId(value = "iostorinvdis_id")
-    private String iostorinvdis_id;
-
-    /**
-     * 出入单标识
-     */
-    private String iostorinv_id;
-
-
-    /**
-     * 明细序号
-     */
-    private Integer seq_no;
-
-    /**
-     * 关联基础单编号
-     */
-    private String base_bill_code;
-
-    /**
-     * 区域编码
-     */
-    private String region_code;
-
-    /**
-     * 区域名称
-     */
-    private String region_name;
-
-    /**
-     * 点位标识
-     */
-    private String struct_id;
-
-    /**
-     * 点位编码
-     */
-    private String struct_code;
-
-    /**
-     * 点位名称
-     */
-    private String struct_name;
-
-    /**
-     * 物料标识
-     */
-    private String material_id;
-
-    /**
-     * 批次
-     */
-    private String pcsn;
-
-    /**
-     * 品质类型
-     */
-    private String quality_scode;
-
-    /**
-     * 执行状态
-     */
-    @Deprecated
-    private String work_status;
-
-    /**
-     * 任务标识
-     */
-    private String task_id;
-
-    /**
-     * 存储载具标识
-     */
-    private String storagevehicle_id;
-
-    /**
-     * 存储载具编码
-     */
-    private String storagevehicle_code;
-    /**
-     * 单重
-     */
-    private BigDecimal unit_weight;
-
-    /**
-     * 数量计量单位标识
-     */
-    private String base_unit_id;
-
-    /**
-     * 数量计量单位名称
-     */
-    private String base_unit_name;
-
-    /**
-     * 数量
-     */
-    private BigDecimal plan_qty;
-
-    /**
-     * 出入点位标识
-     */
-    private String point_code;
-
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java
index 38deab2c..daa0175a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvBcpMapper.java
@@ -1,8 +1,13 @@
 package org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.nl.common.anno.Datazhuazhua;
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -14,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 @Datazhuazhua
 public interface StIvtIostorinvBcpMapper extends BaseMapper<StIvtIostorinvBcp> {
-
+    List<Map> getIostorinv(@Param("query") BcpIostorInvQuery query);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvdisBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvdisBcpMapper.java
deleted file mode 100644
index 0e6dca95..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/StIvtIostorinvdisBcpMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.mapper;
-
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvdisBcp;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单分配表 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2023-05-10
- */
-public interface StIvtIostorinvdisBcpMapper extends BaseMapper<StIvtIostorinvdisBcp> {
-
-    List<Map> getIostorinvdis(Map query);
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml
index e767b5a3..b9f88929 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml
@@ -1,5 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.mapper.StIvtIostorinvBcpMapper">
+    <select id="getIostorinv" resultType="java.util.Map">
+        SELECT
+        dtl.*,
+        mater.material_code,
+        mater.material_name,
+        mater.material_spec
+        FROM
+        st_ivt_iostorinv_bcp dtl
+        LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id
+        <where>
+            dtl.is_delete = false
+            <if test="query.stor_id != null and query.stor_id  != ''">
+                and dtl.stor_id =  #{query.stor_id }
+            </if>
+            <if test="query.iostorinv_id != null and query.iostorinv_id  != ''">
+                and dtl.iostorinv_id =  #{query.iostorinv_id }
+            </if>
+            <if test="query.bill_code != null and query.bill_code != ''">
+                and dtl.bill_code like  %${query.bill_code}%'
+            </if>
+            <if test="query.bill_status != null and query.bill_status != ''">
+                and dtl.bill_status =  #{query.bill_status}
+            </if>
+            <if test="query.io_type != null and query.io_type != ''">
+                and dtl.io_type =  #{query.io_type}
+            </if>
+            <if test="query.start_time != null and query.start_time != ''">
+                and dtl.create_time >= #{query.start_time}
+            </if>
+            <if test="query.end_time != null and query.end_time != ''">
+                and #{query.end_time} >= dtl.create_time
+            </if>
+        </where>
+        order by dtl.create_time desc
+    </select>
 
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisBcpMapper.xml
deleted file mode 100644
index 2f571568..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisBcpMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.mapper.StIvtIostorinvdisBcpMapper">
-
-    <select id="getIostorinvdis" resultType="java.util.Map">
-        SELECT
-        dtl.*,
-        mater.material_code,
-        mater.material_name,
-        mater.material_spec
-        FROM
-        st_ivt_iostorinvdis_bcp dtl
-        LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id
-        <where>
-            <if test="bill_code != null and bill_code != ''">
-                and dtl.bill_code =  #{bill_code}
-            </if>
-            <if test="iostorinv_id != null and iostorinv_id != ''">
-                and dtl.iostorinv_id = #{iostorinv_id}
-            </if>
-        </where>
-        order by dtl.seq_no ASC
-    </select>
-</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dto/BcpIostorInvQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dto/BcpIostorInvQuery.java
index a5d971a6..e3dd5f4c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dto/BcpIostorInvQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dto/BcpIostorInvQuery.java
@@ -4,7 +4,6 @@ import lombok.Data;
 import org.nl.common.domain.query.BaseQuery;
 import org.nl.common.domain.query.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
 
 /*
@@ -17,6 +16,8 @@ public class BcpIostorInvQuery extends BaseQuery<StIvtIostorinvBcp> {
 
     private String stor_id;
 
+    private String iostorinv_id;
+
     private String bill_status;
 
     private String bill_type;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java
index 274eb3be..6519398d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java
@@ -3,28 +3,41 @@ package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import io.jsonwebtoken.lang.Assert;
 import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.query.PageQuery;
+import org.nl.common.publish.BussEventMulticaster;
+import org.nl.common.publish.event.PointEvent;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.wms.storage_manage.IOSEnum;
-import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService;
-import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvdisBcpService;
+import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
+import org.nl.wms.storage_manage.basedata.service.record.dto.StIvtStructivtflowDto;
+import org.nl.wms.storage_manage.basedata.service.record.service.IStIvtStructivtflowService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp;
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvdisBcp;
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.mapper.StIvtIostorinvBcpMapper;
 import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQuery;
+import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
+import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 /**
  * <p>
@@ -38,27 +51,140 @@ import java.util.Map;
 public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpMapper, StIvtIostorinvBcp> implements IStIvtIostorinvBcpService {
 
     @Autowired
-    IStIvtBsrealstorattrService storattrService;
-
+    private IStIvtBsrealstorattrService storattrService;
     @Autowired
-    IStIvtIostorinvdisBcpService storinvdisBcpService;
+    private  IStIvtStructivtBcpService structivtBcpService;
+    @Autowired
+    private IStIvtStructivtflowService structivtflowService;
+    @Autowired
+    private IStIvtStructattrService structattrService;
+
+
+    @Override
+    public Object queryDtl(BcpIostorInvQuery query, PageQuery pageQuery) {
+        Page<Object> page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
+        TableDataInfo build = TableDataInfo.build(this.getIoDtl(query));
+        build.setTotalElements(page.getTotal());
+        return build;
+    }
+
+    @Override
+    public List<Map> getIoDtl(BcpIostorInvQuery query) {
+        return this.baseMapper.getIostorinv(query);
+    }
 
     @Override
     @Transactional
-    public String create(JSONObject form) {
+    public void create(JSONObject form) {
         Assert.notNull(form,"参数不能为空");
-        StIvtIostorinvBcp mst = packageMstForm(form);
-        this.save(mst);
-        int i = 1;
         for (Object item : form.getJSONArray("tableData")) {
-           JSONObject row = (JSONObject) item;
-            StIvtIostorinvdisBcp dis = packageDisForm(mst, i, row);
-            storinvdisBcpService.save(dis);
-            i++;
+            StIvtIostorinvBcp mst = new StIvtIostorinvBcp();
+            mst.setIostorinv_id(IdUtil.getStringId());
+            mst.setBill_code(CodeUtil.getNewCode("IO_CODE"));
+            mst.setBiz_date(form.getDate("biz_date"));
+            mst.setBill_type(form.getString("bill_type"));
+            mst.setIo_type(IOSEnum.IO_TYPE.code("入库"));
+            mst.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
+            mst.setRemark(form.getString("remark"));
+            mst.setProduct_area(form.getString("product_code"));
+            mst.setPoint_code(form.getString("point_code"));
+            仓库数据:{
+                StIvtBsrealstorattr stor = storattrService.getOne(new QueryWrapper<StIvtBsrealstorattr>().eq("stor_id", form.getString("stor_id")));
+                mst.setStor_id(stor.getStor_id());
+                mst.setStor_code(stor.getStor_code());
+                mst.setStor_name(stor.getStor_name());
+            }
+            packageRow(mst, (JSONObject) item);
+            mst.setCreate_id(SecurityUtils.getCurrentUserId());
+            mst.setCreate_name(SecurityUtils.getCurrentNickName());
+            mst.setCreate_time(new Date());
+            this.save(mst);
         }
-        return mst.getIostorinv_id();
     }
 
+    private void packageRow(StIvtIostorinvBcp mst, JSONObject row) {
+        mst.setMaterial_id(row.getString("material_id"));
+        mst.setPcsn(StringUtils.isNotEmpty(row.getString("pcsn"))? row.getString("pcsn"): DateUtil.today());
+        mst.setPlan_qty(row.getBigDecimal("plan_qty"));
+        mst.setQuality_scode(row.getString("quality_scode"));
+        mst.setBase_unit_id(row.getString("base_unit_id"));
+        mst.setBase_bill_code(row.getString("base_bill_code"));
+        mst.setBase_unit_name(row.getString("base_unit_name"));
+        mst.setUnit_weight(row.getBigDecimal("unit_weight"));
+        mst.setStoragevehicle_code(row.getString("storagevehicle_code"));
+        mst.setStoragevehicle_id(row.getString("storagevehicle_id"));
+    }
+
+    @Override
+    @Transactional
+    public String confirm(JSONObject form) {
+        Assert.notNull(new Object[]{form,form.get("iostorinv_id")},"请求参数不能为空");
+        StIvtIostorinvBcp mst = this.getById(form.getString("iostorinv_id"));
+        checkParam(mst);
+        mst.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
+        mst.setUpdate_time(new Date());
+        mst.setUpdate_id(SecurityUtils.getCurrentUserId());
+        mst.setUpdate_name(SecurityUtils.getCurrentNickName());
+        this.updateById(mst);
+        structivtBcpService.updateCashByParam(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM,mst.getPlan_qty(),mst.getStruct_code());
+
+        structivtflowService.recordStructivtFlow(
+                StIvtStructivtflowDto.builder()
+                        .bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_CONFIRM).bill_table("st_ivt_iostorinv_bcp")
+                        .material_id(mst.getMaterial_id()).pcsn(mst.getPcsn())
+                        .struct_code(mst.getStruct_code()).result_qty(structivtBcpService.getOne(new QueryWrapper<StIvtStructivtBcp>().eq("struct_code", mst.getStruct_code())).getCanuse_qty()).change_qty(mst.getPlan_qty())
+                        .task_id(mst.getTask_id())
+                        .storagevehicle_code(mst.getStoragevehicle_code())
+                        .build()
+        );
+        return null;
+    }
+
+    @Override
+    public String confirmTask(JSONObject form) {
+        Assert.notNull(new Object[]{form,form.get("iostorinv_id")},"请求参数不能为空");
+        StIvtIostorinvBcp mst = this.getById(form.getString("iostorinv_id"));
+        checkParam(mst);
+        //分配货位。下发任务，更新主单据状态。更新明细任务
+        List<StIvtStructivtBcp> struct_codes = structivtBcpService.allocationRules(1);
+        if (CollectionUtils.isEmpty(struct_codes)){
+            throw new BadRequestException("无可分配货位");
+        }
+        PointEvent event = PointEvent.builder()
+                .type(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_SEND.getCode())
+                .point_code1(mst.getPoint_code())
+                .point_code2(struct_codes.get(0).getStruct_code())
+                .callback((Consumer<String>) mst::setTask_id)
+                .build();
+        BussEventMulticaster.Publish(event);
+        mst.setBill_status(IOSEnum.BILL_STATUS.code("下发"));
+        mst.setUpdate_time(new Date());
+        mst.setUpdate_id(SecurityUtils.getCurrentUserId());
+        mst.setUpdate_name(SecurityUtils.getCurrentNickName());
+        this.updateById(mst);
+        //更新仓位
+        StIvtStructivtBcp struct = structivtBcpService.getOne(new QueryWrapper<StIvtStructivtBcp>().eq("struct_code", mst.getStruct_code()));
+        //插入库存变动表
+        structivtflowService.recordStructivtFlow(
+                StIvtStructivtflowDto.builder()
+                        .bill_code(mst.getBill_code()).change_type_scode(CHANGE_BILL_TYPE_ENUM.IOSTORINV_IN_SEND).bill_table("st_ivt_iostorinv_bcp")
+                        .material_id(mst.getMaterial_id()).pcsn(mst.getPcsn())
+                        .struct_code(mst.getStruct_code()).result_qty(struct.getCanuse_qty()).change_qty(mst.getPlan_qty())
+                        .task_id(mst.getTask_id())
+                        .storagevehicle_code(mst.getStoragevehicle_code())
+                        .build()
+        );
+        return mst.getTask_id();
+    }
+
+    private void checkParam(StIvtIostorinvBcp mst) {
+        if (mst == null || mst.getIs_delete()==true){
+            throw new BadRequestException("单据不存在");
+        }
+        if (!IOSEnum.BILL_STATUS.code("生成").equals(mst.getBill_status())){
+            throw new BadRequestException("单据"+ mst.getBill_code()+"状态不是生成状态");
+        }
+    }
 
     @Override
     @Transactional
@@ -68,66 +194,11 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl<StIvtIostorinvBcpM
         mst.setUpdate_id(SecurityUtils.getCurrentUserId());
         mst.setUpdate_name(SecurityUtils.getCurrentNickName());
         mst.setUpdate_time(new Date());
-        this.updateById(mst);
-        storinvdisBcpService.remove(new QueryWrapper<StIvtIostorinvdisBcp>().eq("iostorinv_id",mst.getIostorinv_id()));
-        int i = 1;
         for (Object item : form.getJSONArray("tableData")) {
-            JSONObject row = (JSONObject) item;
-            StIvtIostorinvdisBcp dis = packageDisForm(mst, i, row);
-            storinvdisBcpService.save(dis);
-            i++;
+            packageRow(mst,(JSONObject)item);
         }
+        this.updateById(mst);
         return mst.getIostorinv_id();
     }
 
-    @Override
-    public List<Map> getInvDis(JSONObject form) {
-        return storinvdisBcpService.getIostorinvdis(form);
-    }
-
-    @NotNull
-    private StIvtIostorinvdisBcp packageDisForm(StIvtIostorinvBcp mst, int i, JSONObject row) {
-        StIvtIostorinvdisBcp dis = new StIvtIostorinvdisBcp();
-        dis.setIostorinv_id(mst.getIostorinv_id());
-        dis.setIostorinvdis_id(IdUtil.getStringId());
-        dis.setMaterial_id(row.getString("material_id"));
-
-        dis.setPcsn(StringUtils.isNotEmpty(row.getString("pcsn"))?row.getString("pcsn"): DateUtil.today());
-        dis.setPlan_qty(row.getBigDecimal("plan_qty"));
-        dis.setQuality_scode(row.getString("quality_scode"));
-        dis.setBase_unit_id(row.getString("base_unit_id"));
-        dis.setBase_unit_name(row.getString("base_unit_name"));
-        dis.setBase_bill_code(row.getString("base_bill_code"));
-        dis.setPoint_code(row.getString("point_id"));
-        dis.setUnit_weight(row.getBigDecimal("unit_weight"));
-        dis.setStoragevehicle_code(row.getString("storagevehicle_code"));
-        dis.setStoragevehicle_id(row.getString("storagevehicle_id"));
-        dis.setSeq_no(i);
-        return dis;
-    }
-
-    @NotNull
-    private StIvtIostorinvBcp packageMstForm(JSONObject form) {
-        StIvtIostorinvBcp mst = new StIvtIostorinvBcp();
-        mst.setIostorinv_id(IdUtil.getStringId());
-        mst.setBill_code(CodeUtil.getNewCode("IO_CODE"));
-        mst.setBiz_date(form.getDate("biz_date"));
-        mst.setBill_type(form.getString("bill_type"));
-        mst.setTotal_qty(form.getBigDecimal("total_qty"));
-        mst.setDetail_count(form.getJSONArray("tableData").size());
-        mst.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
-        mst.setIo_type(IOSEnum.IO_TYPE.code("入库"));
-        mst.setRemark(form.getString("remark"));
-        mst.setProduct_area(form.getString("product_code"));
-        仓库数据:{
-            StIvtBsrealstorattr stor = storattrService.getOne(new QueryWrapper<StIvtBsrealstorattr>().eq("stor_id", form.getString("stor_id")));
-            mst.setStor_id(stor.getStor_id());
-            mst.setStor_code(stor.getStor_code());
-            mst.setStor_name(stor.getStor_name());
-        }
-        mst.setCreate_id(SecurityUtils.getCurrentUserId());
-        mst.setCreate_name(SecurityUtils.getCurrentNickName());
-        mst.setCreate_time(new Date());
-        return mst;
-    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvdisBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvdisBcpServiceImpl.java
deleted file mode 100644
index 31cb0037..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvdisBcpServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.nl.wms.storage_manage.semimanage.service.iostorInv.impl;
-
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvdisBcp;
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.mapper.StIvtIostorinvdisBcpMapper;
-import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvdisBcpService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单分配表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2023-05-10
- */
-@Service
-public class StIvtIostorinvdisBcpServiceImpl extends ServiceImpl<StIvtIostorinvdisBcpMapper, StIvtIostorinvdisBcp> implements IStIvtIostorinvdisBcpService {
-
-    @Override
-    public List<Map> getIostorinvdis(Map query) {
-        if (query == null || (query.get("iostorinv_id") == null && query.get("bill_code") == null)){
-            return new ArrayList<>();
-        }
-        return baseMapper.getIostorinvdis(query);
-    }
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/IStIvtStructivtBcpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/IStIvtStructivtBcpService.java
index 972e0322..b83ae20d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/IStIvtStructivtBcpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/IStIvtStructivtBcpService.java
@@ -1,8 +1,12 @@
 package org.nl.wms.storage_manage.semimanage.service.structIvt;
 
+import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * <p>
  * 仓位库存表 服务类
@@ -12,5 +16,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-05-10
  */
 public interface IStIvtStructivtBcpService extends IService<StIvtStructivtBcp> {
+    //货位分配规则
+    List<StIvtStructivtBcp> allocationRules(Integer num);
+
+    void updateCashByParam(CHANGE_BILL_TYPE_ENUM event, BigDecimal plan_qty,String struct_code);
 
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java
index 4195ab7f..65e20adc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/StIvtStructivtBcp.java
@@ -22,11 +22,6 @@ public class StIvtStructivtBcp implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 库存记录标识
-     */
-    private String stockrecord_id;
-
     /**
      * 仓位标识
      */
@@ -70,7 +65,7 @@ public class StIvtStructivtBcp implements Serializable {
     /**
      * 库存数
      */
-    private BigDecimal ivt_qty;
+    private BigDecimal canuse_qty;
 
     /**
      * 计量单位标识
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java
index 92c11904..e1764fca 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java
@@ -1,8 +1,12 @@
 package org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 仓位库存表 Mapper 接口
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface StIvtStructivtBcpMapper extends BaseMapper<StIvtStructivtBcp> {
 
+    int batchUpdateByParam(@Param("event") List<Map> event, @Param("struct_code")String struct_code);
+
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
index e28e1387..1db59a08 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper.StIvtStructivtBcpMapper">
 
+    <update id="batchUpdateByParam">
+        update user_distribute set
+        <foreach collection="event"  item="item" separator=",">
+            ${item.field} = ${item.field}
+            <choose>
+                <when test="item.add == true">
+                    +
+                </when>
+                <otherwise>
+                    -
+                </otherwise>
+            </choose>
+            #{item.value,jdbcType=DECIMAL}
+        </foreach>
+        where struct_code = #{struct_code}
+    </update>
+
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java
index 9352bec2..322bb859 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/impl/StIvtStructivtBcpServiceImpl.java
@@ -1,11 +1,24 @@
 package org.nl.wms.storage_manage.semimanage.service.structIvt.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM;
+import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService;
+import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.StIvtStructivtBcp;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper.StIvtStructivtBcpMapper;
 import org.nl.wms.storage_manage.semimanage.service.structIvt.IStIvtStructivtBcpService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 仓位库存表 服务实现类
@@ -17,4 +30,32 @@ import org.springframework.stereotype.Service;
 @Service
 public class StIvtStructivtBcpServiceImpl extends ServiceImpl<StIvtStructivtBcpMapper, StIvtStructivtBcp> implements IStIvtStructivtBcpService {
 
+    @Autowired
+    private IStIvtStructattrService structattrService;
+
+    @Override
+    public List<StIvtStructivtBcp> allocationRules(Integer num) {
+        QueryWrapper<StIvtStructivtBcp> query = new QueryWrapper<StIvtStructivtBcp>()
+                .eq("is_active", true)
+                .isNull("material_id");
+        Page<StIvtStructivtBcp> page = this.page(new Page<>(0, 3), query);
+        List<StIvtStructivtBcp> records =  page.getRecords();
+        return records;
+    }
+
+    @Override
+    public void updateCashByParam(CHANGE_BILL_TYPE_ENUM event, BigDecimal plan_qty, String struct_code) {
+        if (!StringUtils.isEmpty(struct_code)){
+            Map<String, Boolean> fieldRelation = event.getFieldRelation();
+            ArrayList<Map> list = new ArrayList<>();
+            for (Map.Entry<String, Boolean> entry : fieldRelation.entrySet()) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("field",entry.getKey());
+                map.put("value",plan_qty);
+                map.put("add",entry.getValue());
+                list.add(map);
+            }
+            this.baseMapper.batchUpdateByParam(list,struct_code);
+        }
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls
index cd6e3d61b2a48c0090db20fdc8e24967503f49ab..fc8218a14c3eddcef76d6341cffe540360c495b1 100644
GIT binary patch
delta 45198
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
ZY#GpUAl85HW#QHu)`RChZ%icoe*x|5%s&7C

delta 49239
zcmeFa2Y8f4_cuH<_r0lvBtRgcrO<0a2PsMDy-4phbO=?N5TYPR3t@o+4_!q>ML^1`
zAVmZOML<MAL_|bEL_tMF#C*RqJNG70c%JwF{{QdwUDx-1*=uv}oI2&qnVB;)yE9Kk
z&ipfSaXp!tS-(*DuR@3kQi!{FPgg?xNq4ebCAQC;ESIQyvc-=2DqiJnf2vfoJI`E@
zOF(>JoO`N0Lmlkl{=;tRDg%f`2fudZrvqQRY<G;SfO~?gePBtzOW_^sj<pNrO}Mvv
z@z>zLo$(%?JAQWkTsUvP{rfbmec(Yn-9N`Xr~LffQ)Ao8$lUT=MIdLvj{C8BWN>>|
zR@&|90Z-Nzaz|K+K+D~tbfh~9?>c1)xEGc#?Dj7c>F!%P!5t6SCcLAO-e0<@yG@xN
zcBGe$^K&1H&nJt!_r({I#q|GR{lBFCUxoj>E5$F5;_Tne3KL={KJcGiDdsCtKor~Y
zMSNEk6$eOeba{;~;ci{ES^pRZyEHtUf+<+o1vQrILvt-1Ja~Wf{%B#>((p14oZCYG
z9nkQy_^j#w1~2FSwQ92}u@2Uk#R{6Mv;&8BuNJTNX!po!@w)g8bYX+^|2q1Aj^ghq
zReg75R}h5UamS<-a(C?!vg3yVjlv_J4k#d=4glQuXIZVDKlAgB{S(GFR4tXe%DnRK
zd7f>ulRNh93bH5u7ja*HD@^rL?o5K_w~D&^EDDo-9E3aOZQJdpO77NgdolerX6V~t
zu0b$F%YBC;+%w;Dxu1Wov`S$ik?w7;lvabCj|JV)Yr@>a-tlq|)!Z$XhPltaQ`~*=
z?KpSDo&<OEXT#J8FT?Fu0^G0c$?Nvp941G)i|kKuA29@@mHW=>qV8|@#O-Lccae0@
z+#4n*x-<7yckek6<}SByoBP3mFg3+XHEe%A_l137?!x<H-9h`q<TMtgo_3IN?o<0~
zXbCgir}sBjY08~vRkZu_U14gbk4C0D(su+OoN1}WUd)XHaqbV_@8fQBG@sV^gBM)x
zaGZP6;YIEXc$PWxyE|cBn0lbxr(Y=Sjy@VDl{?{RCHLi{g?Ah{`esDh)Jo{dLP^<c
z0L>O*;@O&<w&k3ZfkS_tpLa0BPA7R`V^T&Boc8qmt_*9?*$cbcR!)u`&ak}VneGg;
z<j}cs(<AyaRo4_R)tR>LK7Vvgnmk(+6h9thn7?%Q>DF^Y=rq3xmBhM^D^nOX=ldmJ
zMym2d-G#p_T>HhvXjTy*&$NA|{RU0evSZkQgPoZ0Y%42UhQ>LV%@f@tA>*eO?&rSD
zEZ0R0&S8T}gbHyx37kUs-HyS32`o!e?xf3w+<h-sQh&-Fi!P5-Hh=-{)t94P{7Je`
zebqC<pFibz`)N$9oxc=|&;>P5*2!s2fv4tlhr3GnX=!4~*GWNcz%QbNjg`CQ*H6)b
z-L8u6AHM!7>@MIBv$C>&!}A{A?k}#EPJ5(4ARWand}f7QWBd#>PdxOW19#}X*$~3v
zbL2ZkbTV$_<P+S(S#Yp<=5a5$R!0Sf>^OSuisc^}(=SShSv$7g*b!YcKiW);pO8AP
z|B#fYQicv2I5MU0z|=u0p%6j?0%c>no`{K|mjh*-=c7OwUS#<oIVhko1pkF%yGN?#
zw*K&z^TD<Zq`mn-t5alx`y(q-6Vmk*xjI_1*IR`0oyXHgc_Axn8Pd~H)=-z{#lf<-
z^js<_Z`rPTqEn=#<K>WnJLP1R$h0gm&k7K4zb`}{aJM)t#A-Z891~(6xL?8Z0iI=!
z3o#WnwieGjc-Hz*h<T`~x*tI^YVJ0kjZl+MpAh0Co&`P@VhC#Rbv(21j5;aANK~W;
z&mdIf6Q_h&$Q7D)T8NI&{2HEr;aTbvAtr|i@e-c*@a%pDLh=gnGoDRg!YQ8$@fMr%
zSttw_qQ_@KY{7HpIU&yE6XF)0N%@6XjJmjr=XE^m77(K01tFH<xem{t@$B=t5Zfc5
zzwkvNMimrdBAy@Mc>>RvLPA{nLWqP&D7XX#c)o*Y2wHmemqPr6XR*sdj6ut#e1!~Q
z+}(#~cu^q=T@hk9p6l`a1<y%e3vs*{%<ZZW-HL-2&){ew%726Qi56+%JU*a6qU$wO
zC7%26<c<*Y9bjn8ZFqi%=M&e37>h=|foBYw#B)Q4AMs589zxM1S$Nh&lWe;QdOZ96
zAOxXlO8+E8Z&dw9cv`6PXK$l0c%H)3KTjHRbw`K{RDGwPg_w^j{{+uKRQa)AkPGCj
z*RSY_c$P=5`eUG9gy&&Alh92kq3X+`tM*0JzmMkwJQIHx;we=98+cyBbIE<kLY4Ra
zLx`oQ^2>M@L`{!+fM!m^hY5e8{ZZvt@Qg%NuX>0~;92P}AqJtUV}ul4QN>H}Jcg%B
zN>LA0yA99p@a&?bScobPx1?x}Dt?G(byV?>E-64FM)^xI6E*l3p5ds$x#*;;@GKE1
zMOsZ%;bwf;i)Uhx6i=cmw**UZ09Cj$j})(?3SSA4Vh^l(YF;RUHHU;s5rZnd8YabW
zsLE#fr09W~Tb5snS5R|R3rKCOhw(g*nwuCQ#az_b+JaJSM~zh~Bt;Tx>e(onUo1z}
z%qlDep=zoXm7-}OPo8G-M4q6fm6408QaoLQwq?lGp0rN#x(q&rg1|^H5LncptBjI1
zo$4Zsq#?WF6I6s3=ZC8LMCE=3fGbk_<J@pg1&D`mQ7{5<u>zK#=dm(S)W1tl^9ezV
z1BvR@Lh?UW2#Wo8AzH>hOdiqbVw=kO^3xfNLiTs-0gAI5CE&Oe+6$V}A_Y3*-<ViH
zfRM^hz-oYFrXtADc0gbzI;F%3li7U0SxE8AtJ+&*u&~F<h1GfGrio%&Fsuc+!Som7
zkyli1VKC3f3WLd-Oh#*2usAI%`Z2O%a>(kOU0L1|$NGfDYGE*2EiCpi!s2oW^U3o3
z-c6Q~Y2KPEq2<8rwVV=<kyG+fa!f0f(m1a7Qd$<ej+RyGF|tZ~Wu@h^1gA;M_=J_w
z!q|AZ=F2=rSXtoTR6F!*r*dB2CN2k@1Id1RapmEo#jeLNR(K2}+gwGB<I+|{20vEZ
zYdC`yk-?KH`?V9b!#%T7E?I9Xk9rF);39#ntdSq*U^}UH($1c;20)ZB#VSBqJ!LF)
z>m?JYEdKdN3$_~<C1%J%w6>RQ?6<O(6f5g%XF_l$VKi-)EFfL9c$Tc?`Kq_<rqa$R
zxG&@e&Ix%wqq1M#4#@uHtb$9^G;ps-WxxD%`PhGC!}yaI&Mx8aaIPH-?@txnqu7_G
zlfg)Ss`6-I@XC*5vO)QVf-lwG*v91S4aJ#efi_&%8;bo9S2z2IzpLE`Di^%RR<%_H
zY91FL`y|!uFUuBr6t$n1nx^!ZH6BUeZwQX{mt`JF5MT&`2Rw!#&=9l%LE1m_P(V*W
z9|dR2e-xYz?on`V;zz-`Sq(hRw5qq|xNRQAz}5dKI5)(j;M^pSg7Z+28{XHe7(?RU
z5MDSY4UdFl67fhlCKI{gbb6qS-#t{$m+I(dS~yImTH87WQr0lpqwp<sH_TY?aH-ke
z`OjLxZz{J}RiU}V<$|D_$x<9@k72&k-};m1%Mr4*mG+t9p~2}$=aln0kIuk0%7QN_
z9u1g=JJRRMd0jL#+>ur)9u=5Ffo7$O@ud_}?Bu;T3n_Nt-jtn&WC>r=g%tZ`FVYVw
z_QW$3_dOy01wFSD8D~MoD#c#cn^I!6VmIqeS-Dbnu9PcR%1;zqquAfF3hu$ILL{*m
zn^jPgF|r9r*n2VwcTpw@&?GL9tf5UHNn4}X?=cAv*h~_pNqBm*R>cFxGW}3D>r{d-
zW#vlQxl*oNDL+W5Vl?o`%^C`54gRblO;t5Q{k4i}z7(s-PO*yY6syQiv5M+O1rO+~
zB2ufsI1OA4BQrp2sOd|whP3P?tH@5VitH4tsAW{}FwZKAY88Q6MQtNAP^+lpOR<V4
zd@0tDjbjaUF!1RL4n!5NRdtc#rr;R>tBBDm*p%0+dWMqCbc3qzOIf*6cCM5wSISSU
zQ4Nd+o)@r&v^cFI7%JANL?bj9Dpso`Uy98#*_UFo%*L@<W~W$1L*Xq1`%G3*QfuI;
z?i$qyFt(>WT0>*#H%V5}#D`=RKpGsY$WF0}roeGMvHN8erL~F>s92?%8NLv$qPZ`{
z8d~^Ltf3`RX`Gu7bPsRRn_?BMfMgZy$yr5Nts<{3MQbA_uU65<mtqxdeJNIvjbjbj
zDb~;qlrz$xf(HdwQC_PE)hgN>F`-&T2VaU+Jn2iZifkOK$WF0}j-cd1u%BfO6}5&i
zt)Y{alEz4GZ6|MGa8cQ%2!l7tiOX4vFqrHb)!C>BH!3P?72#0vg6g7G1c`8HAl22E
zvXJWLO{D>8=R&%2rTieKJ4m?{JmzsJ60{0->1$LEBQ&2bL{DFe3(?D$;zIQHrMM7I
zDlMNbMIRtpMSeV4MHQ`rS5_~mzJ@WsE=50Iic8Vom*PTX<G2t5fa6JOerR|>v2-4U
zS$b71y#N;=O${_63g{9H@};;0DZUh!AREUe$WC!H3<f2u;NhHARMRRVbR7*bQX;el
zr{od3q0^j7iqI{cjm%j|5xS0s8WjbNit1WLL9Jq#QBhE<8174PAx8L8T!@jr6l)mi
z_`iZ$#V8=T6g<h`Qq<5Y3TYLi4Pzm#BGs2-6=QrURx#F>VinmbuBUOpu?C)hu!gjn
zT16yOyr{+-#z?4mNjWMaQBg1XR79elUh)Zzgy+ba@`IEKMg_01Sw$_aAqpB+sfk8I
z6g2FUs0->nSysb1{gh$i6*e=~)=Y(&iMCAEL-|xg!V7ICsiR4FvAv2yr)ZKHhNP$=
zc|wyE)g)s<g3*4aAt`1^>S_{RS#MP7fUyVUmG#T&8DGj0n{uS=Tq#$sl%IG-J!>=+
zHyY|`4aHeQnwn*V7S}3f`%<jpIbVuZWaC&xb}FZeXrrROR>4d9jcSgO!b`K4)m&eS
zHI#eamt+;$NLG=Zf(p7cRbENsYHpxqbAW84ns3-+wCn}G6w6-dOR?x|9E;9Qaqbs^
zl5H>+Pu7sAHE;}JqslN+IEL_Ynp*5jvWiS!%0|($ajsk`R<Q(>tRfCiR*|Gt#Ay|7
zBPC83VyQ1>LCP{;iZ!Gy_a#|Hc8XOHaIB&Po=`E<tAZmK8x^MVf(?ly7%!`pz7!YY
zU%nLA(<)zz>nS_M8dkG&U==0t<WeN-Qj~;>SJWEASW>H4>r1hUb-omrV!bcLg~(2^
ziVeWAhEjNPA-ozmbh25!z)=Y<1;<WaRWBMbrQi-;Q!n{acCM65yskF-aDHNodKoEJ
zQ5sJ!L_=MO(ptqPLs?pDc*U1u4Vy8o(dtXX<LIPGv5HrHq)<V9XUH;i{RJz8+%x2l
zeou9gqGdM^BAP`dy*N|;nD&Kw9Sj@+;q}%R>hCY_0$l=oNo_HdykNSd{{He(q8MUD
zu4U5-^#)*ETMDlgYO610i4}v@Heb>Pa=S0(Lh4Ol$`7d>zLY;wJAJ7Dq;~mIfk^E}
z>KqgzpexFX@}fLlnQRyKEPh7TkU^_^NYQqn6b%MtFCIMz#w1y&3=cS+bz{z|$X+*I
zQEwR<u7<Cb^SYX2-I$rH0y5RxzT7F1sowFWETs1MQdl=;s=dCX3#oT~DL<t4A;tD$
z;kg7AoxN`SM(sD07V3DfJm5=N!mSP><>j-*a?Qsf7z+c`a<xzTX`Bt3G!`n7cxJ*Y
z#cMibYioh;8G$y~-0F}KXoD_Wpq)#g3p6Y*K+EH0rB|Ly%X{C*b3xuxbr`9ABF|6=
z;K>rdyt(o-Lc+8VUU+(i@S=0CJYt0SX(30wLNHs%EyLf)D4=EV(()Rue_j?!TdIy3
z7XQDo1Q?b`&B9AXuUcLv?v=-ZWpfVDYCkkG0{$i=(8wsNW$;??TV0>L4%{n0a@IG2
zTF40_B=B!Sf{c)uBsNN3?R}^A%B8x7oH`0NG;x}SmuuJmL6gVOl+-l5;JU6TWq}L}
z4KbL~8WTeO7RZRuyarfS1M_NN*H8m2uYtT4xdA<HwOqfv?G<KdDry>DO>lm5(}WwE
z%9<wJtC1)0Y%K{In9mF3DK`VFXkdN~Oyij{1FLEv&y@d}4W8;UO*Ku!Q{8`NqoARw
zu4#C#`p;_P$tKIGp=o%sc|GkPb<3WUiE3&ho-T5Ra<>sr_?V`arr`<Sm!MgO-p4O*
z-SPa6X=-a4p5I;m2Tc(kc$lb;CgK?$6XjOMQ#_`5LeuaR@1Hb0$77nhnuh0i|D@qr
z8q?I%G(1ZKP3gboI@%D`*F-$eVnNGj&_cPaKXW(G2%aSUQ$ws_PSi9!&C$%cswK|Q
zBxxF+r+k%NV(PI-7NdZ9c8F)zB3V!tTsK&XdsC$tvJlO%PKsOGrPz9a2fUB%yx*&j
zA#9(X`e4g1`A=DR`8gRto)s#e=fG0g&zA2{>`J)?kNy1EL%sinDCIkJgCBc56IaQj
z7LxVX$qc#Ib7Gx*Hz4??Du-caABN;Ox_nhedv?AeOIq?>&xP0IoIttH(|?yd=aT!W
z&K`NNLVMLgJ*hgXo;YvRT=mwkA&C34LuriM-Bdlbv^de2rIqru+$+}y$^D+2M`WV_
zNQpm*tn8;fC*=vdg&Hqu!72HK)k*cC^mk=``r?!<5XuMTSm03jnk+GqvQEing`U!K
z^8pwr`l^1azkUs+-lt`e&`E}4nC6&Fb56^;MGmN+bbS>N!{F@7s+?Sxm}`pR8V;`c
zVk-H6BJ0Y7)aVnL96HV5MgW&7o+kGvvXbmf2S1UuLZ=(tNZ<~N8RUOP<7%9dHNsn}
zG=m+bIcL%|FLpDqX{}Vc!Hx#Dm3js#9<N5jjkebQbu?V)FQO4L?uENVX9M@cC-w}y
zy*e6unVr=DH8963uO0|fLBZp7lO(ReRM=Z9^{mmE%CUr2YL-!&%1SBqQ(35tS4S!a
zpKKke|I|TSK9x~DTdCPb;216MIU{e3uMlH$6=Dp=MX!P}xfG0fgo4<!GAgZ&nqw4<
zg@U$fu2C=+3fk$~7z+hmbX1RPX)F|UHE=)CP3g&?hWm@|1|A^VsOKSv2coesp+Pw7
zHdw!g!F+jo!3*fxm?<~)ynR;Um_QHO|Cx+J|Cp!Q;$Vo{q65xJ9Q&G2!RKXtxqw=n
zmsN_PyK0M_jQqyRMZT0J`il8PpbX3~$|sXtB_rtP^Dy+qhHwhlO2|x#xFCmxE-}EV
z08Wr@T6jUGgf2C}X_|5w$<JjvvbJ0cjT6(oS$p$yoi)#{i*mmzMuul5cov8izLYmp
znO`FN8FcbXStWF(!KH)pEAcN1y)4Iut}?)9G;lR#FmR0lJ`3O)v6e!=LXP36bm?bl
z;Ch<#6>{v9Z8m^hwg*h<l<heHxoqRF<S5%5O}WhT-4%ID2LGToKrDN^1vGlQDwW2|
z(BZzB=|WicaCH(ew)2Hx9j;FKQWjD?{CaUVQm1_>7gC@2QhrFC@umF5Wc8^p6#(2>
zCzS@H8LmEal2AHao%5xFkvi{7<w5F#FBO6m&l<d$$&1wINU_QBdU*r}8ShMZ5sEZY
zy<jSH5sEZYz35A&Ss>+6pT#VK{g2XtbGH9Qu>X<T&KIGBjnMYbUSbhC*hn=JCo{AE
zdu=_#DE98FWI*vK)yt^LfZ|cAH&QG+1AT5Z%TB|`oJupGbd*+_0i~mTN;9Bzikhv`
z)pKf&ehoJrjF<IXTJKKHVqMyojMBxrv>T1m#Za26WiN)#sk)$PoSVhIk}ihQC#B;L
z7enc^M=H%UO1*nOnNT`L;pC03#Y`w2tHOOLON>)I)!`b>gyN@tHJmA2X*jp-Mfl;9
z<6<(Qc!q%oKo}15Xcv<SYniU*s^|4<k*R?tCNth`B0iFootY&%GdT34t9=P-V4Rk_
z1Q|(Fop|QNHLwIV;LXSq)POf5+}2BUM#idtDs>yB-i;%-R*Ex4x|D9M6eo+cY`0IT
zTbI5zI9aEgbv~hU<Mt`_BAn8@F~W{jg-q$)xl2!;?_{E!MEAav^@DR{kP@#0o<?cc
zWw~7N9bWh^fT!i4H?_#|8MY(u_6wmv<JHTiK!gHKP@7DF2nCv`^GztwOuakF`6d)7
z-N60uiCdHVBcT$Xfn;yx5Xv+mO|>?KA`~iJ%~Q|lSBA;V3J^a97H^ZTKxQVX@+LDY
zkeNxUf-hwu<=EE>WN4B~2RCPE1u`^AXJ`c~_*tKMtq^JcVwOP!i1`W&e{EkYbPX?1
z3-xQU$;?WV8Sn1eN}ZXDrZg*cX1?&Ha%N^_uFS0TWoD)DtC}M>D^We(%&bJ!%vXF!
zna9(Wxido_elJ_e7%FsAwvkU!zu~fM-gFcTMHT6I`T5bRn{w9fAEi>ogB8#By?@Dg
z<T)fo(a)sVcU_7lH*$nHZvG%6Bvo9lrhBH}mS0Ltho>Qu@W|=#x1p~fYusBoW^+(%
z_RRc69+RQYh{)@2w^%_P(ydk)15d3|RYG4i9K2h5M7%~}t5st7JF1!w902g^)Ni$l
z4|j_#2Fy!pw|Ijl{3h#$zN5AR%;!e<yv7l_a{x2ih&8G}=r%*ntLL?1JN^2bOpJO@
z-9&*omwbBTuy|857Z!nZ`d5tJ!|q{*u){ENN!E&;wBVks3r3tR)Qr4}KP+}>Ml7%?
z{d+5d?lR-ks2di|JD#_Nha!K+=>3*q<4wxj;%!>N!0CpPw-s-TJrsE#t+$tY&$g<B
zy=xeFKkzo6aalXt8WXzTKzR%AASMCDp0kF99xy=Obh|AM(&|6t8TlTKd4Mi{h_*e@
z^Og5O#4T1p&sV7bpYq$#!-kP}Slr@>r^`cmIJ>C|Yv>9ppM{x%(?&%A<ThHHC3Ch>
z5w3N#(T`b}(>N_uR10`xS!I=Ip@Ei-QPqk$&B5CNXbzKsV(=F0#QbFkRFxcUQ!H28
z6!W%C8Hq-9+J+<k+%_$x%Gox>bG1!z-8P;bQVq4jjv9>|ZO;@RNb2>eiln};sj7j;
zbPeSbF_g9pZMpR|C^~M)Idtw8vuL+VrG$QHfE?_eD?Xy~ehMc)Y0>Mj<&O=Hqtuz=
zBz^okaHr@GKj2Oq9EX>e$WQ1Af8fs0+AY9+YH%DEc8jz0<rXMHXVjL&p<K5(M>PY~
z^w9GLSVjXc(3fuj__+a=1@N}GNNoev*w8NwupEF(<t6%<fzC9tyk=iZZG+S#Sjmwf
zm0s?a`VuT`C6(YXZmGw<XiTuWg{i7Hd+}P-SDul16ngp<1FZ(=3i&nl+lf+Mr3HCW
zO2-RS2kr>Gz(;viEBOsYh63kUSPhMPjk<-Z#Heg9P(xeTHJ!hFq6VF=WJl29P_&U_
zZZ*Mp8xG-msH)5MMy114HDCX)1uXafp<xi4-T!OlvawoT8@m*i!^UcB#+}Q<Ro(FH
z?qAz$V$?buS^w4)xeiEI$nR)DI4T-mR5#ue03H!HC{I2Bzc;|T8hDcyFz^Qhtfzsu
zNUpP5Q0M%rZ0L^$Q(t3#qV#oE3WdC*@`T<tm<Aeihva(ZDF7a)ffIpY7qOs#I)eu8
z7omp81kVQ%O3CPRH>GHiCB@ZnC1#gY;&M$T-fphM#U4uB9IQOsGh`9zu_IMgtK1#+
zGjuu5{%7^L*Dut!2#n$vlQDMxbH%UJvnZPQE^R7`dU84rhnl(Ld{<O=ocLnE{bu+$
zYCKomqts%+{Z1an-8VRn0M8SDP}nLJL3xU+s`3FP76*aTt9f*piyMAv#i8^eeaN`K
z3^R`|^F<Z~N2_M+no*>D7*zvlY)O@$#zd>p@R^sR)dMN%VhkAhM786`=i%6Pkyte>
zl<#RUkp1{P9Mg2iqM!O1Ap7xo!k_%(koN#;7Y8YU2FHGUF2;$BIAkrDE;25U!Lc`=
zD?+G93E=Y5kP^U!8XP<IOc6$#fD1-*>1>CYY<t2=sxek*K10iU%x;mNGRnXu6fi*E
z7IupWDpD3XEogvV-(H9^7#L}Q?AzTUimY;AFKmEbCtidy%7L<|0kZdYi(+JzSNmmg
zI#gcGNBF8;1?6waP1LnA_+tzyd(J2oOIItSY;hDHkFu38ICh|JQIb;QQM08CkUghc
zl&0_Ep|FervdeUfveYvHfvZDwG6CM|S5*#JHcUQA{HuEGi>6e8VU{<d*c;9h6=-5r
zD0Qrrz2Q7q>#eHDWksq}4Y{mj7%BjlAu7|9YRHh|!76It3c6Jd3>j3XIv5;BR7vCF
zX-ai;ZpW=v*1*^3)<LTb#ne!d;fH)PoXT(}85ljsUW8rusiBJcycWCG40x^W7gZE3
zf6vNG+q|sK{3RZ&8^oJ*p@ypC8x|8Z*G`J937>VyH)ToCw7Y0jO=LE~l&%VBH^9EO
z)I>q5(0#@^E~KiKvzF@ALRC4T2KMV2Vm)nVU{xc99eReSM&)Y5@~hL>+K^Ji;Mk#O
zh?=yWakc0^;}Gr9-H3hm0#S$R)Ir@oVSwza7l^vFrH*Rm8<lI(hHj{xd{4kN*E59d
zniq)rRO1P7H!whU!V5$qZ8>T+lSy>v38+gpIQGRGL_?}l7YvOIkbUt61Wh-80ET09
zt1cLt7#zFg4WcPkIc8O(e)Uw<&}Ih1E_s7!P8;f>R7oU{TWK`3zA7Es!Vs|k%@8eV
zO?@=NK^+if$C0Spx)sR}tzsU(2G}+YZEZM`z)@DUp*u<7@P<&CBMBU3Ra>f`jEuE2
zw8>g}dzzjMZ`J`o_GZa&3mvXl`RVIqRT2H;Nez!fO!MFOk6I1UKRO!8O(1!$=tR{T
z<>((xHSkw@t&#2@_Zq1xVNQo?rg0S%)jMs~q|uF0Nlw>k4%B>6*|W8=s-^-vn{2kG
z<Z3Enc{BB=uRFEVgexexx$aI~o1>^scWSS3@kGs4UG)7k%~cIwuj&9?2BxEhT3}Q^
z=<84&bS1wI&(GD;fjZQH>C9>Y({bjXPin^PwCXb}iVn0;rK1k{)&x)Le&VbNo}?=^
zuqG(lGRK^tqvqa8i7j(=u#TE>7tL>p>^ohflcudkAGU-wS2tDANml_Sw1QBlpLEuQ
zHK}7O-A`7vf)J-CcG0-Cbg@;Ap4e3b*HhmMD8tCss(ok|(}vwNrYn8eTD1!7W^{HV
zSqs%ry$y7BH-z0m_?75EUE4rsPg>Uoj=UFDXbaW74M|Tes}GH6i$2rW0DEa*Kf27o
z{s!0^zzt#mb!?|=g|`6MetV-<GQ~hz*A7w#8QMOeb&C|b+ztgAY=C_M%oIaBUE8ZD
zD|D!V_S4W|l>Pv@U)oV6mHSZ*2aY}e09f`<>T$2z^spl=n<EySkwFj?rAE^IPS82Z
z08=z@G>z?yk~kBM!2t3^<637_%LA&^1vyVO3_~=-7#h_D?KxKGBcB*T+s7bxpLBsu
zJEQt=O*oD&b%o^dhI<5n3&aHK&<&C&dRBH*Z_7}QVsHjiHF6U5?}1)0nYQ$R+9?J%
zM&qW^tsYQ2*{B`kb&5~+M3YW4gdDhEfNhhBJ)vPTz1tH)oDqJU#!aV(J#&ok<27&w
zJ>LuYbVm3I8d!`T_EO&=PIRp|gw3Q%eN-X__)&dyPu$!`C5NUPwUfaRrJkYteL(pv
zCHIBe7=xRlaj}%%7v-8oCm83<0j6q2vniyXE_3&Oz&&U9rfJ+9TG<adbEX1MYhYOl
z>7Sz_o~Hi&Q2*olV-{DOuJq^m2#p$m+#d358K9b3u$j4#$~Ke!A8e-BVA#y_CJP*G
zk5cm}Y6xt`F{D`<IFd3M=or#$4IE8@Ly=j>0Y0aJm1#PF*toblRNchJ#mQk<b1kH1
z!`1lEMMlwlO_@Q*hNH_m?K|IVR#iu+L528kIUC6W?b|YSVe%nDuYKElBVYkekL8ej
zhUi1rMyUFs4%<S_wuGvTL<Kvum_?d$1&tkvg1C)>3=LdLH%6i$jsse(forMvC{Q|6
z0gmGGRN(9=lqZeaj7EzrGZ|ar&H9_8kuk?XxIsTpET^-ha}9|c!JH?EVpEZ|6($!;
zLHnmzN&Qoi3qIq-WnTthlv+h+Q(<JQsn{4WtTDLdz%9Ufr}r4x_BsP34O~w*#z4vj
z16-kjFHrBX0KRB|E4ApC==4~K-bhj7Ao^v4`<KRTqVD6+Hm?B4qsqU$1$=KD3b@%2
zuF{0B(zS7@rPmB_wFbUUy~nHRFvBgHKMsr0f9twD)&#Z73Vp)}S+9j`rK6J|d7A-l
z(7^4KI2i?TeAf#AvhUh483lPj4<@4^ZyJUdHNy_7I|VJZQ)eWfc+p#s^;1xgU54-_
zO}Lv5flzup!BbU~^f|Uo8aa-tO@ms;vAqHyJGM>Jz%kMD)3lt9?RAZuM4su$z2nig
zXy8<ep8+wB_j*GEpQaZX=(w$|8aSN_rR8v2+ca<ny_g0{$8Bxbz+zNrrgmFdGf~dB
zOgVRW%Q+}r#leToN!LE?P`X+LkJ0xT?J;gX!ybbwJd5SUkLqpB7>7;Wf7?=Y_E|WL
zcTCOgK@OtS9y&b>MRi(luLf?V7PE7--n$yOoes`M0UU?1PXjA^YCNZQ*}fkAKA_yA
z@6Q9NGX@{lz<x9e;o#7{M*R^0-Qr!kG9Q|pZhll#uAuG<0Cc8RA824aonC;7c%MQR
z=9pF;)412D!$L%2-}g<cj%gqAI&D}8n{sAS$2IMCy0TEUlW$U$MZh`nxeqmNCyiaC
zJG>J+{Sb2Ii(T|C(>fmJBTc)O9xg&A9S?It1J~2U3;_3;GJdRq`{`B&7K3Tje=#iX
z0Bv3jVYLm(DUk5G;>KdsjkB&et$}r^cP6ajASk&TpY{%+?`6XJopr@0ny@}y%LKQx
zt~jHCiPU`w)Fsh|C2BKGS|md}UEQjn3~fG4iP}#q@i`p&8ySiaLRsa#u8HvZ0-8C^
zYDmX!;l?K7=sgue=<n$a#9@;3w-Y7*gCTThmB_aoO$a@^;Q~+~j)<-2aC>${j05P1
zh|}%WIaZY3==n~ny#@`L9R>47&v#LWXRYk{dJyDtU_SF%%NvI~`K(nf^c@q12?kcj
zx__6c;q%3Q1Lk-NN2}Hy#X|SeTFhk+7)*#}I7s!@A=dC7{kcwe(R%A)5Qj`_hk;~)
zc%OEz#~kAD@(nPABL)=?)Oc}}k~RSK0WH{|xlK&`m}!Fl<1z90@U{5b1Me7C6glE*
zZ~1brYA<T4{a-KVsCJICaD4mgmvdFSH!!}7DsMtbo&L<Ra8$cz^d@!e|N1z0E2^;#
zYjMZ7aCpZJ>&hMMK5m--{||Qi95zQ(U~vDR2zIxpZ}zCx)Ons=K5t1xdfCyIz`1{a
ze`;M&JwY$*RgL4VB}(+)sKiem_z4(9>K97f{gKbjSYk>(OQhhNk^*a6qDV{ZP_?v7
zWISP?%Eys$oD9)R3KspixcJXXN5-eCXD#}&h#KvSIp&CvCx&d+^IHWcFjqW2T3(kb
zb2#q=JvwCms#Q1SUC9$=8-iXI|Bdi@A{~EU<xw9h`lz@{cvKL*ZeDMmd2E?4gra_j
zRRc_()*V)dg5QI)<Iyz`5vePO5nrEq1ba);)Ay*#lCra>?=hZGI`fl!u(~za4w`cu
z^K0j{RzA9N8%w&|$1yNFJ}$o|jHmn`=7_8o&^G%Txj)Rcv%_1#YlRa7DxlX%%RhoJ
z#}P+pzU@@vqg;Fu;LF|-j_~dXtzbrHR#Q+j?xZ~*<=S;Ds2QCd;ey^B;onQEeBtwO
z^4;tF3xSp6q|HuX5>cHpPUM&XMFPhMyH1|SF#(Fw!1bPHA1jw%=to9Oj26?CdVY!u
zJE7ee?_0)Zp~Bw(6j^oRI~;xI_|A8qLSIjcKda+Ad(J|wvs&bM`x?wGADqoGw=Ag@
z^rO_zFje~4C@AS&Ykv9}6gcB+DG>7bdhatmzBW3C@pThDdrn<J_n2wAN4fvdJr<tF
z1p1^YTLnm*Cr;7x7qH=R*Vs`7*wN`&*wN1ypxoI<;voDy>?1{dj?$f=-k+mbr;V6O
z8utmU`5YNLLpK=bERiZ}+#gi#BKRI~*gbm-DPH6L<cNDK`6)eQoU?_L09*#PkPugo
zpeMgjuVOy(@C&_TbpI0Q0*&tKT1F7n`4aMjDg8^}oTv~-!{=eI=iry9ZfBE+!{8i*
zuW=bl&r<qjwb8e*VwcPds~TTn4sh5Pq~r}qxA@GH{*~Gx<vFVHHJbK3zF1OS@U5FT
z1ie5^_iVnZ8d<&_og@vNK@Yw~4vLyAb3Azgc63s|1Mq?YHUuz3d`?%tQ~Lvp1IS&v
z5v59Oy&kxZP)jt$-_Q-7dPA?KUb~^%xp0g`Jfy6fSnd9*(v1l;hY37(gGT*I8-IWa
z@R!T6_i72f^TZdl;g%W};n+nh4Ls!~dHH*#DEdd$B=C~SRx7W&c;-jghqIV!t@HmS
zZTu01x@?5E0dS4@ilTnPV)BXswgqs3_?kBU1j?%h*iKV^Ls7Q@yk>yyHSk+ncpFXC
znJ(N$+kR(o9ki6|6m<s-Hw^Ge&G0=f1W?|jU+$<$p+6X0C*XKpH|1wAINp%s!0Zig
z{R|D*TKWYV90$m8;57nUOTVa;V$RkQ$AQ<1*UbE~tM@DgJpdo3>eYN;?GCB_ud0gg
z6h=4A>72soW;o~ns_J7UckI_3Gtusvawmn~%{3G4?)7=p`z|u+%(i;yOs=KNZ7`SL
zeHU|iXF1nXV-T^vh=_IN-+*x(V=rJb#4QdeN6-tu;W&m9D(~fO*ot3R0rbaj*!p(j
z<s5E4B!8rcd#I<MsQ*1=!Es9*US_wnfpH(uEymq8mCjM-HR6t^((kH?75cM*_5*Z*
z_=Tg)DWSg_V1G?|m+ms~Hv=4?f%j<GpK!jN0pwmWz?;iY{)GAcZU_fzk@xBDpWyz(
z00(LA2Q=&<fPWew2ca|2X)Zm4>;KCDIS9?(rt@E*bUZ&tpEE>PI`)@J%y-b|4Thi{
zFbG>zI18h-<Nb$%n7x1ZEbaX_WT6(ESllq+I9Pur3k`b6w>`z@^%1OJR>@k2-usN{
zy(9m9?_GA+%8s&+hTtP|B;AoXnl#FkB~=4Q(=cUaN2<mE_<{U`E-9;7-~;37$Iz8h
zIDOO5vI_V@?qfCg7)r6QLpRp5#j<ilqb6wNI67-Xv=fb*2;gx!fm*o0@tG&nWo^t3
zvro~;Nz}w2XV4~7rau<1Q%pvuYTQ&h?GI^AP->b6K21#mAZ;=&3;=@@n|fN~rqhW4
zD|^#?x(3dm?tzfvxY!vQSj=-G(AsJtZZSOs#hwYhY(F#UN?sKE>kx~BQ?9&LU3r9(
z^IF*f_GiF;L_R~Ad69`{=|Wy)BF5yJqtr+6HBwQbDA6oR2?fpxu+IYSxSUNJ88?~k
zFzz|S$1&^Uat>7qLq44VJIAb#%d)gFOqcdnm^B{}vMJ%#{J?0F+qsk;j@-uOLv9aI
zlYAEM#$(2eqQt=t|GlgKDIcumd6R>MI_LA~W`0<U6JKAXfg@>PfgC23p@F06VgcmU
z@$ic^urjrausFWHE5hRV`i6oQ$Je6@S=sURWuUwYce<*O)hbZwtmYHTytQseTB8G<
zi28DhuZyxRj)Va^b0iKUUz2@kM<l9b2|b8J9XjrMg~qL*x>3li<IYxU;8NNV1qO>A
zM1jF^j~q?DCf8Ek!eDSb<0=hYPdf@D>uFS>2yDX%rLXqpa&Zyl$mzaoK>vYUPCJTN
zb;FPNy6+lv-w*KJf>}kNaD}PkwV*vBS5jh8)SMGaU#EeqXh%`xaJA<_QR}|)#nRUU
zc^p}^VqnxxES;mx$K`s;h=G_5M)nID_ySq606MXB4l^H-FVUn}$lgf%W09Gc4Z}+s
zw~4Z1VUDj*t2p2`8{9^XdzI$Lp=O-$`O6ykI$0$wo=~`qmA&#GtZZ`$SeX-leO1fY
zN*hZ;uoFFhO#`=6u~NvoGc|l2K=w(QrI7UpbfFZo=S0u9XoejWRT{XR)W0-vPQd&P
zjoVEd80YcaD4o+qZP&<g6kZmZ92fN_fb61Xmj%aXo)cwrx~Sb6If>HCBg2kw@@U{x
zx?dh*9N+Yo20l%rDgfv>rMES3I$f!d!zsO^fiq}SMNm3UiNn>$aTD%JMT__Oj#WZt
z-lFiz7Ej|lRMu{2VPy+3a!<K<tD}V}-}I_L9-?=v>R#_>+T+lFXpbS)&>l{Z{4lg0
z!6mtY)lodBk&bBKR=UVQr;#{xeMD}jjx~^Jr`L1n`iQLTIa<TorF@<AV?eo+&aVwp
zCrEx$1N%`H1NRy`I|blU`7VvG15HjpKCLNN&`kz9^Q})bFrEfJ0d{A;#gX7^@-;g5
zgq0Y6)HlOAgTD8te4WbFg<Uv{%uhA#b{bL_=Kdz_V4Sm#Jgad#>6f~?4?EHEvyk&p
z?xMtcpmm(aXPR~`rPV|39H((k1J~0%20GF4^BTCHQtMkB9lu&1EqZ_|G=Q+$ru?6S
z<hZOuBO0JoPIUaD2G*s^4d8m5v#=K_HW1FRaUxt#J;VKlCah0G62a|6$1iDMB3(>`
zx+E%*WVI-F7stW8L&9Yk$8YL!uX~<lNf!3H0zl2v|0|HyRt8e{##XB!X9ajg(6%mi
z0eY`7vf?ZNzt)r=(Y40VdV(r7K_Q)<d{yKApixb%W<k#E;;NDINfStMP7QveDgUIq
zP0&U`l-v|joF(5i;9AKnN^fd$^f|ei#peU-HwTHc+Pk6IgJ^nlC<;a;@pyj2DEhiN
z6gg|Z?=@uzxmqB*d8thcNO6{cH?^WLTG#@a2&M}ytn4M=E#TV0RV-`?L;1ir>AM9(
z86ZES3oRihkEy&LHEjq*wL;g=Yk)s#U?^>Dg(eF#z}p%aPEoC4DCcNlYmD>fDXNW?
zy@32xlT0VsHisX%tAR6UVOt1u{K#(_h>LIS0Cd)m_W*1qKc|W9P<h3vMtf+8ri1OZ
zbCDh3T#ixw4puvOlZ74NO@2pI&1*0ZVKBd|$G)i6lkg__O+m7trmZaCsn*e|l5It}
z-Jz{$d>3>M$8$&kTgl3FvkS86tOyl=J>*x^w<}6{#aOuoU^^UNzS$L&&Wh01l;2R_
zZU8zfLYD@9OJ};F<vLSzceIAHBJ|Tzu2bLcU~pE1{+i)?I>SK6{RC*>3ToB^^Ajfq
z7C`&^p!;p>0V8r;QlKV`r!zgQ>?L3jfIX$N1PsDdtQV$3oqJkUqK^9<R1m&9zNd5|
zVnLKS2C{edv<mpvgTY#ivmOjKVy;0<_;H`v1#2;HQkh;TsN>7>XwIE9q!&!|xbMhe
z9!<N8b}+5u%R+Ps*3vJ%a`>{m8n~WD^ajwGMuh^{O5UQYz0qN+Q-wZ|;w<Cvy8vjl
zJ2avXTFqI-g#*}5{zCWqplY2}Ts}>Cmqzpj&{@Uh*T8#pxvy@u3jHAZchmL-w3Pca
zq8}KXg<FJXctDpK=q$$y0@zA+rH=ir#HeGwDk_L#KP4lyG3OHnDSRAi`aplQqO&wB
zq*e5wtNl^3o>XCgwb?h2MQNdZ=;{Dy>TmK?SOW)8*MU}DXmSo$6^5pXa-i`#g^i|x
z(BwG#B3e@&x;hY=3Q~nZD5&G}i)vh58Zii(9RFTS1MAae20H$|xCSOt#}r6O@~ld+
zwpiuvt3sx~#z`suP>*{d#5N55HPZCgl91I_M$xF@XzIcSSPH;avIt!p4y{EEu(Spi
zqwXW1wYX=)2y49MTXI+Oc8;WBw(Y5zYCS38Tb>_-(mAvCDw?|w9UB9YF-Bxn0E2NJ
zx&BzVpATuuSgS^u)0)*ZLsvxyM%a<`*;uQp>_&m(Akt~J>Y!+c`^hcF>1NAhTz}I-
zH8l4CIz0|uAiITXcw2~yjn{6k_jv90R*uKgF3#ksmX;bqH^#%1OBi5n4Gg7;6Oj9o
z23SV}!|BEZ?X!DNWS{N1G100f;b4nR(hhd>Bt1d9G0D0~M<Y~-=gMTOmJE$(gD-CB
zXNf)IEU|Th-pVK@sqQUV&x76RPkB$8e-?t5aQ~O=N$)nXv0w}!|Nf?yvwIz)DgP&L
zYE`2Tp0lckmNpF>4h4(w%}arEU|?mb!yL5edvs}zZqZ_M(P5krR{>CRh-=wgIIs`s
z%3P}juBDeVEm+Wd&8x@rR`xZoNO15quXgjS9M`;fKbmjkl~@2fbEde(0OV_4YhFY@
z-L}9gjhi^mVFKQL#$f^zufdSdm+I|>a5>JTm$#yMi@VH1c*X3K1>S2}&biv+-kp`z
z%;=0F(VB55?O%v4lzq$~8X9re&J(<d7pcxb$eSR1&LDrLIcLxz)7tNw)Wrdd3tkkx
z1l4nlMl3;3J#N~&gyx(@uPs55ow;O50Qpi%v>P>lf`+)k;N0darG=fOO^iE5KLHo!
z+~z6`9By+-N?2+&4LoD2r8M2Che+nqr6`?qx2ud+dzL&)q1L(ERaOJfQH5pb`_A32
zavFGnJPdU1cJU@Q-|cF&+!`BN-q=e80Qqj$AqF}FEboi(c6TE}FyRpGA<V6AsS3t4
z;xV^+?9DE9i&9p=S6?<&RYi;X%F}<PmE&$#4M6#BSDjU;kE@iv3U%d7WNHG(ce@U*
zLdAbWA*+FN%&L~gy+&<TW95`>QG5xDkEg6*TE~cLgO-ix64PcIk@w=&n^b9ym3`r%
zj;7s76W8Rjn>t>*p@VB6*D;$XK+9$$*BY})T#Mr=&K0h@!0Ibp`BX{~@AtFTLwy|)
z&ULPOAmHm<xTKYRovXeE-sJmP+1I%mXdte0tq0J#$(5*qxXHENy6d~d#XB-b#2uQw
zAx9(fjtrlOalN1$arz6^2x{q8A$0czD_NG)mwT!2i`K&U@1C+mi+PrKuo_<rw$&1|
z4_e~h8B0|8))M}|16RZr2jguK-q02so7*{#CgID=T2tkHsy)sp*>Rp(8?84L_U$Sf
zOZi{e*8U&7@bxNe>A$gK-AYxm9=loHOnEn`6KGbn>H&{>`E|XJyZGO{=(QDj{y%=v
zYrB=-6Sm#@fBT}BZwIircL(sR^1K7+Y4?`pz4f&RzADDdg<@g6D+O+S?ST`(t*^c4
zfKEV~J+trDS7F28b;<wX*4Mi_;#ApK=l|ZVul*Q8e=*LDJ!;NdUk8v&XQjxFRp0tL
z0B7y^Hg>FfYwiGwg{`@RIs8f`jl<U5!5rggWdN}?$G5%`sdf#O*TRtm-#xFwIgW+J
zYs&1KUR8Mq?!6p7E<qDu2kwwnmwMHNC=7}J_Ab|rL&%;pCREkgTTA8MM+G<mq-q+t
zo;EPBs%eVq0Oq*M)&DT0ID2mF`1vl^hQl!YT6BYP&O(D7|9}53S1G=>6;Gp%Lb9{?
zVE6vNaHT7eCVXI(e%!sTJ0C#eBkpxIlL<8C7;x|rI{d`WJonA6jkzv$t-+<PUB@xd
z?Deg}_)^ze(aM8MU6`P>HiFo#UlMI7@M92v<Rj+$Tn~l5&lMlO24Ab>Rm=W<jc8BH
zK8F1`le~ri@+2?tBn<8Y>U<JmHEiIT9?%#g)4$tPKY9`)c}F9^DMazTu0yAC^nhj>
z_$$>t4fz%E<z1);=U!KHjjKRMPlLhf7A*ke8(oQ?SUGNVwejwLF8<W|GtB8L?Lm1E
zV<|1Vts-gXSuCb9=)1E};Eco_G(|j>`7B3|;q7wnF}RqOh#IbDx+>qv;;wV^GYD{|
z2pu);c9K71qq*@pt7@P#x$I~rm*;X!E<0&zOfJvqwsXR*owVd#_);lM>YSBeXV7As
zRnd<>tHLz+yp`a)M%CGS%x33#h<28RT|mwot>@0eczaUx1#3ROrHvZ=s!GzS3sxTA
zlC&EL`LNB+3n;P^qwcPi^`pL@1K8g*R}TPrfA-Ah$ZhuiY!Bp?FH=QdL_IityQh}A
zmbcZj`*tr4Tu<j1==AO0T2(b__XRRqo%hU3(cUkRL8pWF(F8T=923-{=u1%J+}Y|2
z9PVs+`T}VAE^YM#6qmNV*RythWwrNR-0H6}!zlk1y>nC5Sna_7V6|^wfz?(6F~@>a
zAY-1WPP@KFDI8NCtbv`V(p3N*XU;q0?94Y_)uw#sDst|aGH-<Qo!=_ofWa|k-T{Y)
z_iX+Kri?Rbm%ima8^?Ud0L!l4bzQsq4%Z>hG2F2l7f+eja~SS80NHR|H}s;%G2C%p
z!!^r-ao!_T<8Hus94j8L8Mo6iFQc=}8V|<ob7<qe1|9T$4uhVc8Fx~p?_na@tECB=
zaTiVb9y_)*bfxDL6TOP#Zi3&5k36M|(TAGcL|fOSg*Q<|$0jEMmm&JmiJMln<v(J9
z>g=6N27)gbB>#x2bPRBcrd~^LGte1arfT4Ns`3+nPDF2-2G*p_KWY2A^OIG1_YYPc
znan?+$lkdr-t39-Z3Lnv-skXcg*Q9ZHh8zin_XsmywBtPB;MR-I#HWjh=O#W^jlV1
zZSe<w)YJRxXwwnR_*2y~#y1_t_fS3V^%r%$4dZk6q0^Arm13l);~h5mQP9FBIa5PN
zllxb+zO&nq4j|vU@xP05J)m}XQJ1NP;Tg>^hBAQj-5A71eh7|H{d(8RzA-pk6ON;-
z-ynIs;eHN4KL0iT9wdL}*>f-FKH)r#oJ6VjVWpF4&wZ$!Vi@OZ+*EpSAJUxd!UY=m
zG^PH5yi5iqZ&qN(obOhD`Ui|7(r_=-gwyHXADGrTv$RDTID?*j0Fh4UpEu_D=-9mn
zdJFOLpO8G$NY3<@vhhQGtYOGQ#J&#Eiw|=gYjA^mrFe#Zd5GdYOLhN331UnhmTFuq
zP5TR_n?*+%=gcCP0k=TRCjTtN%bkKOqyBsia7-2o@|+Q}TocYAcNX$o#sEnJ%P#Y`
zaiC*aI~yk)mR-dEXc{7I-rd|J?eubgDxCb)0kPHp!E8DxJNrxn@3*fM^QetwXP;?U
zr-36qhb=pYEv?tk(d6>Cv$r=lXdu3D06;mPF8kYjsNur^n-4WK3beBiHM|VUKn$yg
z1MNdHlb#Q<v!kD{0LMeku^^Oj355p(=Qy{`8i#LT3Pui{uKB74E~R6^V6Z4W4;Y*d
z{+h<Er4D((;B;`_D_?`_f5-A5XK9oi0={MRd<giQQS1$n@QuG?A$Hv&2YpkZH{hb?
zi8{tNz2O}0teV#@;5)Uj6|BKHwa_^)s^(v&-L?U^62DDwEH8AertnbCqrq(ljxPXq
z2(_~hExf6L>*-P`q--#hJ2dbG>JSFtiw3w;i++g?he7m43JHhkmkn;0#%-cD;Wi&y
zSjjl&(86wwdzCJPqiUQ(3my%8ojT;Rr^Ae%FlNLz$sXr>9;(0SUOt$Svmd@k%h*c4
z<cDBqKYXtSZl@6ikafrTybB;ZpUVZ1^#@cY0@-`hWPP7z*g-=gfZIu18Rr~Y*spQB
z=_kf{JhckiS1jLV<$D@Aj>;5<CdU~a0+5~2s={`&z|Ww9-NzyAK6V$e=VqU=;(hxC
zViHkNWZv;eA86oI3M~eajz>DCflt%340OEDaSep`DTcOmyw8Uk2=7xIl#ciLNCV-0
zirajE;c_%G_Lj-m$Hx1_*nFsJNQ|w$PmIks{t{z#cmFU}clY2p-QDY&cKY-`w9~FQ
zw9`ALhCf3NR^r>cwwFLroyI$-fm^9u$sCP$UIVw&hLR|NGYz?*ft5WGrR*Gs87>2g
z-s`zg#;#=fM&++Gv>!!OfB<Jiz5*bR$j?`RDyN5kttnTKtO%epZ{aO*eR{Ma*qxXh
z?|!f0C2B=G=Uu;Vyz>^SUkL`|OjUR{d<|l9(<`ALV13HC9cG69t;X%7z{+-Ad=-N;
zz5W(*j`+SO?OX4u_;Hod(H-CNon~B1%PJ$Qj&HfHf$J$G9zf@4!wn7GPqX7~KH6|U
z9%g%hk`s`N+NLpXf`k{L=?N&}69)K$2G*s!31GmMa}_YuGq_tCSD&U=0fV#P{80lF
z=}r|eBvGBJc8l^^s-CtETiu3r;Hd0lUefX;JYjz&JqxPapR3UNVB%TB&k$KmHlT^M
zP<4r(gSG7ZDm2L;f6>Tf&(%71Gv%|4Up2I{r%pYFHZ-(%HM9|BG(g@Od(JgrK~A&(
zrjaY?eiD#PC^;D=ZE6_r0T(NqQF^l7HMF@87$%y^7W7@R-2_!ysUf-#uDYOK|0;j?
zTy9|BlQf|*T8n?aoXc@vYiLc>*lrSv9VHF?1Hh89E!}L4N^EC<4>Yhn^=$%R2Lt?5
z1D~Wb4BT%_=b@IlmYOvM(Af$33&7IY3E9&WMJemCnsGTh8ZlWK*@;TE0J5`ZR15p4
z9ooepdFQ`0Hf0;N1+trGep`E(lHEOb+uI%aq<o7f0q#zj{5Ve+p0po^_As2hGhYk~
zxN9BlW7yrC0Wfce1^tKJ&2ydL4xG~~c_4#Nubk<OhQ3SDUC;#19s}=ux0N4J-!9O7
zf;KVEapJrI-WDg%zGK`2ith@Xb3%pp!Q09|DYYwP2GJhIIVV(jADmC9Jm_lk36(wF
zY(Aml=?)U-gbMFxw*}w5?hqYJi9LYJW9*-|wcE-NO6vh!UOLJ+=S+%scRP&yd)lo6
zgLP&2cC*LywCDPUg-8hD11kQ#(D$<ss6=84jsq&t#KS}+oqP&2-Z8ykP0nc*-s)}#
z?e1Ri^Ui4%-s*0Ll~{Cdn1gd##k-9iPVV05`{&5N58U^8-lLA7SNhoR`$mpv%{<*R
zt*@Qq&O?lb&Y%+mAkrB+Vl}WBB@YDff~k)<0Qt<yu7P&;ore;%eG(Kc8D#UF2bqE~
zV-qE(U_3cS(^G6dz;Yr5BgpTnmob^LFqy|5Us1o)q`@#5=KxE2=)?gQ8b1Wi&atBk
z8W>178R!fa6?N_^)4-v2N|<wgr4oQRzoO{)Xe)sNhS{ydu9(tP1`4NG6m?0plBjlH
zD~xsyvkQb>HTZbV`VCl9t%_t1w`+$v$669J>RUuH##p6k+;F?3>`XKq=JB0j=Kb|{
z@;aRxj{0*BxA6XY5BWW{8Udi=mUv^mhg?DXN5FnFD0n2KID-;zsrNv{uhmF9`#cNp
zrDvaKsbLPHoB$sVmpDsn-dV?a7786@XJ2WksX3h^EHw>hZ;<3T!ctRnzDer<_6=aX
z3*Qq{q|2l1oJUw{Y1&;>VKiu+F^f0nd*FcVh|xL5EZ&^&fdjHv8R*Qap8$}Lu=GrY
zXLas0JmEdMa3B?3!8y-TS99N?tEuP;KbtD92OytkNgadQbk4KX*OYhZDg&MKEDbd9
z9(5gyzS<e=+~pb=J!7HgcOx=Ui@fi-I@W$(`cAhbY4!&+Z9HT;QLtnH`E<)q<1sbJ
zKHZXx8o}unN}PZiaYA4Xwb&k%HUZ`AY4kVro-z7ng1x{Ob!e=G_Mx<i(A3{#s)+^;
zpkF4U?z7KMG=V0ZZlT1dpvf8Hn`%vUDD5eDtb%luan4BJOyla3|0D=^hWO?hSf8db
z&>7-eXka4!Gzn6YsMciLgD<%GX|mnMs*Js&#3^<XZJJ^yP}&r`EM>lE6`~)f*p2;N
zt+0vKJ?ADG?)UfcG@NFS!}rlyy-ok;tutjk_C=SbqyP5-F^{PVub!eWU6_GoTtCm6
zG`Kj~pTg7O;|9>0bQEx)Aq~)^gXmH^%93J$ff_iNIy?j55CdefJ;hKu%)ns=7_5QA
zsm`+iI<cNS0QN(yXUnswiV<}8S?C*S7(z5|6xEmo+-RCU3%FE+%d2r?=v~H*CD&}=
z7MmeGR4dA)CbQAw$5AHZ#v8scjhjHHXWN}oWfKABQI>yv@v#+VDNnoS>_GnZ|L$|_
z`m!I<9Q1nZeCisEfXF^#k}u``qWx>24D6@H=fgK3uA775CuuJF!em2OP?ul|4V;S-
zOr_W6<|siS;ChQpx;a;upw{y_N)V}W6KK-&cBWiRf%EJ(^yv&)F0V9Swk$+eqR8u6
zIM1Fa-7&6cQVZ;7LimfAfx(}|PG{x<y9JKwUtECk!=efc?P|1diJh-xjHW__%g{1C
z|9yZoTZ%rMb6^3^!Y*EDSErZWc2x|q5q?IP>->Ph_%ctrGS9B(sj~>PM!G!@);n{s
zw2RAMLGdlv&*RBoW63ga;hBueIOBO?vHi8omBaRwxx{W%h{^ct$oZLor}t0N{x^6q
zf7{hBM2aK;b17fxwueZ%HV^%Wl~?-r%8>#7gXxILpMG?iwhxx=mTz+fQP6UGxT`Y2
zvuMh4dzvd*f4q;6!JYUc|MnDq?{G|nUxd4WE8b84$fG|lLAvtOfv;UQs=k1KN0c!p
zP<kG$g2VeCD`C{XxP-Ty68^{PUG=|Hy|<UxkFMUexs?A`s`uw{p6#pbGynC9cwAnh
zUd)x3&i{p`E`^`i%gQQ&Cgk5q+%2+Z1?b;1<u8R7=Cd}rS)M5`+jFet@7w)K$by#8
zI$kZ}wPlV3vvF=my8DOtA)F6AC0?~jrX`Cyq87dsv8kvns)>g9Qse46)fAtS0jVyk
z>Q7BY6QnAEx|*mW5=0GPYU7m*cvDE2E~aT{WBjiQImx0Cs99!$mfBQvcwr5-j7oqv
zjEBIcAYnDNK%M|`O(4wc1-OV(et@Dj$EPs7Y3S>AQov#-wT)BUS2gbU*X?9~bP%0L
z+5!|8S*PZ1vAbZa=JFP-)m(J$4Y-r0RA#GvG?cr?QoQlq?%^}lb=tDkPKL)x+y)Yx
zGWg-5%lxn?e!B*y@gs;%@*{wv-^9a@Quz@``}r}~6S~7bDsiC<&sfjzJMDc^j`AkX
z@3t37_)(3S`<DH(lyf}s?=bn3o_l-ja}x1+Jj*D26+p~hd$^<l`|ZX-9XX#UoRrJ=
z+Qn5?mgm%d`wbbyzxm4WQ85}mDu$VcN(wt<m-ibzC}na?1xh+(S4}(c)u|I7-Y<sV
zA}j?Ku9@@rCAPSk4OKV%5*MfWF9|sQ<Im31`?-&b!Ozmf&1|gZ=AdVzbm*L?mwvF4
z&=fbbsd|g)(-?}sQ(pQ<C~z2>tLr%wM51htVCTtlgz(Z2nAsAQk^P6?Wb$P^Cw+N`
zfk|_gn9~WUiL(47DEWmr5KIT%cJZ{bCKEH!b*{tv)`q3b#k(wid#^S!bsnEr0M1c@
z$$&+|W{2WE7eD$IhM$&eABxYA@d0pL133$o0Ga0t@KEKg>ACo&kb-!*G=#H_@9SkH
zoH@?OHvF^-f95}C<R=TfUXU|ekPa-g6N1Z$NOToF#!%?Xc9T5DJ!pBJe(&4q)w-}S
z{_8DHi`VgOkNh9s=3#S<JPJPdF>o%Cm;SDOy^yEY@Am7`{8Yl*D8{Jq<HwE^G1!T6
zVSAGQDC@pmk#7EOm!=MX*ey{h3_S3=9Z`V`6N61E{;kZC*wj)ed?(|uV(=*j8(H{8
zVG$Esm%jSLZdAOuF8>JpUk{cT{MHh)G6{>K<Og;=TYpM_V5cqr%kH=PPrH{4=LH=v
zVL!+F3%q}%Q4j4xfnVd}H+bKog%9oMPCww|Pk7(OI~;AxYmYm4^K#=Cym^J;2RN_9
z@8L7A8Sdl#2i_0x=F4{vq5Us>&cYipFhTwPvg@*^5wz|vyQ25g$-nH%z*E*==+AgY
zXW0d-GR@myY22_X3N}VHOd5%P<o&yfM;>wf?K6i?zIR~D!Bg9BF`R~E*%g;naODXY
zuFC2k`=Cu(_HsyEmgwrj4{{Zku3fub8!fNmzP5&w$9DaoA)ZYx7k;vIL=vVGC;VJ}
z=uDC;k`5Je&7)#vTxB_P>ylmg$&3J3Nw0{+02l8ad5#9S>Peaw=nC?L1i3!*exwt%
zT#czp9@kTJxtJ?}w&rmqQFL)vL2`w-T2g2ommhTwaXmqoE8x?z5Labd)yx%4ABVU$
zQ)rCK&oe!*tEn_&038c;J>z`t5awFM*|`!1;Y_N=1W@7=t`&4I-1Q}0YvtNTv-7(e
zQd%5v!jGcsyK0iFfGfrp{lHhQfa@vG<@&CflA;T`YSaF%$U*OduELaB3ZJGIM6R~t
zlR6(jSyhnZvjtuG=rThB0x3F)%TNgabXAoq1YCS+;MxaL2ID$2q%R<OX5tqr@7gQ)
zcPa%<Ddf^Ey}6L<rJOZdm@*?>|Dq8^U3sWhl<ReG-F_G4;?o44Hicbnu>cdaricrx
zXb^dt6?IidJ2Cy7Vy>fD2em8i3X#;fvn!lNMWZ4wHgiq&M8t3bLyDt0*TtfuM&)-!
zdMd@ax~Y7epBQn<*I}TCO1hpljbE%ZsQ=OKo*`vi4g6?f4CHOC<oeb~uI!pXRvZef
z#n+E_@q%B_qy$$344JzVTqmi1J2d~oDy}!E0^3%Ts;)35=~~q_n?6l)75b+xI$F(D
z)MsOZs8w}WkY=gwYU>%*&=n@>L<0zYw}z{<=e0(zca&#MZPzJ_Dz$bErL*-=1&3Or
zIg8atX;HXI^<5LJf2e7kt-;f(p{wdYgmMwfdKNZy`T1*7wwX7ir%5|kHy6E|;!5zG
z=;S&j>D?j7%f>F=K60{)3n!L_x?Z8fU0p}0NPF~(W!+pgCH3s!dc`xohwB-Cy3`(B
zD`bGHIc{~i0zAD3;P3>U=<Ujjz+&~zuKu1~gH1)UI1j|Vp}hR=5w7<X1}b(Cae|Tp
zT@lo(w+ms((XOR*v$yL>PfDtb???&6LQoMC`yv+u$GUz}e!FRAh8;;G$GHlQ!j!L8
za?{$?8e*=O+_Y(><Z76GRZ4E!q*^7+?y4lzs9w7^rgcqgO`n!f1M|764U-#Hs$DH9
zp<$(_HL8nzn7&o1)UaWlrkJ)>tyMdrNt5a6c?LEcnL42VNcntN$1(i}%F#{xkF>|9
z1ka_fGVG|dQvsdEP0W+jWb&BQJmXVjk;RoerHmRQM)seO(l}+@F!fYKzD5(rPe>hQ
z51Tr#VdG(=VmgWL?VI$47c48PBqUUfsah^3EO~rPNAc$9AwlVWq3xbbZq&NT%CPlq
zI(F>Px^P(cLSdp~^CnF?wP@Q|H0jp2Q*y)BO=3EBN`A6adZV-!qs4@jAt~cx${ZID
z_g&h4YxgUkh-<svKXUu{-cOQt9NqlRVT{;i!rr>S?^3$|{;v=8!({2569-kY^32?|
z=lr?Pc7H5G@&vU{YMRtMrs>4dV&H^fsiR|tq}UT0&m7cg%9xb0k%I<Im?@9euNX6E
z;7q>{?Q%gen5{J)RwSTwnxAV>t6=}&@u?%`p9og|!=zvRm;{CEbF#(Yn7Ba$sy-KY
zAk8k>X=uvmXZ-S~7eC;M8Fs)gA*R!q)R;PTj<^o`HHxl(WzM)^6=M<_RZRCkDAJM&
zH3{^qb-a)(D4=Olk+@SaaWSQjM^yPRB0VJJ{i;=tmy~`@CJ&q77b7YMrTH}(Jt(Gy
z8vLByHf8dJm|;bpvy^HgPNg?W9oPT&fg@99G=8b;y0{HV>*CUq;+~6Z7Mv9q8#hp7
z#l`r=T#q{(tH<-p`(yuXRAS<~*mbdE4z4WQxNqs;wAi%R35^HGPDzW6c{n4b%`;0F
zGCH;tFqhL}C&rc;wmzj)+Ps+Z-9DP~SKQSRmVfM6*9*y;`-y8WiH;Ko#577BH9({`
zOr2b{Z=<22|L7qpWy=KxS;>C=te~JWJMJDAd-rVR@os<KpO3tD&~NsgzAZ)%J1}8b
z|B=I{#`?!?I;f5h<9Y6|7m}?eDN9;pTH{hD-ExhtK5<kz85BJzd{F(gn1GrwWd;u1
zd1lw=qUI+%_P=_3Z_tdO5&@^XcJ7?@|FrfbU`<`=o}1ir6Cxo2K?MY2(1L=IECjGR
z4O_$&+@SMH3n(ZQFf6fJwFa$qYPD5Bx%F#jiq7jYtyXAtaN53t)!NOvcG{}16}5}n
zj*3;ME|~ZK_vS(<@V-}{=jPn=pMN>~J<ESi?v;1QH&~LH_BoFg<v6NJAvKOt!_4BM
zBI2wzq&gNZaLTs?#s?S;$%TazeVs*FJ{q~RI=aL*(y*YQyhtaH`lfBDE|;DqZ&8Eg
z*`YE=wW5H%!VC|OYK+|FTk@;UHCm^AP{$ZUNH&|ssTK{js`TYW)rIUF{SKyFr_V{V
zPhQVdsP!{aE10Mk?881{r>|$~wEBz{%o7thbCi7U%*EVprtxY0u*)NG0&rx+p2JT!
z|4TK0&`js!Gd8mG%Iip4m7^l9#<6I@l#*&^m4!rob^e`0tyjK`+vWQ7BV95hAMxcb
z8qKD(g%+kd$`)QNU(n%HC8|$Ryf%MLO@?pi%LB}YLv-*VdWe2Z%?D{z(-GzuzfaD6
zx%c4fyU2;7@9w^S;M%@}t>^r5v}BAf>WcmcW}C@yfq9HEFJqztw$&BsUerYojEd21
zn7ZXL+k3~p`1&c{rTT1K@pzrNE?777#VwmZv)%aO#NorL%JJ~9SiWH9lc+soEr<OM
ze=xT854B@eImIP|H$=FMmlLBy6eA6(jYVZ;)zR%V)}|tc?1Hj|MY?gn{y_)dw8-MP
z9gVcI?vPEFNAu_(scGa)I?U!iR=cWZ41Feby=t{;3_a^|-in|R)OopNrQvl=1U<Xp
zNAyQf$D%!ZiZv~oU-s-xp~jJ|fg2}Bgam~wk8ce;wtozDsa&c`m8I1{cL!#wiXJ`{
z{AI8?f}WBse?WzoQDqILZw0!W*!F?bNmG0PBR5Sa{)|qQQ?#J4YKbnY^MmgSj$X=c
zjcJZa8T-ACJokg~doF63DoXb9r%Mk{BIN}O3R4z3oy4)gn3q~sGIvR7g-dt#fh#hj
zEq$u7;}@MSMyGKSXM4gA+{LK9@15fQ$yvVQY-8n$fR@>d=^F{CzA6Askdw}bp#hXY
zO>`+;B7ip##1B&fwwW&VZA4HQ&tPP1dx70|?=&2n-=^NGp5LQwc}3BJ$}FbtOdN|R
z-0Cf7GDM)}jE!&mJ5`Fl0}^`3Sr5HX0-DYa=f7y7!#R{E41Z@WyZYW~vEI4sthJxG
z$BLxQ@85M=_#^i?Ex~*5IxQ#nVwG!{hW*fN-xeF_erT)v0ep(Tv7ctbrbQ18CB+Yx
zKE*%&5zXX3ZeU}TKcgSoG7mbpA+<H5_~p;vMV<Gju-p8}UFWT7&b=<@gP4||B`xaj
zd9>=Dy~k<UeDto<vi8_LPD}7tJ<>AncPLeJ>rsUg2~7y~SD;jFI6>1WD1S)EZ<-zI
zlAzh0pp)TGo?F(jp{Ono4uB>3W=}_&2Om+MNoK%SL>@8Wwt|^&+fP{vS{eeXByTl)
z@CcAg@+{}Q<;-1j7T-}oe-UKSG+boTgwBu8xX5G-$KLHeAV-0X28*9YM_dfJu^yP;
zd6AhV%J^PlHpU|TQJ|HAE%Wd!0M`Y!0&FGNDzMdH`2*k3SS3o-fbU+95T|-nR|I<%
zGAQk}?1cCrT6Z8QOSXZX#`2M;sex4j7R$!UuRTpGLEGAVlMbt`$)6W3l#f+~LI}#n
zX@OOQhIBz96}OTEb|N~6Wtc`lA!Gwr_N1R2VE_eOA_4&MjoaBFfnflT06QQ+D{<xX
zjq6xl`Z<uvKvpm)FB<XS6AZP2?gw$j9{OQO0OLu8AOtt~{8Ak|7`9i@sjX24C?yKG
zsJvDZ{*kkExS$#mH;|a&WE9DTHaE|6jRM8_EMgTd6KM64Ku2%!Y;y6RoTa`lj{;?d
z61GysU|E3iUAh<@rjcQy0cv1va3}DY6}P(rTpcmVQf#;<FB;^05I|7^)QtkPSS03S
z){ufb6jHe8ck`Wf?10*uGXCA~=mJ;OY?~-R`g1+c)^bn4E)P2i@c^i+l}tA*7s^Y-
z%Y=f)3O5Q$7!kV+9Sm)_=qK}KSTgfv__Q|2us%PKR|v|<`9hxY1g2z^pgTvoG_c;4
zgmfukSih3N&?IpTUo!QvtkUHx`amI5&?O;*b-iHx;CUs1aiXUy^P-n@m!1bfY#u;z
zCA^fV?h-=nxM1o(V|_x!)|E&)Bmq(VoDT|2e$QSuly7>IRVwF*R9C$}jg>QwU3}{I
zG>eLA=I6hs#SJH^lk0?x{w<7Oa*{3y9t|0)78ShECwBLaab3Nf5?*4_vu8{NnNm+h
zdCM3@8QTeJnN$Ki7o?>2)!^N3KRHK+J(`nagnU+hBJx&1e?n$KixP9rFdO8kG!KDI
z=?*uI#P|KV>0lPw_*D!SS6egA9}B`$Qi3xCc|tes<i>5f%4vh}{1M{6_OPKoKSKzH
zAHs04%w-|u+L|Gop69e1xxm^QU)Pk5*!2g#OHF8b`r&skEjjrJ%45wx_jX-!*{73+
zy&j)CIeq20XC!<__V$OazcMXv#jNme$B*3fHwn)lar~;DFlEvUquK`Y<}GhZ_>D`>
zEU8SL7`P^L+-EV@{u5QuLip+bo}Kvbr4wAHt?GHR&lNxUjzswMsqn~UFJ*3gb^Fm@
z{wYu1A>nt=x7|1C!}R0ZU;c7t($(dQCHx8H@PKa@Pdu^Xy3d*?cAN{B@Os&`(nXz<
zc5Zra|CR?2#brwP^c1K2&jp!l-@83<?2|`bqf#V-dG6|?xAl`Z>=^iui+{epKTX2#
zSbb*wf#%HjYJU2$_?<;Q=Oz5*V_6d`hfdw|+7Bk#cPqbrUc&pmx@>iJ!GzowcaQn{
z`qJC+ZBPqXqDaRx7XO%f=0o$xnKS;htcJT~D?9jwB#3SnRACJ;6S9U`ML1^P0|>7q
zYz+(~K*Oay^-W(qx2UWpCZEWC`OQDll8L_ADalz?jz^2;I^S>2C!Dg{S?DM$s?SF_
zbKbm?xkW(>^NB(^b*9}>RbHK{0ngJq2$GT+Mf1`NOPs4&;PvGvpQB?LUw-vDnjGUh
ztGJ|EP(Fa}VcA)vqXNR2bUCC8Hk}vXmMiDzB<d3B@jrLdjpw>y%TL{K!o_Yl@e;ra
zQPvoz%j)(Rhk1ESdM}ST5<E&)N?qxYeB#6MpI@ZveCoUJudU~e`{zQ(zb%^4z!ps5
zL)v_zt$|8_4CkffJyuYaH@mv13Jb$@@lZa2%{qn&gxZOgu~1W^U}wke#-n>(T@%)h
z+YEU4K*&ux&~-m-fKW0XwuOAi12Q=bV96jl05)AX*bccRQxG-$VL(azV7tYKXb2-$
z!8jn74<P=q8RH9QW)yNY?Ckl-{a{=YLU(KA8WQAz-EjU54%NV54VDFq$Hj0GqyShc
z&mka5hzcwo@5ED?YOorxI9t(z#W!-H0G?IE7a9eFg&lZ;Z~hqq7T@24^iXi|wLM|z
zZ?0U+G+cqL8LlPb3N<Q&qZu63GlY%wI2h1PFoeg$K%T(ge}#^}-$)FAiUdL=83ViP
zV}Ln}RKZ9+AMORDoakUHy@Zs(hFdkj(PS}fs9VWMlFJudr9rMtVX{y{<^n^mAm|`Y
zfV}ZW5WtBAZtADQKsOPl6$Wspz!eGjA_zkVltPHe2~a9T54u$$w6g!5!v(Bmq}wor
z?aFW}M3(~DO^2CF9N5v2j5Gm*=MnIPf_V183I&2^2uyHUA$Muu+Tk7#cRWb&1SFxa
za+(b#!rO09t1BBqO&79=S&=egfQ&7MO#MHz*ei$71n~cQVA_N`fl~+5ZqgZ((I?L3
zaMCHZN%4-K3ZQWQK~7lc%*2O64Q+b>v~?e7`y!X7ONOZ*#t!7~+@yp2Q=m-n!Wm!!
z<gSPxaf|A?AQ*~a2DaiB4G9W_;!W+vw(J%)j64pF((U$zwM;RT1}HzFM3FtM7yB^?
zwGVcaz@FZVJ^VJ+GspSl+jOwMy%)7aq^`S7!v;<GEfo@EmhrW>X<(w;y**qk!^K#l
z9dL-HXKLex=revB1V5lth~Cf%(NF9}%?4^8d9etAP3pzIrEm5Gfqil>_MgSLHFqHH
zDZQu(cc?x_EOtMyV#nh(SnyMO39Pz9hxaL96a=RA5;)eMfLK?Vy#(~`eqt~SF=X`;
zs00Cxm<MU*6<Aw2M&SpYHk`fj%!2~pP4YBAJ{Z0beDM+uu6LZ))|a0SxC^V{gqb&k
z)4~V;&T=Oh7bk0DQy&us*T52I<oz>hX2FyFA*m>7t1y#|ZLI$O0-M7UZ%jBhJj-Fs
zHJFke`C+<M^Bd<wk6BVyRIQ6%tWC6z%$+(dx5}Y(ICJ-A8m+m|3)<7uCeAXXy*6b^
zWPX5d1^k@9RyoT2WO+%p#FatWNvcMhD|F?)&{TU0^j=AENu#Z4(2<R{BqiW(nl(Ok
zw8><Jj>=?Di?=7)eV>T@DD*#)vQyG?Us^S4YvNymYqU1#BnnI!&`0cL>`Xh+`0ICQ
z$-pyk&M%nR`m!()Fi)5c5Gl4<i&n;m%zjO7dQ(31j4ER*F}ikbZ4M&4!}ZJxS?nC&
z*Ur}K^=!;m61-KZ6Q&jIf1TrKbd*jYLv-?4jegIR*jza)Yf8zScGBp8bw<cVYPv~3
zcLW@7J5nC-=Bd(vVf$fYCaGMPq|?4C2Pd1j)dg_}uBlD`Qk&w>3yxbo$MDm^*;hkd
z)_<w3=hb*W=2o9kU#a>@?V}CzA6<}aH%=e{r%78_(N0p8{fMzf@u<w?kkPh$V}w$8
zghz&jZ4V!)jBbQg*c-d<YY2^hLKFYE2JWi(JOy#Va%;q2+)FjrIh)3~rp0pF?<=O0
z`#cZEdTxXI6@{Cta>cxE=~P>8s4bnG#jSqZ&0Xf&Pq?`&TtX*zA>jr(32qM2+xR1h
zPweCpZ*XJL5%DMYesqhgTyupp#!aYN<1_SnoKB&HPxQ+26nTm)#qFj!d5W2e{Kz94
z{-{_HIX*{W%u}>RwniE=>YjDGkY>wxSW%FXqo~Nx$o9UJ83Bv+wa1X~M*F;})EqL%
z-0EkJ7!(>YNINKZ-2BQ9VdAv<{N<qJL|m;@27NP+F;y*?%ed6Dnm+5aKUn$6unKOI
zUHg{U<w^JY$)iq*i(FAxfdhm~0%1-f@F7xyD2ye2U7+)s-R23^){hHSf@Zlmfc5LT
zdNIIKOAtgo0hq4!t6ucOv`jLL*Mgl8{Qr|=teQV*zn)@$p}B*J8?(3}lz~Yn%+BE9
z9~mX`VE=-K!y|q&m9V74b5N|Gk&!}yd7U?5dVho!{SmhGLs0MWCJ3q<{_tK_>37;2
z?;W?lrx-D5JrZT?k1)MILS=u1+WrX5{Sl7zN9gE>Fb|JJNrq7-dsU{4bO?R3NEIsw
z>c*=;BpgGI^xy;?jaR4~@n>OD6CyhzI?Yt@)pCMUsX&Ks+s?B5;dOA^wvN@hJgJp=
z+AI+}O;1CVd2}trdzICvL{gtvQ=eF?6gp@v#3nASbBulR<J&{f^h{&lypq1HCvQTZ
zAtVA;h#wY0q7gE0M4beh-=Mo9?8)7g$DU}j6o^NiLxcsNlyg)iqRDo3Es8xP`6WC(
z52j7H3vaAIsOv1-7%5<>;$dAap`^Hk#W(7xz^GP8jNp;l5!N>9jGFNqW0E=I1!qaf
zE>}w5KxNPLNzrWaFra`G4fH*Ne6v@`9bRxncNZtcBSjO}PccaCRMZ|wkrzlg_ln$8
zD8xJRS}(p07-d%%E5t8FKIQPQqi;SGs{OC;$?GKT+Zj^%N|B4|3Mukr3Ed-d@j3O5
zywZ!WNr<mU{8Hqn4e9Fj?IGHy46^)nQwQvnBA42iM?V7kPc*7w5*|F>a9`P<?!|jp
z5clLCnPFKepoqMQZB4DrNKaaGvus20jP^THM*Y3|p5GJIWiedgjxmY<GeLl{dq{<z
zvQY=ZbXiohdnkhANf{$00GC=0vIy4Lf^k957H0mxt9LzRNBsFc>)62!^{lS8rZBL3
zbd{4wy90*5WU9DUzA}glguj6p1~81&yu%^d!C_fGdp4X|d7R0Q6J1eKywBqqA1;;O
z*TBZXG4^XpE|cP(2)w4;dv}X*@C$vonT)O{TD2BNfC3?)miJYhjBU6ei%vv!$T}dP
z`y9CVHgD9~)p~IC;Nr3NO<)_q;=d%3m(RZ-n_@u-?VEtz0k#QjGuXGlz6};>yTHYl
z*S2{4eES8NjUwe!-e1q1Y-#i3Z1RRcuB{<}bHZCg76w4R^pMb@Ju|@6@z(+%Uy(i0
z^mz#Q8vpn}ZmI7!0IgzK!M0f-_XwM5kGChJ8|_AuG2L#8_qKYqDlIEzydGB<_7r<c
zoE@%2IOQf-piW2yVp4jFJ<Se0c*Pm{(qQg*036PX)d{!6Bx|hBYBKWELO8wF0%){}
zX28Z<jV((;xWP=I84k{&O*9z+Z2_8E#qSE`CO3pbu7^UdxAO~!Le}o<nKk%>=e41n
wi`mUD4C7oBKXfn`wEvMU{~gZlVU&||gq9+Qb`#ptrsHhPE5kV!&!M#a50s*vqyPW_

diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
index 892d04b4..bb5a315d 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
@@ -118,7 +118,7 @@
     </el-form>
 
     <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-    <div class="crud-opts2" style="margin-bottom: 5px;">
+    <div v-show="crud.status.add === 1" class="crud-opts2" style="margin-bottom: 5px;">
       <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
@@ -195,7 +195,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
+      <el-table-column v-if="crud.status.add === 1" align="center" label="操作" width="170" fixed="right">
         <template scope="scope">
           <el-button
             type="danger"
@@ -305,7 +305,6 @@ export default {
     [CRUD.HOOK.afterToView]() {
       crudsemiproductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
         this.form.tableData = res.content
-        debugger
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
@@ -323,7 +322,6 @@ export default {
 
       for (let i = 0; i < this.form.tableData.length; i++) {
         const row = this.form.tableData[i]
-        debugger
         if (!row.base_bill_code) {
           this.crud.notify('订单号', CRUD.NOTIFICATION_TYPE.INFO)
           return false
@@ -332,6 +330,14 @@ export default {
           this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
+        if (!this.form.stor_id) {
+          this.crud.notify('所属仓库不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!this.form.point_code) {
+          this.crud.notify('入库点不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
         if (!row.storagevehicle_code) {
           this.crud.notify('载具不能为空', CRUD.NOTIFICATION_TYPE.INFO)
           return false
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDtl.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDtl.vue
deleted file mode 100644
index 0bc7699c..00000000
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDtl.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-  <el-dialog
-    title="物料新增"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd" />
-        <el-input
-          v-model="query.bill_code"
-          clearable
-          size="mini"
-          placeholder="单据号"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.package_box_sn"
-          clearable
-          size="mini"
-          placeholder="箱号"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.container_name"
-          clearable
-          size="mini"
-          placeholder="子卷号"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.material_search"
-          clearable
-          size="mini"
-          placeholder="物料编码"
-          style="width: 230px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-input
-          v-model="query.sap_pcsn"
-          clearable
-          size="mini"
-          placeholder="sap批次"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation />
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation />
-      <!--表格渲染-->
-      <el-table
-        ref="multipleTable"
-        v-loading="crud.loading"
-        :data="crud.data"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <el-table-column type="selection" width="55" />
-        <el-table-column show-overflow-tooltip width="150" prop="sale_order_name" label="订单号" />
-        <el-table-column show-overflow-tooltip width="150" prop="customer_name" label="客户编号" />
-        <el-table-column width="200" prop="customer_description" label="客户名称" />
-        <el-table-column show-overflow-tooltip prop="package_box_sn" width="250" label="箱号" />
-        <el-table-column show-overflow-tooltip width="100" prop="quanlity_in_box" label="箱内子卷数" />
-        <el-table-column show-overflow-tooltip width="150" prop="container_name" label="子卷号" />
-        <el-table-column show-overflow-tooltip width="150" prop="sap_pcsn" label="sap批次" />
-        <el-table-column show-overflow-tooltip width="150" prop="product_name" label="物料编码" />
-        <el-table-column show-overflow-tooltip width="170" prop="product_description" label="物料描述" />
-        <el-table-column show-overflow-tooltip prop="width" label="幅宽" />
-        <el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" />
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, { crud, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker/index'
-import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
-
-const start = new Date()
-export default {
-  name: 'AddDtl',
-  components: { crudOperation, rrOperation, pagination, DateRangePicker },
-  cruds() {
-    return CRUD({
-      title: '用户',
-      url: '/api/in/rawAssist/getBillDtl',
-      crudMethod: {},
-      optShow: {
-        reset: true
-      }
-    })
-  },
-  mixins: [presenter(), header(), crud()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    opendtlParam: {
-      type: Object
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      rows: [],
-      tableData: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.bill_type = '0002'
-      return true
-    },
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0) {
-        if (rowIndex % 2 === 0) {
-          return {
-            rowspan: 2,
-            colspan: 1
-          }
-        } else {
-          return {
-            rowspan: 0,
-            colspan: 0
-          }
-        }
-      }
-    },
-    open() {
-      this.crud.toQuery()
-    },
-    close() {
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      debugger
-      this.$emit('update:dialogShow', false)
-      this.rows = this.$refs.multipleTable.selection
-      crudsemiproductIn.queryBoxMater(this.rows).then(res => {
-        this.rows = res
-        this.$emit('tableChanged', this.rows)
-      })
-      // this.form = this.$options.data().form
-    }
-  }
-}
-</script>
-
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue
deleted file mode 100644
index 056f4719..00000000
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue
+++ /dev/null
@@ -1,652 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    :show-close="false"
-    fullscreen
-    @close="close"
-    @open="open"
-  >
-    <span slot="title" class="dialog-footer">
-      <div class="crud-opts2">
-        <span class="el-dialog__title2">入库分配</span>
-        <span class="crud-opts-right2">
-          <!--左侧插槽-->
-          <slot name="left" />
-          <el-button
-            slot="left"
-            type="info"
-            @click="dialogVisible = false"
-          >关闭</el-button>
-        </span>
-      </div>
-    </span>
-    <div class="crud-opts2">
-      <span class="role-span">入库明细项</span>
-    </div>
-    <el-card class="box-card" shadow="never" :body-style="{ padding: '0' }">
-      <!--表格渲染-->
-      <el-table
-        ref="dtl_table"
-        :data="this.openParam"
-        style="width: 100%;"
-        max-height="300"
-        border
-        highlight-current-row
-        :row-class-name="tableRowClassName"
-        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
-        @row-click="clcikRow"
-      >
-        <el-table-column
-          prop="bill_status"
-          label="状态"
-          align="center"
-          width="110px"
-        >
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.bill_status"
-              class="filter-item"
-              :disabled="true"
-            >
-              <el-option
-                v-for="item in dict.IO_BILL_STATUS"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          prop="material_code"
-          label="物料编码"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="material_name"
-          label="物料名称"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="material_spec"
-          label="物料规格"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="pcsn"
-          label="订单号"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="plan_qty"
-          :formatter="crud.formatNum3"
-          label="数量"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="qty_unit_name"
-          label="单位"
-          align="center"
-        />
-      </el-table>
-    </el-card>
-    <el-card
-      class="box-card"
-      shadow="never"
-      :body-style="{ padding: '20px 20px 0 20px' }"
-    >
-      <el-form
-        ref="form2"
-        :inline="true"
-        :model="form"
-        :rules="rules"
-        size="mini"
-      >
-        <el-form-item label="入库点" prop="point_code">
-          <el-select
-            v-model="form.point_code"
-            clearable
-            placeholder="请选择"
-            class="filter-item"
-            style="width: 200px;"
-          >
-            <el-option
-              v-for="item in pointlist"
-              :key="item.point_code"
-              :label="item.point_name"
-              :value="item.point_code"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <div class="crud-opts2">
-      <span class="role-span">载具物料明细</span>
-      <div class="crud-opts-form">
-        <el-form ref="form" :inline="true" :model="form" size="mini">
-          <el-form-item label="区域" prop="gender5">
-            <el-cascader
-              placeholder="请选择"
-              :options="sects"
-              :props="{ checkStrictly: true }"
-              clearable
-              @change="sectQueryChange"
-            />
-          </el-form-item>
-
-          <el-form-item prop="checked">
-            <el-checkbox v-model="form.checked">自动分配货位</el-checkbox>
-          </el-form-item>
-        </el-form>
-      </div>
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="confirmvehicle()"
-        >
-          组盘确认
-        </el-button>
-        <el-button
-          slot="left"
-          :loading="divBtn"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="divStruct()"
-        >
-          分配货位
-        </el-button>
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="unDivStruct()"
-        >
-          取消分配
-        </el-button>
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-delete"
-          size="mini"
-          @click="divPoint()"
-        >
-          设置起点
-        </el-button>
-      </span>
-    </div>
-    <el-card class="box-card" shadow="never" :body-style="{ padding: '0' }">
-      <!--表格渲染-->
-      <el-table
-        ref="dis_table"
-        :data="form.tableMater"
-        style="width: 100%;"
-        max-height="300"
-        border
-        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
-        @row-click="clcikRowDis"
-      >
-        <el-table-column
-          show-overflow-tooltip
-          type="index"
-          label="序号"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="material_code"
-          label="物料编码"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="material_name"
-          label="物料名称"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="material_spec"
-          label="物料规格"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="pcsn"
-          label="订单号"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="plan_qty"
-          :formatter="crud.formatNum3"
-          label="数量"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="storagevehicle_code"
-          label="载具号"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-input
-              v-model="form.tableMater[scope.$index].storagevehicle_code"
-              clearable
-              :controls="false"
-              controls-position="right"
-              size="small"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          show-overflow-tooltip
-          prop="point_code"
-          label="入库点"
-          align="center"
-        />
-        <el-table-column
-          show-overflow-tooltip
-          prop="struct_code"
-          label="货位"
-          align="center"
-        />
-      </el-table>
-    </el-card>
-
-    <StructDiv
-      ref="child"
-      :stor-id="storId"
-      :dialog-show.sync="structShow"
-      :sect-prop="sectProp"
-      @tableChanged="tableChanged"
-    />
-  </el-dialog>
-</template>
-
-<script>
-import CRUD, { crud } from '@crud/crud'
-import StructDiv from '@/views/wms/pub/StructDialog'
-import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
-import crudPoint from '@/api/wms/sch/point'
-import crudRegion from '@/api/wms/sch/region'
-
-export default {
-  name: 'DivDialog',
-  components: { StructDiv },
-  mixins: [crud()],
-  dicts: ['IO_BILL_STATUS'],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    bussConfig: {
-      type: Object
-    },
-    openParam: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    billType: {
-      type: String,
-      default: null
-    },
-    storId: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      stor_id: '',
-      sect_id: '',
-      sectProp: null,
-      bucketProp: {},
-      structShow: false,
-      bucketObj: null,
-      divBtn: false,
-      bucketShow: false,
-      sects: [],
-      sect_val: null,
-      dis_row: null,
-      form: {
-        dtl_row: null,
-        storage_qty: '',
-        sect_id: '',
-        stor_id: '',
-        point_code: null,
-        checked: true,
-        tableMater: []
-      },
-      storlist: [],
-      pointlist: [],
-      rules: {}
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    open() {
-      crudRegion.getRegionSelect({ stor_id: this.storId }).then(res => {
-        this.sects = res.content
-      })
-      const area_type = 'A1_RK01'
-      crudPoint.getPoint({ area_type: area_type }).then(res => {
-        this.pointlist = res
-      })
-    },
-    toDelete(data) {
-      data.pop = true
-    },
-    close() {
-      this.form.tableMater = []
-      this.form.dtl_row = null
-      this.sectProp = null
-      this.$emit('update:dialogShow', false)
-      this.$emit('AddChanged')
-      this.crud.refresh()
-      this.$refs['form2'].resetFields()
-    },
-    clcikRow(row, column, event) {
-      this.form.dtl_row = row
-      crudsemiproductIn
-        .getIODtl({ iostorinv_id: this.form.dtl_row.iostorinv_id })
-        .then(res => {
-          this.openParam = res
-          this.form.dtl_row = res[row.index]
-        })
-      crudsemiproductIn.getDisDtl(row).then(res => {
-        this.form.tableMater = res
-      })
-    },
-    clcikRowDis(row, column, event) {
-      this.dis_row = row
-    },
-    vehicleCheck() {
-      if (!this.form.dtl_row) {
-        this.crud.notify('请选择一条入库明细', CRUD.NOTIFICATION_TYPE.INFO)
-        this.form.storagevehicle_code = ''
-        return
-      }
-      crudsemiproductIn
-        .checkVehicle({
-          storagevehicle_code: this.form.storagevehicle_code,
-          dis_num: this.form.tableMater.length,
-          iostorinv_id: this.form.dtl_row.iostorinv_id
-        })
-        .then(res => {})
-        .catch(err => {
-          this.form.storagevehicle_code = ''
-        })
-    },
-    tableRowClassName({ row, rowIndex }) {
-      row.index = rowIndex
-    },
-    insertvehicle() {
-      if (!this.form.dtl_row) {
-        this.crud.notify('请选择一条入库明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (!this.form.storagevehicle_code) {
-        this.crud.notify('请输入托盘号', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      // 判断是否选择了桶号
-      if (this.bucketObj) {
-        if (!(this.bucketObj.status === '01')) {
-          this.crud.notify('请校验桶状态！', CRUD.NOTIFICATION_TYPE.INFO)
-          return
-        }
-        const dis_dtl = JSON.parse(JSON.stringify(this.bucketObj))
-        // 判断选择的桶是否已经被选过
-        const flag = this.form.tableMater.some(
-          mater => mater.bucketunique === dis_dtl.bucketunique
-        )
-        if (!flag) {
-          const flag = this.form.tableMater.some(
-            mater => mater.storagevehicle_code !== this.form.storagevehicle_code
-          )
-          if (flag) {
-            this.crud.notify('存在不同载具号', CRUD.NOTIFICATION_TYPE.INFO)
-            return
-          }
-          dis_dtl.storagevehicle_code = this.form.storagevehicle_code
-          dis_dtl.pop = false
-          this.form.tableMater.splice(this.form.tableMater.length, 0, dis_dtl)
-          if (this.form.dtl_row.assign_qty) {
-            this.form.dtl_row.assign_qty =
-              parseFloat(this.form.dtl_row.assign_qty) +
-              parseFloat(this.form.storage_qty)
-          } else {
-            this.form.dtl_row.assign_qty = parseFloat(this.form.storage_qty)
-          }
-          if (
-            parseFloat(this.form.dtl_row.unassign_qty) -
-              parseFloat(this.form.storage_qty) >
-            0
-          ) {
-            this.form.dtl_row.unassign_qty =
-              parseFloat(this.form.dtl_row.unassign_qty) -
-              parseFloat(this.form.storage_qty)
-          } else {
-            this.form.dtl_row.unassign_qty = 0
-          }
-          this.openParam.splice(this.form.dtl_row.index, 1, this.form.dtl_row)
-        }
-        if (flag) {
-          this.crud.notify('该桶已被加入明细中', CRUD.NOTIFICATION_TYPE.INFO)
-        }
-      } else {
-        this.crud.notify('请选择桶号', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-    },
-    confirmvehicle() {
-      if (this.dis_row === null) {
-        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.dis_row.storagevehicle_code === '') {
-        this.crud.notify('载具号不能为空', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      crudsemiproductIn.confirmvehicle(this.dis_row).then(res => {
-        crudsemiproductIn
-          .getIODtl({ iostorinv_id: this.form.dtl_row.iostorinv_id })
-          .then(res => {
-            this.openParam = res
-          })
-        crudsemiproductIn.getDisDtl(this.form.dtl_row).then(res => {
-          this.form.tableMater = res
-          this.crud.notify('组盘成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        })
-      })
-    },
-    sectQueryChange(val) {
-      this.sectProp = val
-      if (val.length === 1) {
-        this.stor_id = val[0]
-        this.sect_id = ''
-      }
-      if (val.length === 0) {
-        this.sect_id = ''
-        this.stor_id = ''
-      }
-      if (val.length === 2) {
-        this.stor_id = val[0]
-        this.sect_id = val[1]
-      }
-    },
-    tableChanged(row) {
-      this.sect_id = this.form.sect_id
-      this.form.stor_id = this.stor_id
-      // 新增一行物料时，给行进行赋值
-      for (let i = 0; i < this.form.tableMater.length; i++) {
-        this.form.tableMater[i].struct_id = row.point_id
-        this.form.tableMater[i].struct_code = row.point_code
-        this.form.tableMater[i].struct_name = row.point_name
-        this.form.tableMater[i].region_code = row.region_code
-        this.form.tableMater[i].region_name = row.region_name
-        this.form.tableMater.splice(i, 1, this.form.tableMater[i]) // 通过splice 替换数据 触发视图更新
-      }
-      crudsemiproductIn.divStruct(this.form).then(res => {
-        crudsemiproductIn
-          .getIODtl({
-            iostorinv_id: this.form.dtl_row.iostorinv_id,
-            open_flag: '1'
-          })
-          .then(res => {
-            this.openParam = res
-          })
-        this.form.tableMater = []
-      })
-    },
-    divPoint() {
-      if (!this.form.point_code) {
-        this.crud.notify('请选择入库点', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.form.tableMater.length === 0) {
-        this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      crudsemiproductIn.divPoint(this.form).then(res => {
-        crudsemiproductIn
-          .getIODtl({
-            iostorinv_id: this.form.dtl_row.iostorinv_id,
-            open_flag: '1'
-          })
-          .then(res => {
-            this.openParam = res
-          })
-        crudsemiproductIn.getDisDtl(this.form.dtl_row).then(res => {
-          this.form.tableMater = res
-          this.crud.notify('设置起点成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        })
-      })
-    },
-    divStruct() {
-      if (this.dis_row === null) {
-        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      // 如果勾选了，直接跳后台
-      if (this.form.checked) {
-        if (!this.sect_id) {
-          this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
-          return
-        }
-        this.divBtn = true
-        this.form.stor_id = this.stor_id
-        this.form.is_pc = '1'
-        crudsemiproductIn
-          .divStruct(this.form)
-          .then(res => {
-            crudsemiproductIn
-              .getIODtl({
-                iostorinv_id: this.form.dtl_row.iostorinv_id,
-                open_flag: '1'
-              })
-              .then(res => {
-                this.openParam = res
-              })
-            crudsemiproductIn.getDisDtl(this.form.dtl_row).then(res => {
-              this.form.tableMater = res
-              this.divBtn = false
-              this.crud.notify(
-                '分配货位成功！',
-                CRUD.NOTIFICATION_TYPE.SUCCESS
-              )
-            })
-          })
-          .finally(() => {
-            this.divBtn = false
-          })
-      } else {
-        this.structShow = true
-        this.$refs.child.getMsg(false)
-      }
-    },
-    unDivStruct() {
-      if (this.form.tableMater.length <= 0) {
-        this.crud.notify('不存在载具明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      const flag = this.form.tableMater.some(mater => !mater.struct_code)
-      if (flag) {
-        this.crud.notify('明细存在未分配货位！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      // 如果勾选了，直接跳后台
-      crudsemiproductIn.unDivStruct(this.form).then(res => {
-        crudsemiproductIn
-          .getIODtl({
-            iostorinv_id: this.form.dtl_row.iostorinv_id,
-            open_flag: '1'
-          })
-          .then(res => {
-            this.openParam = res
-          })
-        crudsemiproductIn.getDisDtl(this.form.dtl_row).then(res => {
-          this.form.tableMater = res
-          this.crud.notify('取消分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style>
-.crud-opts2 {
-  padding: 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .el-dialog__title2 {
-  line-height: 24px;
-  font-size: 20px;
-  color: #303133;
-}
-
-.crud-opts2 .role-span {
-  padding: 10px 0px 10px 0px;
-}
-
-.crud-opts2 .crud-opts-form {
-  padding: 10px 0px 0px 20px;
-}
-
-.input-with-select {
-  background-color: #fff;
-}
-</style>
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue
index a39f99c8..938ec154 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue
@@ -13,6 +13,14 @@
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
+      <el-form-item label="所属仓库" prop="stor_name">
+        <label slot="label">所属仓库:</label>
+        <el-input v-model="form.stor_name" disabled  clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="入库点" prop="point_code">
+        <label slot="label">入库点:</label>
+        <el-input v-model="form.point_code" disabled  clearable style="width: 210px" />
+      </el-form-item>
       <el-form-item label="生产车间">
         <el-select
           v-model="form.product_area"
@@ -96,7 +104,6 @@
     <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
       <!--表格渲染-->
       <el-table
-        ref="table"
         :data="tableDtl"
         style="width: 100%;"
         max-height="300"
@@ -106,14 +113,15 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column prop="base_bill_code" label="订单号" width="150" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
-        <el-table-column prop="pcsn" label="订单号" width="150" align="center" />
+        <el-table-column prop="pcsn" label="批次" width="150" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
-        <el-table-column prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column prop="base_unit_name" label="单位" align="center" />
+        <el-table-column prop="unit_weight" label="单重" align="center" />
         <el-table-column prop="storagevehicle_code" label="载具号" align="center" />
-        <el-table-column prop="point_code" label="入库点" align="center" />
         <el-table-column prop="struct_code" label="分配货位" align="center" />
         <el-table-column prop="task_id" label="任务号" align="center" />
         <el-table-column prop="work_status" label="任务状态" align="center" />
@@ -174,7 +182,6 @@ export default {
       this.currentDis = {}
       this.currentdtl = null
       this.tableDtl = []
-      this.tabledis = []
       this.$emit('TaskChanged')
     },
     stateFormat(row, column) {
@@ -213,16 +220,6 @@ export default {
       crudsemiproductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.tableDtl = res
       })
-    },
-    queryTableDdis() {
-      if (this.currentdtl !== null) {
-        crudsemiproductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
-          debugger
-          this.tabledis = res
-        }).catch(() => {
-          this.tabledis = []
-        })
-      }
     }
   }
 }
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
index b31cba94..e1e9c3a0 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
@@ -134,10 +134,10 @@
           slot="right"
           class="filter-item"
           type="success"
-          :disabled="dis_flag"
+          :disabled="confirm_flag"
           icon="el-icon-position"
           size="mini"
-          @click="divOpen"
+          @click="confirmTask"
         >
           下发执行
         </el-button>
@@ -147,7 +147,7 @@
           type="warning"
           icon="el-icon-check"
           size="mini"
-          :disabled="confirm_flag"
+          :disabled= dis_flag
           @click="confirm"
         >
           强制确认
@@ -174,23 +174,20 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
         <el-table-column prop="product_area" label="生产车间" width="130" show-overflow-tooltip />
+        <el-table-column prop="stor_name" label="仓库" width="130" show-overflow-tooltip />
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
-        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
-        <el-table-column label="明细数" align="center" prop="detail_count" />
-        <el-table-column label="总重量" align="center" prop="total_qty">
-          <template slot-scope="scope">
-            {{ fun(scope.row.total_qty) }}
-          </template>
-        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="base_bill_code" min-width="120" label="关联单据号" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="plan_qty" label="总数量" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="base_unit_name" label="单位" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="point_code" label="入库点" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="struct_code" label="分配货位" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="制单人" align="center" prop="create_name" />
-        <el-table-column label="制单时间" align="center" prop="create_time" width="150" />
+        <el-table-column label="创建人" align="center" prop="create_name" />
+        <el-table-column label="创建时间" align="center" prop="create_time" width="150" />
         <el-table-column label="修改人" align="center" prop="update_name" />
         <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
-        <el-table-column label="分配人" align="center" prop="dis_name" width="140px" />
-        <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
-        <el-table-column label="确认人" align="center" prop="confirm_name" width="150" />
-        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -224,7 +221,7 @@ import { mapGetters } from 'vuex'
 
 export default {
   name: 'semiproductIn',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog },
+  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
     return CRUD({
       title: '',
@@ -295,16 +292,16 @@ export default {
     buttonChange(currentRow) {
       if (currentRow !== null) {
         this.currentRow = currentRow
-        if (currentRow.bill_status === '10' || currentRow.bill_status === '20' || currentRow.bill_status === '30') {
-          this.dis_flag = false
-        } else {
-          this.dis_flag = true
-        }
-        if (currentRow.bill_status === '1') {
+        if (currentRow.bill_status === '10' || currentRow.bill_status === '20' ) {
           this.confirm_flag = false
         } else {
           this.confirm_flag = true
         }
+        if (currentRow.bill_status !== '99') {
+          this.dis_flag = false
+        } else {
+          this.dis_flag = true
+        }
       }
     },
     handleCurrentChange(currentRow) {
@@ -321,6 +318,10 @@ export default {
       this.mstrow = row
       this.viewShow = true
     },
+    toEdtl(row) {
+      this.editShow = true
+      this.mstrow = row
+    },
     confirm() {
       if (!this.currentRow) {
         this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
@@ -328,21 +329,20 @@ export default {
       }
       crudsemiproductIn.confirm(this.currentRow).then(res => {
         this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
+      })
+    },
+    confirmTask() {
+      if (!this.currentRow) {
+        this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudsemiproductIn.confirmTask(this.currentRow).then(res => {
+        this.crud.notify('单据下发任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
       })
     },
     stateFormat(row, column) {
       return this.dict.label.IO_BILL_STATUS[row.bill_status]
     },
-    divOpen() {
-      crudsemiproductIn.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
-        this.openParam = res
-        debugger
-        this.storId = this.currentRow.product_code
-        this.billType = this.currentRow.bill_type
-        this.divShow = true
-      })
-    },
     querytable() {
       this.onSelectAll()
       this.crud.toQuery()