From 1211a2d256ac3bd9954b9bf1517d172118bee4a1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 18 Jul 2024 11:19:55 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=99=BB=E8=AE=B0?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/req/inout/FilterOrderRequest.java    |  5 +++++
 .../resources/mybatis/mapper/inout/IoOrderDao.xml     | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index a4c7659ca..83001d69f 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -216,4 +216,9 @@ public class FilterOrderRequest extends ListPageRequest {
     private String sickerAdNum;
 
     private List<String> sickerAdNums;
+
+    /**
+     * 1：已登记，2：未登记
+     */
+    private Integer invoiceRegStatus;
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 2319bd2c0..8bd5a864a 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -550,7 +550,7 @@
         </where>
     </select>
 
-
+    <!--  LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk-->
     <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
         SELECT io.*,
                bus.NAME AS billTypeName,
@@ -562,7 +562,7 @@
                      LEFT JOIN auth_dept ad ON io.deptCode = ad.CODE
                      LEFT JOIN auth_warehouse aw ON io.invCode = aw.CODE
                      LEFT JOIN basic_corp bc ON io.fromCorp = bc.erpId
-                     LEFT JOIN io_order_detail_code dc ON io.billNo = dc.orderIdFk
+                     left join io_order_invoice on io_order_invoice.orderIdFk = io.billNo
         <where>
             <if test="confirmStatus != null and confirmStatus != ''">
                 AND io.checkStatus = #{confirmStatus}
@@ -605,6 +605,13 @@
             <if test="inCodeStatus != null">
                 AND io.inCodeStatus = #{inCodeStatus}
             </if>
+            <if test="invoiceRegStatus != null  and invoiceRegStatus == 1">
+                AND io_order_invoice.id IS NULL
+            </if>
+            <if test="invoiceRegStatus != null  and invoiceRegStatus == 2">
+                AND io_order_invoice.id IS not NULL
+            </if>
+
             <if test="relKey != null">
                 AND io.relKey like concat('%', #{relKey}, '%')
             </if>

From c0bcbe75fc0aed1b07c151d141d0e451a43a6aab Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 19 Jul 2024 14:02:42 +0800
Subject: [PATCH 2/6] =?UTF-8?q?PDA=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/auth/LoginController.java  | 14 +++++++++-----
 .../api/controller/inout/IoCodeTempController.java |  7 +++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java
index 6cc237751..0c173906c 100644
--- a/src/main/java/com/glxp/api/controller/auth/LoginController.java
+++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java
@@ -161,12 +161,16 @@ public class LoginController extends BaseController {
         if (authAdmin == null) {
             throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
         }
-        if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.sha256(authAdmin.getPassWord()))) {
-            throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
+        if (PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord()))
+                || loginRequest.getPassword().equals(authAdmin.getPassWord())
+                || (loginRequest.getPassword().equals(PasswordUtils.authAdminPwd(authAdmin.getPassWord())))
+        ) {
+
+        } else {
+            if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.sha256(authAdmin.getPassWord()))) {
+                throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
+            }
         }
-//        if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
-//            throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
-//        }
         if (authAdmin.getUserFlag() == 0) {
             throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！");
         }
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 873a41289..61405a3b1 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -409,7 +409,7 @@ public class IoCodeTempController extends BaseController {
 //        }
             if (bussinessTypeEntity != null && udiInfoEntity != null) {
                 //是否校验耗材材质  1：高值耗材；2.普通耗材
-                if (IntUtil.value(bussinessTypeEntity.getVailHcType() )== 1) {
+                if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) {
                 }
                 if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
                     return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
@@ -421,11 +421,11 @@ public class IoCodeTempController extends BaseController {
             }
 
             //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
-            if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 1)){
+            if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 1)) {
                 if (IntUtil.value(udiInfoEntity.getRequireScanCode()) != 1) {
                     return ResultVOUtils.error(500, "单据只允许录入需要扫码产品" + ",请检查后重试！");
                 }
-            }else if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 2)) {
+            } else if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 2)) {
                 if (IntUtil.value(udiInfoEntity.getRequireScanCode()) != 0) {
                     return ResultVOUtils.error(500, "单据只允许录入不需要扫码产品" + ",请检查后重试！");
                 }
@@ -433,7 +433,6 @@ public class IoCodeTempController extends BaseController {
         }
 
 
-
         String orderId = addOrderRequest.getBillNo();
 
         //三期校验

From 4ad90672fa5f20c548c27ef9b106ed97c05ab16d Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 22 Jul 2024 09:04:13 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=B9=B3=E6=BD=AD=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thrsys/impl/ThrInvOrderServiceImpl.java   |  58 +++++++---
 .../com/glxp/api/task/SyncThirdSysTask.java   | 109 +++++++++---------
 2 files changed, 102 insertions(+), 65 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
index 7dc4c7cf9..c45c97a65 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
@@ -46,6 +46,7 @@ import com.glxp.api.service.inout.IoAddInoutService;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
+import com.glxp.api.service.inv.impl.InvProductService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.service.thrsys.ThrInvOrderService;
 import com.glxp.api.service.thrsys.ThrSystemBusApiService;
@@ -61,6 +62,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -703,9 +705,10 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
 
                             //校验产品是否被供应商关联
                             CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId);
-                            if (udiRlSupEntity != null)
+                            if (udiRlSupEntity != null) {
+                                item.setPrice(udiRlSupEntity.getPrice());
                                 item.setSupId(udiRlSupEntity.getCustomerId());
-                            else
+                            } else
                                 exmsg.append(thrCode + "供应商未关联");
                         } else {
                             exmsg.append(thrCode + ",");
@@ -870,7 +873,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                     AtomicInteger fullGen = new AtomicInteger();
                     thrInvOrderDetails.forEach(item -> {
                         Long relId = item.getRelId();
-                        if (ObjectUtil.isNull(relId)) {
+                            if (ObjectUtil.isNull(relId)) {
                             String thrCode = item.getThrCode();
                             Integer count = Integer.valueOf(item.getReCount());
                             List<BasicSkProjectDetailEntity> skProjectDetailEntityList = basicDestinyRelService.filterDestinyRelListByPId(thrCode);
@@ -995,7 +998,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
             ioOrderEntity.setCorpOrderId(UUID.randomUUID() + "");//单据号
             ioOrderEntity.setThrOrderIdFk(thrInvOrder.getBillNo());//单据号
             ioOrderEntity.setUpdateTime(new Date());
-            ioOrderEntity.setCreateTime(new Date());
+            if (thrInvOrder.getStartDate() != null) {
+                ioOrderEntity.setCreateTime(new Date());
+            }
             ioOrderEntity.setCustomerId("110");
             Long userId = 1l;
 //            try {
@@ -1009,7 +1014,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
             List<IoOrderDetailBizEntity> newOrderDetailBiz = new ArrayList<>();
             if (entry.getValue().size() > 0) {
                 if (!copyOrderDetailBiz(entry.getValue(), newOrderDetailBiz, newBillNo)) {
-                  continue;
+                    continue;
                 }
             }
             String toBillNo = (thrInvOrder.getToBillNo() == null ? "" : thrInvOrder.getToBillNo()) + ("," + newBillNo);
@@ -1110,11 +1115,14 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                                 item.setRelId(relId);
                                 item.setHandleStatus(1);
                                 item.setToBillNo(newBillNo);
+
                                 updateThrInvOrderDetails.add(item);
                                 //校验产品是否被供应商关联
                                 CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId);
-                                if (udiRlSupEntity != null)
+                                if (udiRlSupEntity != null) {
                                     item.setSupId(udiRlSupEntity.getCustomerId());
+                                }
+
                             } else {
                             }
                         }
@@ -1337,6 +1345,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                     IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
                     parameterPackag(basicProductsEntity, ioOrderDetailBizEntity, thrInvOrderDetail);
                     ioOrderDetailBizEntity.setOrderIdFk(newBillNo);
+                    ioOrderDetailBizEntity.setBatchNo("/");
                     newOrderDetailBiz.add(ioOrderDetailBizEntity);
                 }
             }
@@ -1451,6 +1460,10 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
 
     }
 
+
+    @Resource
+    InvProductService invProductService;
+
     /**
      * 将三方的出入库明细列表 转换为 系统的出入库单据明细
      *
@@ -1487,15 +1500,31 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                 thrInvOrderDetail.setRelId(relId);
                 thrInvOrderDetail.setThrCode(thrCode);
                 thrInvOrderDetail.setReCount(String.valueOf(count));
-                thrInvOrderDetails.add(thrInvOrderDetail);
                 if (ObjectUtil.isNull(relId)) {
                     exmsg.append(thrCode + ",");
                 }
                 //校验产品是否被供应商关联
-                CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(relId);
-                if (udiRlSupEntity != null)
-                    thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId());
-                else
+                List<UdiRlSupEntity> udiRlSupEntitys = udiRlSupService.findByUdiRlId(relId);
+                if (CollUtil.isNotEmpty(udiRlSupEntitys)) {
+                    for (UdiRlSupEntity udiRlSupEntity : udiRlSupEntitys) {
+                        Integer count1 = invProductService.selectExitCount("1000000", Long.parseLong(udiRlSupEntity.getCustomerId()), Long.parseLong(udiRlSupEntity.getUdiRlIdFk()));
+                        if (IntUtil.value(count1 > 0)) {
+                            thrInvOrderDetail.setSupId(udiRlSupEntity.getCustomerId());
+                            if (udiRlSupEntity.getPrice() == null)
+                                thrInvOrderDetail.setPrice(BigDecimal.ZERO);
+                            else
+                                thrInvOrderDetail.setPrice(udiRlSupEntity.getPrice());
+                        }
+                    }
+                    if (thrInvOrderDetail.getSupId() == null) {
+                        thrInvOrderDetail.setSupId(udiRlSupEntitys.get(0).getCustomerId());
+                        if (udiRlSupEntitys.get(0).getPrice() == null)
+                            thrInvOrderDetail.setPrice(BigDecimal.ZERO);
+                        else
+                            thrInvOrderDetail.setPrice(udiRlSupEntitys.get(0).getPrice());
+                    }
+
+                } else
                     exmsg.append(thrCode + "供应商未关联");
 
 
@@ -1518,7 +1547,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
 
         } else {//走项目组套
 
-
             thrInvOrder.setSkProject(1);
             StringBuilder exmsg = new StringBuilder("");
             list.forEach(item -> {
@@ -1537,7 +1565,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
 
                     Integer finalCount = count;
                     if (IntUtil.value(cpMutiFilter) > 0 && IntUtil.value(finalCount) > 1) {
-                        log.error(item.getCpmctymc() + "," + item.getThrCode() + "项目关联多个耗材对照，已杯过滤！");
+                        log.error(item.getCpmctymc() + "," + item.getThrCode() + "项目关联多个耗材对照，已被过滤！");
                     } else {
                         skProjectDetailEntityList.forEach(sk -> {
 
@@ -1546,6 +1574,10 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                             thrInvOrderDetail.setOrderIdFk(billNo);
                             thrInvOrderDetail.setRelId(sk.getRelId());
                             thrInvOrderDetail.setSupId(sk.getSupId() + "");
+                            UdiRlSupEntity udiRlSupEntity = udiRlSupService.findByUdiRlIdUnitFk(thrInvOrderDetail.getRelId() + "", thrInvOrderDetail.getSupId());
+                            if (udiRlSupEntity != null && udiRlSupEntity.getPrice() != null) {
+                                thrInvOrderDetail.setPrice(udiRlSupEntity.getPrice());
+                            }
                             Integer skCount = sk.getCount();
                             if (skCount != null && skCount > 0) {
                                 thrInvOrderDetail.setReCount(String.valueOf(skCount * finalCount));
diff --git a/src/main/java/com/glxp/api/task/SyncThirdSysTask.java b/src/main/java/com/glxp/api/task/SyncThirdSysTask.java
index 23eb5bc27..62f654516 100644
--- a/src/main/java/com/glxp/api/task/SyncThirdSysTask.java
+++ b/src/main/java/com/glxp/api/task/SyncThirdSysTask.java
@@ -110,59 +110,64 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
         List<ThrSystemDetailEntity> list = thrSystemDetailDao.selectAutoExecuteList();
         if (CollUtil.isNotEmpty(list)) {
             log.info("本次查询到的接口列表数量：{}", list.size());
-            list.parallelStream().forEach(thrSystemDetailEntity -> {
-                switch (thrSystemDetailEntity.getKey()) {
-                    case ThirdSysConstant.WAREHOUSE_QUERY_URL:
-                        //下载第三方仓库信息
-                        downloadThrInv(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.CORP_URL:
-                        //下载往来单位信息
-                        downloadThrCorp(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.PI_QUERY_URL:
-                        //下载第三方产品信息
-                        downloadThrPi(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.BUS_TYPE_QUERY_URL:
-                        //下载第三方单据类型
-                        downloadThrBusType(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.ORDER_SUBMIT_URL:
-                        //提交单据
-                        submitOrder(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.ORDER_QUERY_URL:
-                        downloadThrOrder(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.PI_SUBMIT_URL:
-                        //提交产品信息
-                        postRelProduct(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.SICKER_QUERY_URL:
-                        //下载患者信息
-                        downloadSicker(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.INV_SF_ORDER_QUERY_URL:
-                        //下载出入库明细收费
-                        downloadInvSfOrder(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.INV_PH_ORDER_QUERY_URL:
-                        //下载出入库明细普耗
-                        downloadInvPhOrder(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.INV_GH_ORDER_QUERY_URL:
-                        //下载出入库明细高耗
-                        downloadInvGhOrder(thrSystemDetailEntity);
-                        break;
-                    case ThirdSysConstant.SF_PROJECT_DICT_URL:
-                        //下载收费项目字典
-                        downloadSfProject(thrSystemDetailEntity);
-                        break;
-                    default:
-                        //其他接口暂不处理
-                        break;
+            list.forEach(thrSystemDetailEntity -> {
+                try {
+                    switch (thrSystemDetailEntity.getKey()) {
+                        case ThirdSysConstant.WAREHOUSE_QUERY_URL:
+                            //下载第三方仓库信息
+                            downloadThrInv(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.CORP_URL:
+                            //下载往来单位信息
+                            downloadThrCorp(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.PI_QUERY_URL:
+                            //下载第三方产品信息
+                            downloadThrPi(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.BUS_TYPE_QUERY_URL:
+                            //下载第三方单据类型
+                            downloadThrBusType(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.ORDER_SUBMIT_URL:
+                            //提交单据
+                            submitOrder(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.ORDER_QUERY_URL:
+                            downloadThrOrder(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.PI_SUBMIT_URL:
+                            //提交产品信息
+                            postRelProduct(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.SICKER_QUERY_URL:
+                            //下载患者信息
+                            downloadSicker(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.INV_SF_ORDER_QUERY_URL:
+                            //下载出入库明细收费
+                            downloadInvSfOrder(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.INV_PH_ORDER_QUERY_URL:
+                            //下载出入库明细普耗
+                            downloadInvPhOrder(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.INV_GH_ORDER_QUERY_URL:
+                            //下载出入库明细高耗
+                            downloadInvGhOrder(thrSystemDetailEntity);
+                            break;
+                        case ThirdSysConstant.SF_PROJECT_DICT_URL:
+                            //下载收费项目字典
+                            downloadSfProject(thrSystemDetailEntity);
+                            break;
+                        default:
+                            //其他接口暂不处理
+                            break;
+                    }
+                } catch (Exception e) {
+                    log.error("执行第三方接口异常：{}", ExceptionUtils.getStackTrace(e));
                 }
+
             });
         } else {
             log.info("未配置自动执行的第三方接口列表");

From 7fd4b216aaaf5e6a6f8a99db041b41dae83e6628 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 22 Jul 2024 14:48:43 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9=E6=98=8E=E7=BB=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/IoOrderController.java   |  1 +
 .../api/dao/thrsys/ThrInvOrderMapper.java     |  6 ++
 .../api/entity/inv/InvRemindSetEntity.java    |  2 +-
 .../thrsys/impl/ThrInvOrderServiceImpl.java   | 55 +++++++++----------
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 8a8623252..b76ed4d9d 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -763,6 +763,7 @@ public class IoOrderController extends BaseController {
     }
 
 
+
     //单据编辑，条码减一
     @AuthRuleAnnotation("")
     @PostMapping("udiwms/inout/code/finish/delete")
diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
index 8f60dcf0d..b37adfbe2 100644
--- a/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
+++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
@@ -6,11 +6,17 @@ import com.glxp.api.entity.thrsys.ThrInvOrderDetail;
 import com.glxp.api.req.thrsys.FilterThrInvOrderRequest;
 import com.glxp.api.res.thrsys.ThrInvOrderResponse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
 public interface ThrInvOrderMapper extends BaseMapperPlus<ThrInvOrderMapper, ThrInvOrder, ThrInvOrder> {
 
     List<ThrInvOrderResponse> filterThrInvOrder(FilterThrInvOrderRequest filterThrInvOrderRequest);
+
+    @Select("SELECT COUNT(*) FROM thr_inv_order WHERE startDate <= #{startDate} AND endDate >= #{endDate}")
+    int countDownloadsInRange(Date startDate, Date endDate);
+
 }
diff --git a/src/main/java/com/glxp/api/entity/inv/InvRemindSetEntity.java b/src/main/java/com/glxp/api/entity/inv/InvRemindSetEntity.java
index 0db5ea558..2044bc2a8 100644
--- a/src/main/java/com/glxp/api/entity/inv/InvRemindSetEntity.java
+++ b/src/main/java/com/glxp/api/entity/inv/InvRemindSetEntity.java
@@ -111,4 +111,4 @@ public class InvRemindSetEntity {
                 ", 备注：='" + remark + '\'' +
                 '}';
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
index c45c97a65..4d2327517 100644
--- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
@@ -338,8 +338,13 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
 
         filterInvProductRequest.setStartDate(stringToDate(days + " 00:00:00"));
         filterInvProductRequest.setEndDate(stringToDate(days + " 23:59:59"));
-        handleExternalThrInvSfOrder(filterInvProductRequest);
-        log.info("自动抓取第三方收费出入库明细生成单据定时任务结束");
+        if (thrInvOrderMapper.countDownloadsInRange(filterInvProductRequest.getStartDate(), filterInvProductRequest.getEndDate()) <= 0) {
+            handleExternalThrInvSfOrder(filterInvProductRequest);
+            log.info("自动抓取第三方收费出入库明细生成单据定时任务结束");
+        } else {
+            log.info("已下载户略");
+        }
+
 
     }
 
@@ -844,22 +849,12 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
         if (CollUtil.isNotEmpty(thrInvOrders)) {
 
             for (ThrInvOrder thrInvOrder : thrInvOrders) {
-                /**
-                 * 1、根据 外检单号 进行 分组
-                 * 2、遍历不同分组 在分组的列表再次进行匹配
-                 * 3、匹配到的列表 不为空  进行 新增关联的单据  插入明细操作
-                 * 4、需要 回写三方的明细表 标记已处理
-                 */
                 List<ThrInvOrderDetail> thrInvOrderDetails = thrInvOrderDetailMapper.selectList(
                         new LambdaQueryWrapper<ThrInvOrderDetail>()
                                 .and(o -> o.isNull(ThrInvOrderDetail::getHandleStatus).or().ne(ThrInvOrderDetail::getHandleStatus, 1)).
                                 eq(ThrInvOrderDetail::getOrderIdFk, thrInvOrder.getBillNo())
                 );
                 if (CollectionUtil.isEmpty(thrInvOrderDetails)) continue;
-                log.info("扫描处理第三方收费明细生成单据定时任务==orderIdFk==:[" + thrInvOrder.getBillNo() + "]");
-                //新单号
-
-
                 //通过单号获取单据信息
                 QueryWrapper<ThrInvOrder> qw = new QueryWrapper<>();
                 qw.eq("billNo", thrInvOrder.getBillNo());
@@ -873,7 +868,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                     AtomicInteger fullGen = new AtomicInteger();
                     thrInvOrderDetails.forEach(item -> {
                         Long relId = item.getRelId();
-                            if (ObjectUtil.isNull(relId)) {
+                        if (ObjectUtil.isNull(relId)) {
                             String thrCode = item.getThrCode();
                             Integer count = Integer.valueOf(item.getReCount());
                             List<BasicSkProjectDetailEntity> skProjectDetailEntityList = basicDestinyRelService.filterDestinyRelListByPId(thrCode);
@@ -898,6 +893,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                                 });
                                 fullGen.getAndIncrement();
                             }
+                        } else {
+                            updateThrInvOrderDetails.add(item);
                         }
                     });
                     if (thrInvOrderDetails.size() == fullGen.intValue()) {
@@ -947,23 +944,24 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                 //新增明细
                 if (CollectionUtil.isNotEmpty(addThrInvOrderDetails)) {
                     thrInvOrderDetailMapper.insertBatch(addThrInvOrderDetails);
+                    genOrder(thrInvOrder, bussinessTypeEntity, addThrInvOrderDetails);
                 }
                 //更新明细
                 if (CollectionUtil.isNotEmpty(updateThrInvOrderDetails)) {
                     thrInvOrderDetailMapper.updateBatchById(updateThrInvOrderDetails);
+                    genOrder(thrInvOrder, bussinessTypeEntity, updateThrInvOrderDetails);
                 }
-                genOrder(thrInvOrder, bussinessTypeEntity);
-                log.info("扫描处理第三方收费明细生成单据定时任务结束");
+
             }
 
         }
     }
 
     public boolean genOrder(
-            ThrInvOrder thrInvOrder, BasicBussinessTypeEntity bussinessTypeEntity) {
-        QueryWrapper<ThrInvOrderDetail> qwd = new QueryWrapper<>();
-        qwd.eq("orderIdFk", thrInvOrder.getBillNo());
-        List<ThrInvOrderDetail> thrInvOrderDetails = thrInvOrderDetailMapper.selectList(qwd);
+            ThrInvOrder thrInvOrder, BasicBussinessTypeEntity bussinessTypeEntity, List<ThrInvOrderDetail> thrInvOrderDetails) {
+//        QueryWrapper<ThrInvOrderDetail> qwd = new QueryWrapper<>();
+//        qwd.eq("orderIdFk", thrInvOrder.getBillNo());
+//        List<ThrInvOrderDetail> thrInvOrderDetails = thrInvOrderDetailMapper.selectList(qwd);
         if (CollectionUtil.isEmpty(thrInvOrderDetails))
             return false;
 
@@ -1008,8 +1006,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
 //            } catch (Exception e) {
 //                e.printStackTrace();
 //            }
-            ioOrderEntity.setCreateUser(userId + "");
             ioOrderEntity.setUpdateUser(userId + "");
+            ioOrderEntity.setCreateUser(userId + "");
             ioOrderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);//正常单据处理
             List<IoOrderDetailBizEntity> newOrderDetailBiz = new ArrayList<>();
             if (entry.getValue().size() > 0) {
@@ -1023,6 +1021,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                 // 使用substring()去掉第一个字符
                 toBillNo = toBillNo.substring(1);
             }
+            thrInvOrderDetailMapper.updateBatchById(thrInvOrderDetails);
             thrInvOrder.setToBillNo(toBillNo);
             thrInvOrderMapper.updateById(thrInvOrder);
             ioOrderService.insertOrder(ioOrderEntity);
@@ -1122,7 +1121,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                                 if (udiRlSupEntity != null) {
                                     item.setSupId(udiRlSupEntity.getCustomerId());
                                 }
-
                             } else {
                             }
                         }
@@ -1191,6 +1189,11 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                 thrInvOrder.setToBillNo(toBillNo);
 
                 thrInvOrderMapper.updateById(thrInvOrder);
+                thrInvOrderDetails.forEach(item -> {
+                            item.setToBillNo(newBillNo);
+                        }
+                );
+                thrInvOrderDetailMapper.updateBatchById(thrInvOrderDetails);
                 ioOrderService.insertOrder(ioOrderEntity);
                 ioOrderDetailBizService.batchInsertBizs(newOrderDetailBiz);
                 //自动处理业务单据
@@ -1346,10 +1349,11 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                     parameterPackag(basicProductsEntity, ioOrderDetailBizEntity, thrInvOrderDetail);
                     ioOrderDetailBizEntity.setOrderIdFk(newBillNo);
                     ioOrderDetailBizEntity.setBatchNo("/");
+                    thrInvOrderDetail.setToBillNo(newBillNo);
+                    thrInvOrderDetail.setHandleStatus(1);
                     newOrderDetailBiz.add(ioOrderDetailBizEntity);
                 }
             }
-
         }
         return true;
     }
@@ -1561,14 +1565,11 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                 //通过thrCode获取到项目组套
                 List<BasicSkProjectDetailEntity> skProjectDetailEntityList = basicDestinyRelService.filterDestinyRelListByPId(thrCode);
                 if (CollectionUtil.isNotEmpty(skProjectDetailEntityList) && count > 0) {
-
-
                     Integer finalCount = count;
-                    if (IntUtil.value(cpMutiFilter) > 0 && IntUtil.value(finalCount) > 1) {
+                    if (IntUtil.value(cpMutiFilter) > 0 && skProjectDetailEntityList.size() > 1) {
                         log.error(item.getCpmctymc() + "," + item.getThrCode() + "项目关联多个耗材对照，已被过滤！");
                     } else {
                         skProjectDetailEntityList.forEach(sk -> {
-
                             ThrInvOrderDetail thrInvOrderDetail = new ThrInvOrderDetail();
                             BeanUtils.copyProperties(item, thrInvOrderDetail);
                             thrInvOrderDetail.setOrderIdFk(billNo);
@@ -1582,7 +1583,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                             if (skCount != null && skCount > 0) {
                                 thrInvOrderDetail.setReCount(String.valueOf(skCount * finalCount));
                             }
-
                             //过滤是否高值
                             if (IntUtil.value(highFilter) > 0) {
                                 UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(sk.getRelId());
@@ -1592,7 +1592,6 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                             } else {
                                 thrInvOrderDetails.add(thrInvOrderDetail);
                             }
-
                         });
                     }
 

From a74e1f010921e90be331f52a9dd50db66c9ef64f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 24 Jul 2024 15:32:21 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 087dbec16..a2ecc2dc9 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

From 878f571a3b4c67960f953617bf562514fa8bf597 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 27 Jul 2024 15:34:29 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=BB=E4=BF=9D?=
 =?UTF-8?q?=E6=8B=86=E9=9B=B6=EF=BC=8C=E5=8C=BB=E4=BF=9D=E6=94=B6=E8=B4=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E4=B8=AD=E8=A5=BF=E8=8D=AF=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=AD=E8=8D=AF=E9=A5=AE=E5=93=81=EF=BC=8C=E5=8C=BB=E7=94=A8?=
 =?UTF-8?q?=E8=80=97=E6=9D=90=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inout/IoOrderController.java   |   1 -
 .../controller/inout/IoSplitController.java   |  25 +
 .../thrsys/ThrInsFeeController.java           | 102 +++
 .../dao/inout/IoSplitCodeDetailMapper.java    |   9 +
 .../glxp/api/dao/inout/IoSplitCodeMapper.java |   9 +
 .../api/dao/thrsys/BasicInsChdrugMapper.java  |  14 +
 .../api/dao/thrsys/BasicInsDrugMapper.java    |  15 +
 .../dao/thrsys/BasicInsMaterialMapper.java    |  14 +
 .../api/entity/basic/UdiRelevanceEntity.java  |   8 +-
 .../glxp/api/entity/inout/IoOrderEntity.java  |   5 +
 .../entity/inout/IoSplitCodeDetailEntity.java | 102 +++
 .../api/entity/inout/IoSplitCodeEntity.java   | 193 +++++
 .../entity/thrsys/BasicInsChdrugEntity.java   | 256 +++++++
 .../api/entity/thrsys/BasicInsDrugEntity.java | 704 ++++++++++++++++++
 .../entity/thrsys/BasicInsMaterialEntity.java | 522 +++++++++++++
 .../req/thrsys/ThrInsChDrugFeeRequest.java    |  22 +
 .../api/req/thrsys/ThrInsDrugFeeRequest.java  |  33 +
 .../req/thrsys/ThrInsMaterialFeeRequest.java  |  22 +
 .../glxp/api/res/inout/IoOrderResponse.java   |   4 +
 .../basic/BasicSkPrescribeService.java        |  12 +
 .../service/basic/BasicSkProjectService.java  |   2 +-
 .../service/inout/IoCheckInoutService.java    |  20 +-
 .../inout/IoSplitCodeDetailService.java       |  10 +
 .../api/service/inout/IoSplitCodeService.java |  10 +
 .../service/thrsys/BasicInsChdrugService.java |  27 +
 .../service/thrsys/BasicInsDrugService.java   |  28 +
 .../thrsys/BasicInsMaterialService.java       |  28 +
 src/main/resources/application-dev.yml        |   2 +-
 .../mapper/inout/IoSplitCodeDetailMapper.xml  |  25 +
 .../mapper/inout/IoSplitCodeMapper.xml        |  39 +
 .../mapper/thrsys/BasicInsChdrugMapper.xml    |  17 +
 .../mapper/thrsys/BasicInsDrugMapper.xml      |  23 +
 .../mapper/thrsys/BasicInsMaterialMapper.xml  |  17 +
 src/main/resources/schemas/schema_v2.4.sql    | 691 ++++++++++-------
 34 files changed, 2746 insertions(+), 265 deletions(-)
 create mode 100644 src/main/java/com/glxp/api/controller/inout/IoSplitController.java
 create mode 100644 src/main/java/com/glxp/api/controller/thrsys/ThrInsFeeController.java
 create mode 100644 src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java
 create mode 100644 src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java
 create mode 100644 src/main/java/com/glxp/api/dao/thrsys/BasicInsChdrugMapper.java
 create mode 100644 src/main/java/com/glxp/api/dao/thrsys/BasicInsDrugMapper.java
 create mode 100644 src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java
 create mode 100644 src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java
 create mode 100644 src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
 create mode 100644 src/main/java/com/glxp/api/entity/thrsys/BasicInsChdrugEntity.java
 create mode 100644 src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java
 create mode 100644 src/main/java/com/glxp/api/entity/thrsys/BasicInsMaterialEntity.java
 create mode 100644 src/main/java/com/glxp/api/req/thrsys/ThrInsChDrugFeeRequest.java
 create mode 100644 src/main/java/com/glxp/api/req/thrsys/ThrInsDrugFeeRequest.java
 create mode 100644 src/main/java/com/glxp/api/req/thrsys/ThrInsMaterialFeeRequest.java
 create mode 100644 src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java
 create mode 100644 src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
 create mode 100644 src/main/java/com/glxp/api/service/thrsys/BasicInsChdrugService.java
 create mode 100644 src/main/java/com/glxp/api/service/thrsys/BasicInsDrugService.java
 create mode 100644 src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java
 create mode 100644 src/main/resources/mybatis/mapper/inout/IoSplitCodeDetailMapper.xml
 create mode 100644 src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
 create mode 100644 src/main/resources/mybatis/mapper/thrsys/BasicInsChdrugMapper.xml
 create mode 100644 src/main/resources/mybatis/mapper/thrsys/BasicInsDrugMapper.xml
 create mode 100644 src/main/resources/mybatis/mapper/thrsys/BasicInsMaterialMapper.xml

diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index b76ed4d9d..8a8623252 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -763,7 +763,6 @@ public class IoOrderController extends BaseController {
     }
 
 
-
     //单据编辑，条码减一
     @AuthRuleAnnotation("")
     @PostMapping("udiwms/inout/code/finish/delete")
diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java
new file mode 100644
index 000000000..8ebbecb82
--- /dev/null
+++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java
@@ -0,0 +1,25 @@
+package com.glxp.api.controller.inout;
+
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.service.inout.IoSplitCodeDetailService;
+import com.glxp.api.service.inout.IoSplitCodeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+public class IoSplitController extends BaseController {
+
+
+    @Resource
+    IoSplitCodeService splitCodeService;
+    @Resource
+    IoSplitCodeDetailService splitCodeDetailService;
+
+
+
+
+
+}
diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInsFeeController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInsFeeController.java
new file mode 100644
index 000000000..19d381f48
--- /dev/null
+++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInsFeeController.java
@@ -0,0 +1,102 @@
+package com.glxp.api.controller.thrsys;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.thrsys.BasicInsChdrugEntity;
+import com.glxp.api.entity.thrsys.BasicInsDrugEntity;
+import com.glxp.api.entity.thrsys.BasicInsMaterialEntity;
+import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest;
+import com.glxp.api.req.thrsys.ThrInsDrugFeeRequest;
+import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.thrsys.BasicInsChdrugService;
+import com.glxp.api.service.thrsys.BasicInsDrugService;
+import com.glxp.api.service.thrsys.BasicInsMaterialService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 医保收费
+ */
+@Slf4j
+@RestController
+public class ThrInsFeeController {
+
+
+    @Resource
+    BasicInsChdrugService basicInsChdrugService;
+    @Resource
+    BasicInsDrugService basicInsDrugService;
+    @Resource
+    BasicInsMaterialService basicInsMaterialService;
+
+    /**
+     * 中西药医保收费项目
+     *
+     * @param thrInsChDrugFeeRequest
+     * @param bindingResult
+     * @return
+     */
+    @GetMapping("/udiwms/thrInsFee/drug/filter")
+    public BaseResponse filterDrug(ThrInsChDrugFeeRequest thrInsChDrugFeeRequest,
+                                   BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicInsChdrugEntity> basicInsChdrugEntities = basicInsChdrugService.filterList(thrInsChDrugFeeRequest);
+        PageInfo<BasicInsChdrugEntity> pageInfo = new PageInfo<>(basicInsChdrugEntities);
+        PageSimpleResponse<BasicInsChdrugEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicInsChdrugEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    /**
+     * 医保中药饮品收费项目
+     * @param thrInsDrugFeeRequest
+     * @param bindingResult
+     * @return
+     */
+    @GetMapping("/udiwms/thrInsFee/chDrug/filter")
+    public BaseResponse filterChDrug(ThrInsDrugFeeRequest thrInsDrugFeeRequest,
+                                     BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicInsDrugEntity> basicInsDrugEntities = basicInsDrugService.filterList(thrInsDrugFeeRequest);
+        PageInfo<BasicInsDrugEntity> pageInfo = new PageInfo<>(basicInsDrugEntities);
+        PageSimpleResponse<BasicInsDrugEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicInsDrugEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    /**
+     * 医用耗材医保收费项目
+     * @param thrInsMaterialFeeRequest
+     * @param bindingResult
+     * @return
+     */
+    @GetMapping("/udiwms/thrInsFee/material/filter")
+    public BaseResponse filterMaterial(ThrInsMaterialFeeRequest thrInsMaterialFeeRequest,
+                                       BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicInsMaterialEntity> basicInsMaterialEntities = basicInsMaterialService.filterList(thrInsMaterialFeeRequest);
+        PageInfo<BasicInsMaterialEntity> pageInfo = new PageInfo<>(basicInsMaterialEntities);
+        PageSimpleResponse<BasicInsMaterialEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicInsMaterialEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+}
diff --git a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java
new file mode 100644
index 000000000..15496213d
--- /dev/null
+++ b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeDetailMapper.java
@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoSplitCodeDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoSplitCodeDetailMapper extends BaseMapper<IoSplitCodeDetailEntity> {
+}
diff --git a/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java
new file mode 100644
index 000000000..4dcc3d714
--- /dev/null
+++ b/src/main/java/com/glxp/api/dao/inout/IoSplitCodeMapper.java
@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoSplitCodeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface IoSplitCodeMapper extends BaseMapper<IoSplitCodeEntity> {
+}
diff --git a/src/main/java/com/glxp/api/dao/thrsys/BasicInsChdrugMapper.java b/src/main/java/com/glxp/api/dao/thrsys/BasicInsChdrugMapper.java
new file mode 100644
index 000000000..f7c32044b
--- /dev/null
+++ b/src/main/java/com/glxp/api/dao/thrsys/BasicInsChdrugMapper.java
@@ -0,0 +1,14 @@
+package com.glxp.api.dao.thrsys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.thrsys.BasicInsChdrugEntity;
+import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BasicInsChdrugMapper extends BaseMapper<BasicInsChdrugEntity> {
+
+    List<BasicInsChdrugEntity> filterList(ThrInsChDrugFeeRequest thrInsChDrugFeeRequest);
+}
diff --git a/src/main/java/com/glxp/api/dao/thrsys/BasicInsDrugMapper.java b/src/main/java/com/glxp/api/dao/thrsys/BasicInsDrugMapper.java
new file mode 100644
index 000000000..5b3352fd7
--- /dev/null
+++ b/src/main/java/com/glxp/api/dao/thrsys/BasicInsDrugMapper.java
@@ -0,0 +1,15 @@
+package com.glxp.api.dao.thrsys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.thrsys.BasicInsChdrugEntity;
+import com.glxp.api.entity.thrsys.BasicInsDrugEntity;
+import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest;
+import com.glxp.api.req.thrsys.ThrInsDrugFeeRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BasicInsDrugMapper extends BaseMapper<BasicInsDrugEntity> {
+    List<BasicInsDrugEntity> filterList(ThrInsDrugFeeRequest thrInsDrugFeeRequest);
+}
diff --git a/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java b/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java
new file mode 100644
index 000000000..b29a2eb33
--- /dev/null
+++ b/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java
@@ -0,0 +1,14 @@
+package com.glxp.api.dao.thrsys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.thrsys.BasicInsMaterialEntity;
+import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest;
+import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface BasicInsMaterialMapper extends BaseMapper<BasicInsMaterialEntity> {
+    List<BasicInsMaterialEntity> filterList(ThrInsMaterialFeeRequest thrInsMaterialFeeRequest);
+}
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
index 090765350..b9e7af9c0 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
@@ -207,7 +207,6 @@ public class UdiRelevanceEntity {
     private Boolean newNeedUpload;
 
 
-
     /**
      * 流通计量层层级标识
      */
@@ -244,4 +243,11 @@ public class UdiRelevanceEntity {
     @TableField(value = "useLeverCount")
     private Integer useLeverCount;
 
+
+    /**
+     * 收费项目编码
+     */
+    @TableField(value = "payFeeCode")
+    private String payFeeCode;
+
 }
diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java
index 9b417b8d6..e2130c366 100644
--- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java
+++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java
@@ -318,6 +318,11 @@ public class IoOrderEntity {
      */
     @TableField(value = "purPlanId")
     private String purPlanId;
+    /**
+     * 工位代码
+     */
+    @TableField(value = "workPlaceCode")
+    private String workPlaceCode;
 
 
 }
diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java
new file mode 100644
index 000000000..5fb578b34
--- /dev/null
+++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeDetailEntity.java
@@ -0,0 +1,102 @@
+package com.glxp.api.entity.inout;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 拆零出库明细表
+    */
+@ApiModel(value="com-glxp-api-entity-inout-IoSplitCodeDetail")
+@Data
+@TableName(value = "io_split_code_detail")
+public class IoSplitCodeDetailEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+     * 拆零表ID外键
+     */
+    @TableField(value = "codeIdFk")
+    @ApiModelProperty(value="拆零表ID外键")
+    private Integer codeIdFk;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "udiCodoe")
+    @ApiModelProperty(value="UDI码")
+    private String udiCodoe;
+
+    /**
+     * 患者编码
+     */
+    @TableField(value = "sickerCode")
+    @ApiModelProperty(value="患者编码")
+    private String sickerCode;
+
+    /**
+     * 患者住院号
+     */
+    @TableField(value = "adNum")
+    @ApiModelProperty(value="患者住院号")
+    private String adNum;
+
+    /**
+     * 出库数量
+     */
+    @TableField(value = "`count`")
+    @ApiModelProperty(value="出库数量")
+    private Integer count;
+
+    /**
+     * 处方单号
+     */
+    @TableField(value = "prescribeNum")
+    @ApiModelProperty(value="处方单号")
+    private String prescribeNum;
+
+    /**
+     * 来源类型：1：手动出库；2：处方自动生成
+     */
+    @TableField(value = "createType")
+    @ApiModelProperty(value="来源类型：1：手动出库；2：处方自动生成")
+    private Byte createType;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    @ApiModelProperty(value="创建时间")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    @ApiModelProperty(value="创建人")
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value="更新时间")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value="备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
new file mode 100644
index 000000000..f30e14293
--- /dev/null
+++ b/src/main/java/com/glxp/api/entity/inout/IoSplitCodeEntity.java
@@ -0,0 +1,193 @@
+package com.glxp.api.entity.inout;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 科室出库码拆零表
+    */
+@ApiModel(value="com-glxp-api-entity-inout-IoSplitCode")
+@Data
+@TableName(value = "io_split_code")
+public class IoSplitCodeEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+     * UDI码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="UDI码")
+    private String code;
+
+    /**
+     * 缺少GS1标识UDI码
+     */
+    @TableField(value = "errUdiCode")
+    @ApiModelProperty(value="缺少GS1标识UDI码")
+    private String errUdiCode;
+
+    /**
+     * 所属出库单号
+     */
+    @TableField(value = "orderId")
+    @ApiModelProperty(value="所属出库单号")
+    private String orderId;
+
+    /**
+     * 单据类型
+     */
+    @TableField(value = "`action`")
+    @ApiModelProperty(value="单据类型")
+    private String action;
+
+    /**
+     * 物资字典主键
+     */
+    @TableField(value = "relId")
+    @ApiModelProperty(value="物资字典主键")
+    private Long relId;
+
+    /**
+     * 最小销售产品标识
+     */
+    @TableField(value = "nameCode")
+    @ApiModelProperty(value="最小销售产品标识")
+    private String nameCode;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    @ApiModelProperty(value="批次号")
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "produceDate")
+    @ApiModelProperty(value="生产日期")
+    private String produceDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    @ApiModelProperty(value="失效日期")
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    @TableField(value = "serialNo")
+    @ApiModelProperty(value="序列号")
+    private String serialNo;
+
+    /**
+     * 供应商ID
+     */
+    @TableField(value = "supId")
+    @ApiModelProperty(value="供应商ID")
+    private Long supId;
+
+    /**
+     * 部门编码
+     */
+    @TableField(value = "deptCode")
+    @ApiModelProperty(value="部门编码")
+    private String deptCode;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "invCode")
+    @ApiModelProperty(value="仓库编码")
+    private String invCode;
+
+    /**
+     * 货位编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="货位编码")
+    private String warehouseCode;
+
+    /**
+     * 1:耗材；2：药品
+     */
+    @TableField(value = "productType")
+    @ApiModelProperty(value="1:耗材；2：药品")
+    private Integer productType;
+
+    /**
+     * 1:手动扫码拆包；2.自动拆包
+     */
+    @TableField(value = "splitType")
+    @ApiModelProperty(value="1:手动扫码拆包；2.自动拆包")
+    private Integer splitType;
+
+    /**
+     * 扫码数量
+     */
+    @TableField(value = "scanCount")
+    @ApiModelProperty(value="扫码数量")
+    private Integer scanCount;
+
+    /**
+     * 总数量
+     */
+    @TableField(value = "totalCount")
+    @ApiModelProperty(value="总数量")
+    private Integer totalCount;
+
+    /**
+     * 剩余数量
+     */
+    @TableField(value = "remainCount")
+    @ApiModelProperty(value="剩余数量")
+    private Integer remainCount;
+
+    /**
+     * 内部批号
+     */
+    @TableField(value = "inBactchNo")
+    @ApiModelProperty(value="内部批号")
+    private String inBactchNo;
+
+    /**
+     * 创建日期
+     */
+    @TableField(value = "createTime")
+    @ApiModelProperty(value="创建日期")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    @ApiModelProperty(value="创建人")
+    private String createUser;
+
+    /**
+     * 更新日期
+     */
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value="更新日期")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value="备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/glxp/api/entity/thrsys/BasicInsChdrugEntity.java b/src/main/java/com/glxp/api/entity/thrsys/BasicInsChdrugEntity.java
new file mode 100644
index 000000000..3277cc004
--- /dev/null
+++ b/src/main/java/com/glxp/api/entity/thrsys/BasicInsChdrugEntity.java
@@ -0,0 +1,256 @@
+package com.glxp.api.entity.thrsys;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 中药饮片目录
+    */
+@ApiModel(value="com-glxp-api-entity-thrsys-BasicInsChdrug")
+@Data
+@TableName(value = "basic_ins_chdrug")
+public class BasicInsChdrugEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+     * 医疗目录编码
+     */
+    @TableField(value = "medCatalogCode")
+    @ApiModelProperty(value="医疗目录编码")
+    private String medCatalogCode;
+
+    /**
+     * 单味药名称
+     */
+    @TableField(value = "herbName")
+    @ApiModelProperty(value="单味药名称")
+    private String herbName;
+
+    /**
+     * 单复方标志
+     */
+    @TableField(value = "compFlag")
+    @ApiModelProperty(value="单复方标志")
+    private Byte compFlag;
+
+    /**
+     * 质量等级
+     */
+    @TableField(value = "qualityGrade")
+    @ApiModelProperty(value="质量等级")
+    private String qualityGrade;
+
+    /**
+     * 中草药年份
+     */
+    @TableField(value = "herbYear")
+    @ApiModelProperty(value="中草药年份")
+    private String herbYear;
+
+    /**
+     * 药用部位
+     */
+    @TableField(value = "medPart")
+    @ApiModelProperty(value="药用部位")
+    private String medPart;
+
+    /**
+     * 安全计量
+     */
+    @TableField(value = "safeDosage")
+    @ApiModelProperty(value="安全计量")
+    private String safeDosage;
+
+    /**
+     * 常规用法
+     */
+    @TableField(value = "usualUsage")
+    @ApiModelProperty(value="常规用法")
+    private String usualUsage;
+
+    /**
+     * 性味
+     */
+    @TableField(value = "tasteNature")
+    @ApiModelProperty(value="性味")
+    private String tasteNature;
+
+    /**
+     * 归经
+     */
+    @TableField(value = "meridianTropism")
+    @ApiModelProperty(value="归经")
+    private String meridianTropism;
+
+    /**
+     * 品种
+     */
+    @TableField(value = "variety")
+    @ApiModelProperty(value="品种")
+    private String variety;
+
+    /**
+     * 开始日期
+     */
+    @TableField(value = "startDate")
+    @ApiModelProperty(value="开始日期")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @TableField(value = "endDate")
+    @ApiModelProperty(value="结束日期")
+    private Date endDate;
+
+    /**
+     * 有效标志
+     */
+    @TableField(value = "activeMark")
+    @ApiModelProperty(value="有效标志")
+    private Byte activeMark;
+
+    /**
+     * 唯一记录号
+     */
+    @TableField(value = "uniqueRecordNum")
+    @ApiModelProperty(value="唯一记录号")
+    private String uniqueRecordNum;
+
+    /**
+     * 数据创建时间
+     */
+    @TableField(value = "dataCreateTime")
+    @ApiModelProperty(value="数据创建时间")
+    private Date dataCreateTime;
+
+    /**
+     * 数据更新时间
+     */
+    @TableField(value = "dataUpdateTime")
+    @ApiModelProperty(value="数据更新时间")
+    private Date dataUpdateTime;
+
+    /**
+     * 版本号
+     */
+    @TableField(value = "versionNum")
+    @ApiModelProperty(value="版本号")
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    @TableField(value = "versionName")
+    @ApiModelProperty(value="版本名称")
+    private String versionName;
+
+    /**
+     * 药材名称
+     */
+    @TableField(value = "medName")
+    @ApiModelProperty(value="药材名称")
+    private String medName;
+
+    /**
+     * 功能主治
+     */
+    @TableField(value = "mainFunction")
+    @ApiModelProperty(value="功能主治")
+    private String mainFunction;
+
+    /**
+     * 炮制方法
+     */
+    @TableField(value = "processingMethod")
+    @ApiModelProperty(value="炮制方法")
+    private String processingMethod;
+
+    /**
+     * 功效分类
+     */
+    @TableField(value = "efficacyCategory")
+    @ApiModelProperty(value="功效分类")
+    private String efficacyCategory;
+
+    /**
+     * 药材种来源
+     */
+    @TableField(value = "medSource")
+    @ApiModelProperty(value="药材种来源")
+    private String medSource;
+
+    /**
+     * 国家医保支付政策
+     */
+    @TableField(value = "nationalInsurancePolicy")
+    @ApiModelProperty(value="国家医保支付政策")
+    private String nationalInsurancePolicy;
+
+    /**
+     * 省级医保支付政策
+     */
+    @TableField(value = "provincialInsurancePolicy")
+    @ApiModelProperty(value="省级医保支付政策")
+    private String provincialInsurancePolicy;
+
+    /**
+     * 标准名称
+     */
+    @TableField(value = "standardName")
+    @ApiModelProperty(value="标准名称")
+    private String standardName;
+
+    /**
+     * 标准页码
+     */
+    @TableField(value = "standardPage")
+    @ApiModelProperty(value="标准页码")
+    private String standardPage;
+
+    /**
+     * 标准电子档案
+     */
+    @TableField(value = "standardFile")
+    @ApiModelProperty(value="标准电子档案")
+    private String standardFile;
+
+    /**
+     * 下发标志
+     */
+    @TableField(value = "releaseMark")
+    @ApiModelProperty(value="下发标志")
+    private Byte releaseMark;
+
+    /**
+     * 传输数据ID
+     */
+    @TableField(value = "transferDataId")
+    @ApiModelProperty(value="传输数据ID")
+    private String transferDataId;
+
+    /**
+     * 生效时间
+     */
+    @TableField(value = "effectiveTime")
+    @ApiModelProperty(value="生效时间")
+    private Date effectiveTime;
+
+    /**
+     * 失效时间
+     */
+    @TableField(value = "expiryTime")
+    @ApiModelProperty(value="失效时间")
+    private Date expiryTime;
+
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java b/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java
new file mode 100644
index 000000000..76e83c936
--- /dev/null
+++ b/src/main/java/com/glxp/api/entity/thrsys/BasicInsDrugEntity.java
@@ -0,0 +1,704 @@
+package com.glxp.api.entity.thrsys;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 西药中成药目录
+    */
+@ApiModel(value="com-glxp-api-entity-thrsys-BasicInsDrug")
+@Data
+@TableName(value = "basic_ins_drug")
+public class BasicInsDrugEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+     * 医疗目录编码
+     */
+    @TableField(value = "medCatalogCode")
+    @ApiModelProperty(value="医疗目录编码")
+    private String medCatalogCode;
+
+    /**
+     * 药品商品名
+     */
+    @TableField(value = "tradeName")
+    @ApiModelProperty(value="药品商品名")
+    private String tradeName;
+
+    /**
+     * 通用名编号
+     */
+    @TableField(value = "genericNum")
+    @ApiModelProperty(value="通用名编号")
+    private String genericNum;
+
+    /**
+     * 药品通用名
+     */
+    @TableField(value = "genericName")
+    @ApiModelProperty(value="药品通用名")
+    private String genericName;
+
+    /**
+     * 化学名称
+     */
+    @TableField(value = "chemName")
+    @ApiModelProperty(value="化学名称")
+    private String chemName;
+
+    /**
+     * 别名
+     */
+    @TableField(value = "`alias`")
+    @ApiModelProperty(value="别名")
+    private String alias;
+
+    /**
+     * 英文名称
+     */
+    @TableField(value = "engName")
+    @ApiModelProperty(value="英文名称")
+    private String engName;
+
+    /**
+     * 注册名称
+     */
+    @TableField(value = "regName")
+    @ApiModelProperty(value="注册名称")
+    private String regName;
+
+    /**
+     * 药监本位码
+     */
+    @TableField(value = "medStandardCode")
+    @ApiModelProperty(value="药监本位码")
+    private String medStandardCode;
+
+    /**
+     * 药品剂型
+     */
+    @TableField(value = "dosageForm")
+    @ApiModelProperty(value="药品剂型")
+    private String dosageForm;
+
+    /**
+     * 药品剂型名称
+     */
+    @TableField(value = "dosageFormName")
+    @ApiModelProperty(value="药品剂型名称")
+    private String dosageFormName;
+
+    /**
+     * 药品类别
+     */
+    @TableField(value = "medCategory")
+    @ApiModelProperty(value="药品类别")
+    private String medCategory;
+
+    /**
+     * 药品类别名称
+     */
+    @TableField(value = "medCategoryName")
+    @ApiModelProperty(value="药品类别名称")
+    private String medCategoryName;
+
+    /**
+     * 药品规格
+     */
+    @TableField(value = "medSpec")
+    @ApiModelProperty(value="药品规格")
+    private String medSpec;
+
+    /**
+     * 药品规格代码
+     */
+    @TableField(value = "medSpecCode")
+    @ApiModelProperty(value="药品规格代码")
+    private String medSpecCode;
+
+    /**
+     * 注册剂型
+     */
+    @TableField(value = "regDosageForm")
+    @ApiModelProperty(value="注册剂型")
+    private String regDosageForm;
+
+    /**
+     * 注册规格
+     */
+    @TableField(value = "regSpec")
+    @ApiModelProperty(value="注册规格")
+    private String regSpec;
+
+    /**
+     * 注册规格代码
+     */
+    @TableField(value = "regSpecCode")
+    @ApiModelProperty(value="注册规格代码")
+    private String regSpecCode;
+
+    /**
+     * 每次用量
+     */
+    @TableField(value = "doseEachTime")
+    @ApiModelProperty(value="每次用量")
+    private String doseEachTime;
+
+    /**
+     * 使用频次
+     */
+    @TableField(value = "usageFrequency")
+    @ApiModelProperty(value="使用频次")
+    private String usageFrequency;
+
+    /**
+     * 酸根盐基
+     */
+    @TableField(value = "acidBase")
+    @ApiModelProperty(value="酸根盐基")
+    private String acidBase;
+
+    /**
+     * 国家药品编号
+     */
+    @TableField(value = "nationalDrugNum")
+    @ApiModelProperty(value="国家药品编号")
+    private String nationalDrugNum;
+
+    /**
+     * 用法
+     */
+    @TableField(value = "`usage`")
+    @ApiModelProperty(value="用法")
+    private String usage;
+
+    /**
+     * 中成药标志
+     */
+    @TableField(value = "tcmMark")
+    @ApiModelProperty(value="中成药标志")
+    private Byte tcmMark;
+
+    /**
+     * 生产地类别
+     */
+    @TableField(value = "productionAreaType")
+    @ApiModelProperty(value="生产地类别")
+    private String productionAreaType;
+
+    /**
+     * 生产地类别名称
+     */
+    @TableField(value = "productionAreaName")
+    @ApiModelProperty(value="生产地类别名称")
+    private String productionAreaName;
+
+    /**
+     * 计价单位类型
+     */
+    @TableField(value = "pricingUnitType")
+    @ApiModelProperty(value="计价单位类型")
+    private String pricingUnitType;
+
+    /**
+     * 非处方药标志
+     */
+    @TableField(value = "otcMark")
+    @ApiModelProperty(value="非处方药标志")
+    private Byte otcMark;
+
+    /**
+     * 非处方药标志名称
+     */
+    @TableField(value = "otcMarkName")
+    @ApiModelProperty(value="非处方药标志名称")
+    private String otcMarkName;
+
+    /**
+     * 包装材质
+     */
+    @TableField(value = "packagingMaterial")
+    @ApiModelProperty(value="包装材质")
+    private String packagingMaterial;
+
+    /**
+     * 包装材质名称
+     */
+    @TableField(value = "packagingMaterialName")
+    @ApiModelProperty(value="包装材质名称")
+    private String packagingMaterialName;
+
+    /**
+     * 包装规格
+     */
+    @TableField(value = "packagingSpec")
+    @ApiModelProperty(value="包装规格")
+    private String packagingSpec;
+
+    /**
+     * 包装数量
+     */
+    @TableField(value = "packagingQuantity")
+    @ApiModelProperty(value="包装数量")
+    private Integer packagingQuantity;
+
+    /**
+     * 功能主治
+     */
+    @TableField(value = "mainFunction")
+    @ApiModelProperty(value="功能主治")
+    private String mainFunction;
+
+    /**
+     * 给药途径
+     */
+    @TableField(value = "routeOfAdmin")
+    @ApiModelProperty(value="给药途径")
+    private String routeOfAdmin;
+
+    /**
+     * 说明书
+     */
+    @TableField(value = "instructions")
+    @ApiModelProperty(value="说明书")
+    private String instructions;
+
+    /**
+     * 开始日期
+     */
+    @TableField(value = "startDate")
+    @ApiModelProperty(value="开始日期")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @TableField(value = "endDate")
+    @ApiModelProperty(value="结束日期")
+    private Date endDate;
+
+    /**
+     * 最小使用单位
+     */
+    @TableField(value = "minUsageUnit")
+    @ApiModelProperty(value="最小使用单位")
+    private String minUsageUnit;
+
+    /**
+     * 最小销售单位
+     */
+    @TableField(value = "minSalesUnit")
+    @ApiModelProperty(value="最小销售单位")
+    private String minSalesUnit;
+
+    /**
+     * 最小计量单位
+     */
+    @TableField(value = "minMeasureUnit")
+    @ApiModelProperty(value="最小计量单位")
+    private String minMeasureUnit;
+
+    /**
+     * 最小包装数量
+     */
+    @TableField(value = "minPackagingQuantity")
+    @ApiModelProperty(value="最小包装数量")
+    private Integer minPackagingQuantity;
+
+    /**
+     * 最小包装单位
+     */
+    @TableField(value = "minPackagingUnit")
+    @ApiModelProperty(value="最小包装单位")
+    private String minPackagingUnit;
+
+    /**
+     * 最小制剂单位
+     */
+    @TableField(value = "minPreparationUnit")
+    @ApiModelProperty(value="最小制剂单位")
+    private String minPreparationUnit;
+
+    /**
+     * 最小包装单位名称
+     */
+    @TableField(value = "minPackagingUnitName")
+    @ApiModelProperty(value="最小包装单位名称")
+    private String minPackagingUnitName;
+
+    /**
+     * 最小制剂单位名称
+     */
+    @TableField(value = "minPreparationUnitName")
+    @ApiModelProperty(value="最小制剂单位名称")
+    private String minPreparationUnitName;
+
+    /**
+     * 转换比
+     */
+    @TableField(value = "conversionRate")
+    @ApiModelProperty(value="转换比")
+    private Double conversionRate;
+
+    /**
+     * 药品有效期
+     */
+    @TableField(value = "shelfLife")
+    @ApiModelProperty(value="药品有效期")
+    private String shelfLife;
+
+    /**
+     * 最小计价单位
+     */
+    @TableField(value = "minPricingUnit")
+    @ApiModelProperty(value="最小计价单位")
+    private String minPricingUnit;
+
+    /**
+     * 五笔助记码
+     */
+    @TableField(value = "fiveStrokeCode")
+    @ApiModelProperty(value="五笔助记码")
+    private String fiveStrokeCode;
+
+    /**
+     * 拼音助记码
+     */
+    @TableField(value = "pinyinCode")
+    @ApiModelProperty(value="拼音助记码")
+    private String pinyinCode;
+
+    /**
+     * 分包装厂家
+     */
+    @TableField(value = "packagingManufacturer")
+    @ApiModelProperty(value="分包装厂家")
+    private String packagingManufacturer;
+
+    /**
+     * 生产企业编号
+     */
+    @TableField(value = "manufacturerNum")
+    @ApiModelProperty(value="生产企业编号")
+    private String manufacturerNum;
+
+    /**
+     * 生产企业名称
+     */
+    @TableField(value = "manufacturerName")
+    @ApiModelProperty(value="生产企业名称")
+    private String manufacturerName;
+
+    /**
+     * 特殊限价药品标志
+     */
+    @TableField(value = "specialPricingMark")
+    @ApiModelProperty(value="特殊限价药品标志")
+    private Byte specialPricingMark;
+
+    /**
+     * 特殊药品标志
+     */
+    @TableField(value = "specialDrugMark")
+    @ApiModelProperty(value="特殊药品标志")
+    private Byte specialDrugMark;
+
+    /**
+     * 限制使用范围
+     */
+    @TableField(value = "usageLimit")
+    @ApiModelProperty(value="限制使用范围")
+    private String usageLimit;
+
+    /**
+     * 限制使用标志
+     */
+    @TableField(value = "usageLimitMark")
+    @ApiModelProperty(value="限制使用标志")
+    private Byte usageLimitMark;
+
+    /**
+     * 药品注册证号
+     */
+    @TableField(value = "regCertNum")
+    @ApiModelProperty(value="药品注册证号")
+    private String regCertNum;
+
+    /**
+     * 药品注册证号开始日期
+     */
+    @TableField(value = "regCertStartDate")
+    @ApiModelProperty(value="药品注册证号开始日期")
+    private Date regCertStartDate;
+
+    /**
+     * 药品注册证号结束日期
+     */
+    @TableField(value = "regCertEndDate")
+    @ApiModelProperty(value="药品注册证号结束日期")
+    private Date regCertEndDate;
+
+    /**
+     * 批准文号
+     */
+    @TableField(value = "approvalNum")
+    @ApiModelProperty(value="批准文号")
+    private String approvalNum;
+
+    /**
+     * 批准文号开始日期
+     */
+    @TableField(value = "approvalStartDate")
+    @ApiModelProperty(value="批准文号开始日期")
+    private Date approvalStartDate;
+
+    /**
+     * 批准文号结束日期
+     */
+    @TableField(value = "approvalEndDate")
+    @ApiModelProperty(value="批准文号结束日期")
+    private Date approvalEndDate;
+
+    /**
+     * 市场状态
+     */
+    @TableField(value = "marketStatus")
+    @ApiModelProperty(value="市场状态")
+    private Byte marketStatus;
+
+    /**
+     * 市场状态名称
+     */
+    @TableField(value = "marketStatusName")
+    @ApiModelProperty(value="市场状态名称")
+    private String marketStatusName;
+
+    /**
+     * 药品注册批件电子档案
+     */
+    @TableField(value = "regApprovalFile")
+    @ApiModelProperty(value="药品注册批件电子档案")
+    private String regApprovalFile;
+
+    /**
+     * 药品补充申请批件电子档案
+     */
+    @TableField(value = "suppApprovalFile")
+    @ApiModelProperty(value="药品补充申请批件电子档案")
+    private String suppApprovalFile;
+
+    /**
+     * 国家医保药品目录备注
+     */
+    @TableField(value = "nationalInsuranceNotes")
+    @ApiModelProperty(value="国家医保药品目录备注")
+    private String nationalInsuranceNotes;
+
+    /**
+     * 基本药物标志名称
+     */
+    @TableField(value = "essentialDrugMarkName")
+    @ApiModelProperty(value="基本药物标志名称")
+    private String essentialDrugMarkName;
+
+    /**
+     * 基本药物标志
+     */
+    @TableField(value = "essentialDrugMark")
+    @ApiModelProperty(value="基本药物标志")
+    private Byte essentialDrugMark;
+
+    /**
+     * 增值税调整药品标志
+     */
+    @TableField(value = "vatAdjustmentMark")
+    @ApiModelProperty(value="增值税调整药品标志")
+    private Byte vatAdjustmentMark;
+
+    /**
+     * 增值税调整药品名称
+     */
+    @TableField(value = "vatAdjustmentName")
+    @ApiModelProperty(value="增值税调整药品名称")
+    private String vatAdjustmentName;
+
+    /**
+     * 上市药品目录集药品
+     */
+    @TableField(value = "listedDrugCatalog")
+    @ApiModelProperty(value="上市药品目录集药品")
+    private Byte listedDrugCatalog;
+
+    /**
+     * 医保谈判药品标志
+     */
+    @TableField(value = "insuranceNegotiationMark")
+    @ApiModelProperty(value="医保谈判药品标志")
+    private Byte insuranceNegotiationMark;
+
+    /**
+     * 医保谈判药品名称
+     */
+    @TableField(value = "insuranceNegotiationName")
+    @ApiModelProperty(value="医保谈判药品名称")
+    private String insuranceNegotiationName;
+
+    /**
+     * 卫健委药品编码
+     */
+    @TableField(value = "nhcDrugCode")
+    @ApiModelProperty(value="卫健委药品编码")
+    private String nhcDrugCode;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "notes")
+    @ApiModelProperty(value="备注")
+    private String notes;
+
+    /**
+     * 有效标志
+     */
+    @TableField(value = "activeMark")
+    @ApiModelProperty(value="有效标志")
+    private Byte activeMark;
+
+    /**
+     * 唯一记录号
+     */
+    @TableField(value = "uniqueRecordNum")
+    @ApiModelProperty(value="唯一记录号")
+    private String uniqueRecordNum;
+
+    /**
+     * 数据创建时间
+     */
+    @TableField(value = "dataCreateTime")
+    @ApiModelProperty(value="数据创建时间")
+    private Date dataCreateTime;
+
+    /**
+     * 数据更新时间
+     */
+    @TableField(value = "dataUpdateTime")
+    @ApiModelProperty(value="数据更新时间")
+    private Date dataUpdateTime;
+
+    /**
+     * 版本号
+     */
+    @TableField(value = "versionNum")
+    @ApiModelProperty(value="版本号")
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    @TableField(value = "versionName")
+    @ApiModelProperty(value="版本名称")
+    private String versionName;
+
+    /**
+     * 儿童用药
+     */
+    @TableField(value = "pediatricUsage")
+    @ApiModelProperty(value="儿童用药")
+    private Byte pediatricUsage;
+
+    /**
+     * 公司名称
+     */
+    @TableField(value = "companyName")
+    @ApiModelProperty(value="公司名称")
+    private String companyName;
+
+    /**
+     * 仿制药一致性评价药品
+     */
+    @TableField(value = "genericConsistencyEval")
+    @ApiModelProperty(value="仿制药一致性评价药品")
+    private Byte genericConsistencyEval;
+
+    /**
+     * 经销企业
+     */
+    @TableField(value = "distributor")
+    @ApiModelProperty(value="经销企业")
+    private String distributor;
+
+    /**
+     * 经销企业联系人
+     */
+    @TableField(value = "distributorContact")
+    @ApiModelProperty(value="经销企业联系人")
+    private String distributorContact;
+
+    /**
+     * 经销企业授权书电子档案
+     */
+    @TableField(value = "distributorAuthFile")
+    @ApiModelProperty(value="经销企业授权书电子档案")
+    private String distributorAuthFile;
+
+    /**
+     * 国家医保药品目录剂型
+     */
+    @TableField(value = "insuranceDrugForm")
+    @ApiModelProperty(value="国家医保药品目录剂型")
+    private String insuranceDrugForm;
+
+    /**
+     * 国家医保药品目录甲乙类标识
+     */
+    @TableField(value = "insuranceDrugClass")
+    @ApiModelProperty(value="国家医保药品目录甲乙类标识")
+    private String insuranceDrugClass;
+
+    /**
+     * 上市许可证持有人
+     */
+    @TableField(value = "marketingAuthHolder")
+    @ApiModelProperty(value="上市许可证持有人")
+    private String marketingAuthHolder;
+
+    /**
+     * 下发标志
+     */
+    @TableField(value = "releaseMark")
+    @ApiModelProperty(value="下发标志")
+    private Byte releaseMark;
+
+    /**
+     * 传输数据ID
+     */
+    @TableField(value = "transferDataId")
+    @ApiModelProperty(value="传输数据ID")
+    private String transferDataId;
+
+    /**
+     * 生效时间
+     */
+    @TableField(value = "effectiveTime")
+    @ApiModelProperty(value="生效时间")
+    private Date effectiveTime;
+
+    /**
+     * 失效时间
+     */
+    @TableField(value = "expiryTime")
+    @ApiModelProperty(value="失效时间")
+    private Date expiryTime;
+
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/glxp/api/entity/thrsys/BasicInsMaterialEntity.java b/src/main/java/com/glxp/api/entity/thrsys/BasicInsMaterialEntity.java
new file mode 100644
index 000000000..dd886e8b7
--- /dev/null
+++ b/src/main/java/com/glxp/api/entity/thrsys/BasicInsMaterialEntity.java
@@ -0,0 +1,522 @@
+package com.glxp.api.entity.thrsys;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 医用耗材目录
+    */
+@ApiModel(value="com-glxp-api-entity-thrsys-BasicInsMaterial")
+@Data
+@TableName(value = "basic_ins_material")
+public class BasicInsMaterialEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="")
+    private Integer id;
+
+    /**
+     * 医疗目录编码
+     */
+    @TableField(value = "medCatalogCode")
+    @ApiModelProperty(value="医疗目录编码")
+    private String medCatalogCode;
+
+    /**
+     * 耗材名称
+     */
+    @TableField(value = "consumableName")
+    @ApiModelProperty(value="耗材名称")
+    private String consumableName;
+
+    /**
+     * 医疗器械唯一标识码
+     */
+    @TableField(value = "deviceUniqueCode")
+    @ApiModelProperty(value="医疗器械唯一标识码")
+    private String deviceUniqueCode;
+
+    /**
+     * 医保通用名代码
+     */
+    @TableField(value = "insuranceGenericCode")
+    @ApiModelProperty(value="医保通用名代码")
+    private String insuranceGenericCode;
+
+    /**
+     * 医保通用名
+     */
+    @TableField(value = "insuranceGenericName")
+    @ApiModelProperty(value="医保通用名")
+    private String insuranceGenericName;
+
+    /**
+     * 产品型号
+     */
+    @TableField(value = "productModel")
+    @ApiModelProperty(value="产品型号")
+    private String productModel;
+
+    /**
+     * 规格代码
+     */
+    @TableField(value = "specCode")
+    @ApiModelProperty(value="规格代码")
+    private String specCode;
+
+    /**
+     * 规格
+     */
+    @TableField(value = "specification")
+    @ApiModelProperty(value="规格")
+    private String specification;
+
+    /**
+     * 耗材分类
+     */
+    @TableField(value = "consumableCategory")
+    @ApiModelProperty(value="耗材分类")
+    private String consumableCategory;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "specModel")
+    @ApiModelProperty(value="规格型号")
+    private String specModel;
+
+    /**
+     * 材质代码
+     */
+    @TableField(value = "materialCode")
+    @ApiModelProperty(value="材质代码")
+    private String materialCode;
+
+    /**
+     * 耗材材质
+     */
+    @TableField(value = "consumableMaterial")
+    @ApiModelProperty(value="耗材材质")
+    private String consumableMaterial;
+
+    /**
+     * 包装规格
+     */
+    @TableField(value = "packagingSpec")
+    @ApiModelProperty(value="包装规格")
+    private String packagingSpec;
+
+    /**
+     * 包装数量
+     */
+    @TableField(value = "packagingQuantity")
+    @ApiModelProperty(value="包装数量")
+    private Integer packagingQuantity;
+
+    /**
+     * 产品包装材质
+     */
+    @TableField(value = "packagingMaterial")
+    @ApiModelProperty(value="产品包装材质")
+    private String packagingMaterial;
+
+    /**
+     * 包装单位
+     */
+    @TableField(value = "packagingUnit")
+    @ApiModelProperty(value="包装单位")
+    private String packagingUnit;
+
+    /**
+     * 产品转换比
+     */
+    @TableField(value = "productConversionRate")
+    @ApiModelProperty(value="产品转换比")
+    private Double productConversionRate;
+
+    /**
+     * 最小使用单位
+     */
+    @TableField(value = "minUsageUnit")
+    @ApiModelProperty(value="最小使用单位")
+    private String minUsageUnit;
+
+    /**
+     * 生产地类别
+     */
+    @TableField(value = "productionAreaType")
+    @ApiModelProperty(value="生产地类别")
+    private String productionAreaType;
+
+    /**
+     * 生产地类别名称
+     */
+    @TableField(value = "productionAreaName")
+    @ApiModelProperty(value="生产地类别名称")
+    private String productionAreaName;
+
+    /**
+     * 产品标准
+     */
+    @TableField(value = "productStandard")
+    @ApiModelProperty(value="产品标准")
+    private String productStandard;
+
+    /**
+     * 产品有效期
+     */
+    @TableField(value = "productExpiry")
+    @ApiModelProperty(value="产品有效期")
+    private String productExpiry;
+
+    /**
+     * 性能结构与组成
+     */
+    @TableField(value = "structureComposition")
+    @ApiModelProperty(value="性能结构与组成")
+    private String structureComposition;
+
+    /**
+     * 适用范围
+     */
+    @TableField(value = "applicableScope")
+    @ApiModelProperty(value="适用范围")
+    private String applicableScope;
+
+    /**
+     * 产品使用方法
+     */
+    @TableField(value = "usageMethod")
+    @ApiModelProperty(value="产品使用方法")
+    private String usageMethod;
+
+    /**
+     * 产品图片编号
+     */
+    @TableField(value = "productImageCode")
+    @ApiModelProperty(value="产品图片编号")
+    private String productImageCode;
+
+    /**
+     * 产品质量标准
+     */
+    @TableField(value = "qualityStandard")
+    @ApiModelProperty(value="产品质量标准")
+    private String qualityStandard;
+
+    /**
+     * 说明书
+     */
+    @TableField(value = "instructions")
+    @ApiModelProperty(value="说明书")
+    private String instructions;
+
+    /**
+     * 其他证明材料
+     */
+    @TableField(value = "otherCertMaterials")
+    @ApiModelProperty(value="其他证明材料")
+    private String otherCertMaterials;
+
+    /**
+     * 专机专用标志
+     */
+    @TableField(value = "dedicatedMachineFlag")
+    @ApiModelProperty(value="专机专用标志")
+    private Byte dedicatedMachineFlag;
+
+    /**
+     * 专机名称
+     */
+    @TableField(value = "dedicatedMachineName")
+    @ApiModelProperty(value="专机名称")
+    private String dedicatedMachineName;
+
+    /**
+     * 组套名称
+     */
+    @TableField(value = "setNames")
+    @ApiModelProperty(value="组套名称")
+    private String setNames;
+
+    /**
+     * 机套标志
+     */
+    @TableField(value = "setFlag")
+    @ApiModelProperty(value="机套标志")
+    private Byte setFlag;
+
+    /**
+     * 限制使用标志
+     */
+    @TableField(value = "usageRestrictionFlag")
+    @ApiModelProperty(value="限制使用标志")
+    private Byte usageRestrictionFlag;
+
+    /**
+     * 医保限用范围
+     */
+    @TableField(value = "insuranceUsageScope")
+    @ApiModelProperty(value="医保限用范围")
+    private String insuranceUsageScope;
+
+    /**
+     * 最小销售单位
+     */
+    @TableField(value = "minSalesUnit")
+    @ApiModelProperty(value="最小销售单位")
+    private String minSalesUnit;
+
+    /**
+     * 高值耗材标志
+     */
+    @TableField(value = "highValueConsumableFlag")
+    @ApiModelProperty(value="高值耗材标志")
+    private Byte highValueConsumableFlag;
+
+    /**
+     * 医用材料分类代码
+     */
+    @TableField(value = "medicalMaterialCategoryCode")
+    @ApiModelProperty(value="医用材料分类代码")
+    private String medicalMaterialCategoryCode;
+
+    /**
+     * 植入材料和人体器官标志
+     */
+    @TableField(value = "implantMaterialFlag")
+    @ApiModelProperty(value="植入材料和人体器官标志")
+    private Byte implantMaterialFlag;
+
+    /**
+     * 灭菌标志
+     */
+    @TableField(value = "sterilizationFlag")
+    @ApiModelProperty(value="灭菌标志")
+    private Byte sterilizationFlag;
+
+    /**
+     * 灭菌标志名称
+     */
+    @TableField(value = "sterilizationFlagName")
+    @ApiModelProperty(value="灭菌标志名称")
+    private String sterilizationFlagName;
+
+    /**
+     * 植入或介入类标志
+     */
+    @TableField(value = "implantOrInterventionalFlag")
+    @ApiModelProperty(value="植入或介入类标志")
+    private Byte implantOrInterventionalFlag;
+
+    /**
+     * 植入或介入类名称
+     */
+    @TableField(value = "implantOrInterventionalName")
+    @ApiModelProperty(value="植入或介入类名称")
+    private String implantOrInterventionalName;
+
+    /**
+     * 一次性使用标志
+     */
+    @TableField(value = "singleUseFlag")
+    @ApiModelProperty(value="一次性使用标志")
+    private Byte singleUseFlag;
+
+    /**
+     * 一次性使用标志名称
+     */
+    @TableField(value = "singleUseFlagName")
+    @ApiModelProperty(value="一次性使用标志名称")
+    private String singleUseFlagName;
+
+    /**
+     * 注册备案人名称
+     */
+    @TableField(value = "regFilingPersonName")
+    @ApiModelProperty(value="注册备案人名称")
+    private String regFilingPersonName;
+
+    /**
+     * 开始日期
+     */
+    @TableField(value = "startDate")
+    @ApiModelProperty(value="开始日期")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @TableField(value = "endDate")
+    @ApiModelProperty(value="结束日期")
+    private Date endDate;
+
+    /**
+     * 医疗器械管理类别
+     */
+    @TableField(value = "deviceManagementCategory")
+    @ApiModelProperty(value="医疗器械管理类别")
+    private String deviceManagementCategory;
+
+    /**
+     * 医疗器械管理类别名称
+     */
+    @TableField(value = "deviceManagementCategoryName")
+    @ApiModelProperty(value="医疗器械管理类别名称")
+    private String deviceManagementCategoryName;
+
+    /**
+     * 注册备案号
+     */
+    @TableField(value = "regFilingNum")
+    @ApiModelProperty(value="注册备案号")
+    private String regFilingNum;
+
+    /**
+     * 注册备案产品名称
+     */
+    @TableField(value = "regFilingProductName")
+    @ApiModelProperty(value="注册备案产品名称")
+    private String regFilingProductName;
+
+    /**
+     * 结构及组成
+     */
+    @TableField(value = "structureCompositionDetail")
+    @ApiModelProperty(value="结构及组成")
+    private String structureCompositionDetail;
+
+    /**
+     * 其他内容
+     */
+    @TableField(value = "otherDetails")
+    @ApiModelProperty(value="其他内容")
+    private String otherDetails;
+
+    /**
+     * 批准日期
+     */
+    @TableField(value = "approvalDate")
+    @ApiModelProperty(value="批准日期")
+    private Date approvalDate;
+
+    /**
+     * 注册备案人住所
+     */
+    @TableField(value = "regFilingPersonAddress")
+    @ApiModelProperty(value="注册备案人住所")
+    private String regFilingPersonAddress;
+
+    /**
+     * 注册证有效期开始时间
+     */
+    @TableField(value = "regCertStartDate")
+    @ApiModelProperty(value="注册证有效期开始时间")
+    private Date regCertStartDate;
+
+    /**
+     * 注册证有效期结束时间
+     */
+    @TableField(value = "regCertEndDate")
+    @ApiModelProperty(value="注册证有效期结束时间")
+    private Date regCertEndDate;
+
+    /**
+     * 生产企业编号
+     */
+    @TableField(value = "manufacturerNum")
+    @ApiModelProperty(value="生产企业编号")
+    private String manufacturerNum;
+
+    /**
+     * 生产企业名称
+     */
+    @TableField(value = "manufacturerName")
+    @ApiModelProperty(value="生产企业名称")
+    private String manufacturerName;
+
+    /**
+     * 生产地址
+     */
+    @TableField(value = "manufacturingAddress")
+    @ApiModelProperty(value="生产地址")
+    private String manufacturingAddress;
+
+    /**
+     * 代理人企业
+     */
+    @TableField(value = "agentCompany")
+    @ApiModelProperty(value="代理人企业")
+    private String agentCompany;
+
+    /**
+     * 代理人企业地址
+     */
+    @TableField(value = "agentCompanyAddress")
+    @ApiModelProperty(value="代理人企业地址")
+    private String agentCompanyAddress;
+
+    /**
+     * 生产国或地区
+     */
+    @TableField(value = "productionCountry")
+    @ApiModelProperty(value="生产国或地区")
+    private String productionCountry;
+
+    /**
+     * 售后服务机构
+     */
+    @TableField(value = "afterSalesService")
+    @ApiModelProperty(value="售后服务机构")
+    private String afterSalesService;
+
+    /**
+     * 注册或备案证电子档案
+     */
+    @TableField(value = "regOrFilingCertFile")
+    @ApiModelProperty(value="注册或备案证电子档案")
+    private String regOrFilingCertFile;
+
+    /**
+     * 产品影像
+     */
+    @TableField(value = "productImage")
+    @ApiModelProperty(value="产品影像")
+    private String productImage;
+
+    /**
+     * 有效标志
+     */
+    @TableField(value = "activeMark")
+    @ApiModelProperty(value="有效标志")
+    private Byte activeMark;
+
+    /**
+     * 唯一记录号
+     */
+    @TableField(value = "uniqueRecordNum")
+    @ApiModelProperty(value="唯一记录号")
+    private String uniqueRecordNum;
+
+    /**
+     * 版本号
+     */
+    @TableField(value = "versionNum")
+    @ApiModelProperty(value="版本号")
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    @TableField(value = "versionName")
+    @ApiModelProperty(value="版本名称")
+    private String versionName;
+
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrInsChDrugFeeRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrInsChDrugFeeRequest.java
new file mode 100644
index 000000000..d104aa873
--- /dev/null
+++ b/src/main/java/com/glxp/api/req/thrsys/ThrInsChDrugFeeRequest.java
@@ -0,0 +1,22 @@
+package com.glxp.api.req.thrsys;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class ThrInsChDrugFeeRequest extends ListPageRequest {
+
+    /**
+     * 医疗目录编码
+     */
+    private String medCatalogCode;
+
+    /**
+     * 单味药名称
+     */
+    private String herbName;
+
+
+
+
+}
diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrInsDrugFeeRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrInsDrugFeeRequest.java
new file mode 100644
index 000000000..9b0f4cd25
--- /dev/null
+++ b/src/main/java/com/glxp/api/req/thrsys/ThrInsDrugFeeRequest.java
@@ -0,0 +1,33 @@
+package com.glxp.api.req.thrsys;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ThrInsDrugFeeRequest extends ListPageRequest {
+
+
+    /**
+     * 医疗目录编码
+     */
+    private String medCatalogCode;
+
+    /**
+     * 药品商品名
+     */
+    private String tradeName;
+
+    /**
+     * 通用名编号
+     */
+    private String genericNum;
+
+    /**
+     * 药品通用名
+     */
+    private String genericName;
+
+
+}
diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrInsMaterialFeeRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrInsMaterialFeeRequest.java
new file mode 100644
index 000000000..e759412d8
--- /dev/null
+++ b/src/main/java/com/glxp/api/req/thrsys/ThrInsMaterialFeeRequest.java
@@ -0,0 +1,22 @@
+package com.glxp.api.req.thrsys;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ThrInsMaterialFeeRequest extends ListPageRequest {
+
+
+    /**
+     * 医疗目录编码
+     */
+    private String medCatalogCode;
+
+    /**
+     * 耗材名称
+     */
+    private String consumableName;
+
+}
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
index 560612762..84694ed20 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java
@@ -266,6 +266,10 @@ public class IoOrderResponse {
 
     private String invoiceCodes;//单据所有发票号
 
+    /**
+     * 工位代码
+     */
+    private String workPlaceCode;
 
     public String getFromName() {
 
diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java
index 4c32e78ed..01762643c 100644
--- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java
+++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java
@@ -154,4 +154,16 @@ public class BasicSkPrescribeService extends ServiceImpl<BasicSkPrescribeMapper,
     }
 
 
+    /**
+     * 处方明细HIS收费项目对照
+     */
+    public void trSkPrescribeDiByPayFee(BasicSkPrescribeEntity skPrescribeEntity) {
+        List<BasicSkPrescribeItemEntity> skPrescribeItemEntities = basicSkPrescirbeDetailService.list(new QueryWrapper<BasicSkPrescribeItemEntity>().eq("prescribeCode", skPrescribeEntity.getCode()));
+        if (CollUtil.isNotEmpty(skPrescribeItemEntities)) {
+            for (BasicSkPrescribeItemEntity skPrescribeItemEntity : skPrescribeItemEntities) {
+            }
+        }
+    }
+
+
 }
diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java b/src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java
index 913f4a263..6b45a027e 100644
--- a/src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java
+++ b/src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java
@@ -65,7 +65,7 @@ public class BasicSkProjectService extends ServiceImpl<BasicSkProjectMapper, Bas
         addProductRequest.setName(basicSkProjectEntity.getName());
         addProductRequest.setSpec(basicSkProjectEntity.getGgxh());
         addProductRequest.setMeasname(basicSkProjectEntity.getUnit());
-        addProductRequest.setPrice(String.valueOf(price));
+        addProductRequest.setPrice(price);
         addProductRequest.setDestinyType(1);//定数包
         addProductRequest.setCode(basicSkProjectEntity.getCode());
         udiProductService.addProduct(addProductRequest);
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index 1cd54a5c8..9d33be8ed 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -75,6 +75,8 @@ public class IoCheckInoutService {
     IoGenInvService genInvService;
     @Resource
     IoAddInoutService addInoutService;
+    @Resource
+    IoSplitCodeService splitCodeService;
 
     //判断是否需要手动校验
     public boolean checkManual(String billNo) {
@@ -1182,7 +1184,6 @@ public class IoCheckInoutService {
 //        });
         }
 
-
         //校验是否是不入库存单据
         if (bussinessTypeEntity.isInStock()) {
             //生成库存
@@ -1193,6 +1194,23 @@ public class IoCheckInoutService {
             } else {
                 genInvService.genNorInv(orderEntity.getBillNo());
                 orderService.updateOrderInventory(orderEntity.getBillNo(), orderEntity.getStatus());
+
+
+                //若未拆零预出库单据则入到拆零表
+                if (orderEntity.getAction() == "SC72197936495755") {
+                    List<IoCodeEntity> codeList = codeService.findByOrderId(orderEntity.getBillNo());
+                    List<IoSplitCodeEntity>   splitCodeEntities = new ArrayList<>();
+                    if (CollUtil.isNotEmpty(codeList)) {
+                        for (IoCodeEntity codeEntity : codeList) {
+                            IoSplitCodeEntity splitCodeEntity = new IoSplitCodeEntity();
+                            BeanUtils.copyProperties(codeEntity, splitCodeEntity);
+                            splitCodeEntity.setInBactchNo(codeEntity.getInBatchNo());
+                            splitCodeEntity.setTotalCount(codeEntity.getReCount());
+                            splitCodeEntity.setRemainCount(codeEntity.getReCount());
+                        }
+                    }
+                    splitCodeService.saveBatch(splitCodeEntities);
+                }
             }
         } else {
             //不入库存，直接进行单据流转
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java
new file mode 100644
index 000000000..7279bdfcb
--- /dev/null
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeDetailService.java
@@ -0,0 +1,10 @@
+package com.glxp.api.service.inout;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.inout.IoSplitCodeDetailMapper;
+import com.glxp.api.entity.inout.IoSplitCodeDetailEntity;
+@Service
+public class IoSplitCodeDetailService extends ServiceImpl<IoSplitCodeDetailMapper, IoSplitCodeDetailEntity> {
+
+}
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
new file mode 100644
index 000000000..6b807825a
--- /dev/null
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -0,0 +1,10 @@
+package com.glxp.api.service.inout;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.entity.inout.IoSplitCodeEntity;
+import com.glxp.api.dao.inout.IoSplitCodeMapper;
+@Service
+public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCodeEntity> {
+
+}
diff --git a/src/main/java/com/glxp/api/service/thrsys/BasicInsChdrugService.java b/src/main/java/com/glxp/api/service/thrsys/BasicInsChdrugService.java
new file mode 100644
index 000000000..03e47a71f
--- /dev/null
+++ b/src/main/java/com/glxp/api/service/thrsys/BasicInsChdrugService.java
@@ -0,0 +1,27 @@
+package com.glxp.api.service.thrsys;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.thrsys.BasicInsChdrugMapper;
+import com.glxp.api.entity.thrsys.BasicInsChdrugEntity;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class BasicInsChdrugService extends ServiceImpl<BasicInsChdrugMapper, BasicInsChdrugEntity> {
+
+    public List<BasicInsChdrugEntity> filterList(ThrInsChDrugFeeRequest thrInsChDrugFeeRequest) {
+        if (thrInsChDrugFeeRequest == null) {
+            return Collections.emptyList();
+        }
+        if (thrInsChDrugFeeRequest.getPage() != null) {
+            int offset = (thrInsChDrugFeeRequest.getPage() - 1) * thrInsChDrugFeeRequest.getLimit();
+            PageHelper.offsetPage(offset, thrInsChDrugFeeRequest.getLimit());
+        }
+        return super.baseMapper.filterList(thrInsChDrugFeeRequest);
+
+    }
+}
diff --git a/src/main/java/com/glxp/api/service/thrsys/BasicInsDrugService.java b/src/main/java/com/glxp/api/service/thrsys/BasicInsDrugService.java
new file mode 100644
index 000000000..65ebcdaa0
--- /dev/null
+++ b/src/main/java/com/glxp/api/service/thrsys/BasicInsDrugService.java
@@ -0,0 +1,28 @@
+package com.glxp.api.service.thrsys;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.entity.thrsys.BasicInsChdrugEntity;
+import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest;
+import com.glxp.api.req.thrsys.ThrInsDrugFeeRequest;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.entity.thrsys.BasicInsDrugEntity;
+import com.glxp.api.dao.thrsys.BasicInsDrugMapper;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class BasicInsDrugService extends ServiceImpl<BasicInsDrugMapper, BasicInsDrugEntity> {
+    public List<BasicInsDrugEntity> filterList(ThrInsDrugFeeRequest thrInsDrugFeeRequest) {
+        if (thrInsDrugFeeRequest == null) {
+            return Collections.emptyList();
+        }
+        if (thrInsDrugFeeRequest.getPage() != null) {
+            int offset = (thrInsDrugFeeRequest.getPage() - 1) * thrInsDrugFeeRequest.getLimit();
+            PageHelper.offsetPage(offset, thrInsDrugFeeRequest.getLimit());
+        }
+        return super.baseMapper.filterList(thrInsDrugFeeRequest);
+
+    }
+}
diff --git a/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java b/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java
new file mode 100644
index 000000000..c7b9c9016
--- /dev/null
+++ b/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java
@@ -0,0 +1,28 @@
+package com.glxp.api.service.thrsys;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.entity.thrsys.BasicInsChdrugEntity;
+import com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest;
+import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.thrsys.BasicInsMaterialMapper;
+import com.glxp.api.entity.thrsys.BasicInsMaterialEntity;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class BasicInsMaterialService extends ServiceImpl<BasicInsMaterialMapper, BasicInsMaterialEntity> {
+    public List<BasicInsMaterialEntity> filterList(ThrInsMaterialFeeRequest thrInsMaterialFeeRequest) {
+        if (thrInsMaterialFeeRequest == null) {
+            return Collections.emptyList();
+        }
+        if (thrInsMaterialFeeRequest.getPage() != null) {
+            int offset = (thrInsMaterialFeeRequest.getPage() - 1) * thrInsMaterialFeeRequest.getLimit();
+            PageHelper.offsetPage(offset, thrInsMaterialFeeRequest.getLimit());
+        }
+        return super.baseMapper.filterList(thrInsMaterialFeeRequest);
+
+    }
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a2ecc2dc9..10d81b490 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeDetailMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeDetailMapper.xml
new file mode 100644
index 000000000..27635940f
--- /dev/null
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeDetailMapper.xml
@@ -0,0 +1,25 @@
+<?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="com.glxp.api.dao.inout.IoSplitCodeDetailMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoSplitCodeDetailEntity">
+    <!--@mbg.generated-->
+    <!--@Table io_split_code_detail-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="codeIdFk" jdbcType="INTEGER" property="codeIdFk" />
+    <result column="udiCodoe" jdbcType="VARCHAR" property="udiCodoe" />
+    <result column="sickerCode" jdbcType="VARCHAR" property="sickerCode" />
+    <result column="adNum" jdbcType="VARCHAR" property="adNum" />
+    <result column="count" jdbcType="INTEGER" property="count" />
+    <result column="prescribeNum" jdbcType="VARCHAR" property="prescribeNum" />
+    <result column="createType" jdbcType="TINYINT" property="createType" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, codeIdFk, udiCodoe, sickerCode, adNum, `count`, prescribeNum, createType, createTime,
+    `createUser`, updateTime, remark
+  </sql>
+</mapper>
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
new file mode 100644
index 000000000..e298718c1
--- /dev/null
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
@@ -0,0 +1,39 @@
+<?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="com.glxp.api.dao.inout.IoSplitCodeMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoSplitCodeEntity">
+    <!--@mbg.generated-->
+    <!--@Table io_split_code-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="errUdiCode" jdbcType="VARCHAR" property="errUdiCode" />
+    <result column="orderId" jdbcType="VARCHAR" property="orderId" />
+    <result column="action" jdbcType="VARCHAR" property="action" />
+    <result column="relId" jdbcType="BIGINT" property="relId" />
+    <result column="nameCode" jdbcType="VARCHAR" property="nameCode" />
+    <result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
+    <result column="produceDate" jdbcType="VARCHAR" property="produceDate" />
+    <result column="expireDate" jdbcType="VARCHAR" property="expireDate" />
+    <result column="serialNo" jdbcType="VARCHAR" property="serialNo" />
+    <result column="supId" jdbcType="BIGINT" property="supId" />
+    <result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
+    <result column="invCode" jdbcType="VARCHAR" property="invCode" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="productType" jdbcType="TINYINT" property="productType" />
+    <result column="splitType" jdbcType="TINYINT" property="splitType" />
+    <result column="scanCount" jdbcType="INTEGER" property="scanCount" />
+    <result column="totalCount" jdbcType="INTEGER" property="totalCount" />
+    <result column="remainCount" jdbcType="INTEGER" property="remainCount" />
+    <result column="inBactchNo" jdbcType="VARCHAR" property="inBactchNo" />
+    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, errUdiCode, orderId, `action`, relId, nameCode, batchNo, produceDate, expireDate,
+    serialNo, supId, deptCode, invCode, warehouseCode, productType, splitType, scanCount,
+    totalCount, remainCount, inBactchNo, createTime, `createUser`, updateTime, remark
+  </sql>
+</mapper>
diff --git a/src/main/resources/mybatis/mapper/thrsys/BasicInsChdrugMapper.xml b/src/main/resources/mybatis/mapper/thrsys/BasicInsChdrugMapper.xml
new file mode 100644
index 000000000..83b14dad5
--- /dev/null
+++ b/src/main/resources/mybatis/mapper/thrsys/BasicInsChdrugMapper.xml
@@ -0,0 +1,17 @@
+<?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="com.glxp.api.dao.thrsys.BasicInsChdrugMapper">
+    <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThrInsChDrugFeeRequest"
+            resultType="com.glxp.api.entity.thrsys.BasicInsChdrugEntity">
+        SELECT basic_ins_chdrug.*
+        FROM basic_ins_chdrug
+        <where>
+            <if test="herbName != '' and herbName != null">
+                AND herbName LIKE concat('%', #{herbName}, '%')
+            </if>
+            <if test="medCatalogCode != '' and medCatalogCode != null">
+                AND medCatalogCode LIKE concat('%', #{medCatalogCode}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>
diff --git a/src/main/resources/mybatis/mapper/thrsys/BasicInsDrugMapper.xml b/src/main/resources/mybatis/mapper/thrsys/BasicInsDrugMapper.xml
new file mode 100644
index 000000000..2d9f79c89
--- /dev/null
+++ b/src/main/resources/mybatis/mapper/thrsys/BasicInsDrugMapper.xml
@@ -0,0 +1,23 @@
+<?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="com.glxp.api.dao.thrsys.BasicInsDrugMapper">
+    <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThrInsDrugFeeRequest"
+            resultType="com.glxp.api.entity.thrsys.BasicInsDrugEntity">
+        SELECT basic_ins_drug.*
+        FROM basic_ins_drug
+        <where>
+            <if test="tradeName != '' and tradeName != null">
+                AND tradeName LIKE concat('%', #{tradeName}, '%')
+            </if>
+            <if test="medCatalogCode != '' and medCatalogCode != null">
+                AND medCatalogCode LIKE concat('%', #{medCatalogCode}, '%')
+            </if>
+            <if test="genericNum != '' and genericNum != null">
+                AND genericNum LIKE concat('%', #{genericNum}, '%')
+            </if>
+            <if test="genericName != '' and genericName != null">
+                AND genericName LIKE concat('%', #{genericName}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>
diff --git a/src/main/resources/mybatis/mapper/thrsys/BasicInsMaterialMapper.xml b/src/main/resources/mybatis/mapper/thrsys/BasicInsMaterialMapper.xml
new file mode 100644
index 000000000..b0b9d4fb9
--- /dev/null
+++ b/src/main/resources/mybatis/mapper/thrsys/BasicInsMaterialMapper.xml
@@ -0,0 +1,17 @@
+<?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="com.glxp.api.dao.thrsys.BasicInsMaterialMapper">
+    <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest"
+            resultType="com.glxp.api.entity.thrsys.BasicInsMaterialEntity">
+        SELECT basic_ins_material.*
+        FROM basic_ins_material
+        <where>
+            <if test="consumableName != '' and consumableName != null">
+                AND consumableName LIKE concat('%', #{consumableName}, '%')
+            </if>
+            <if test="medCatalogCode != '' and medCatalogCode != null">
+                AND medCatalogCode LIKE concat('%', #{medCatalogCode}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 5c22f6ed7..8625200b1 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -3386,14 +3386,26 @@ CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'diagnosisLivePath',
                          'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''诊断照片''',
                          1);
 
-INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394116, 'DECPSG', '设备产品申购', NULL, 2, 1, NULL, '1', NULL, '2023-11-14 18:14:44', NULL, 2, 3, 'DECGJH', NULL, NULL);
-INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394117, 'DECGJH', '设备采购计划', NULL, 3, 1, NULL, '1', NULL, '2023-11-14 18:14:34', NULL, 2, 1, 'DECGDD', NULL, NULL);
-INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394118, 'DECGDD', '设备采购订单', NULL, 5, 1, NULL, '1', NULL, '2023-11-14 18:14:22', NULL, 2, 2, NULL, NULL, NULL);
+INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`,
+                                        `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`,
+                                        `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`)
+VALUES (1724370174626394116, 'DECPSG', '设备产品申购', NULL, 2, 1, NULL, '1', NULL, '2023-11-14 18:14:44', NULL, 2, 3,
+        'DECGJH', NULL, NULL);
+INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`,
+                                        `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`,
+                                        `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`)
+VALUES (1724370174626394117, 'DECGJH', '设备采购计划', NULL, 3, 1, NULL, '1', NULL, '2023-11-14 18:14:34', NULL, 2, 1,
+        'DECGDD', NULL, NULL);
+INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`,
+                                        `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`,
+                                        `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`)
+VALUES (1724370174626394118, 'DECGDD', '设备采购订单', NULL, 5, 1, NULL, '1', NULL, '2023-11-14 18:14:22', NULL, 2, 2, NULL,
+        NULL, NULL);
 
 CALL Pro_Temp_ColumnWork('device_repair', 'repairUserId', 'bigint DEFAULT NULL COMMENT''报修人id''', 1);
 
 
-ALTER TABLE  device_plan_detail_item
+ALTER TABLE device_plan_detail_item
     DROP PRIMARY KEY,
     ADD PRIMARY KEY (`planId`, `productId`, `itemCode`, `deviceCode`) USING BTREE;
 
@@ -3401,218 +3413,285 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceUpkeep',
                          ' tinyint  NULL DEFAULT NULL COMMENT ''保养单''',
                          1);
 
-INSERT IGNORE INTO sys_pdf_template(`id`, `name`, `type`, `module`, `param`, `path`, `rowCount`, `qrcodeCount`, `remark`, `create_time`, `update_time`, `jrxmlPath`,
-                             `bussinessType`, `bussinessStatus`) VALUES (4, '设备标签模板', 2, 0, '', '7bdc497e-b0e4-444d-be63-cc27978568ea.jasper', 10,
-                                                                         1, '', '2024-05-21 16:24:56', '2024-05-21 16:24:56', '2427d70b-2b69-483f-9a9d-7c9c4a3c688e.jrxml', NULL, NULL);
+INSERT IGNORE INTO sys_pdf_template(`id`, `name`, `type`, `module`, `param`, `path`, `rowCount`, `qrcodeCount`,
+                                    `remark`, `create_time`, `update_time`, `jrxmlPath`,
+                                    `bussinessType`, `bussinessStatus`)
+VALUES (4, '设备标签模板', 2, 0, '', '7bdc497e-b0e4-444d-be63-cc27978568ea.jasper', 10,
+        1, '', '2024-05-21 16:24:56', '2024-05-21 16:24:56', '2427d70b-2b69-483f-9a9d-7c9c4a3c688e.jrxml', NULL, NULL);
 
 
-CALL Pro_Temp_ColumnWork('device_plan', 'planBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''计划单号''', 1);
-CALL Pro_Temp_ColumnWork('device_check', 'taskBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''巡检任务单号''', 1);
-CALL Pro_Temp_ColumnWork('device_repair_apply', 'repairApplyBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''报修单号''', 1);
-CALL Pro_Temp_ColumnWork('device_repair', 'repairBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修单号''', 1);
-CALL Pro_Temp_ColumnWork('device_upkeep', 'taskBillNo', 'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''保养任务单号''', 1);
-
-
-INSERT IGNORE INTO  auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`,
-                        `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-                        VALUES (3711, '询价管理', 1673, 2, 'purInquiry', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-08 17:01:50', NULL, NULL, NULL);
-
-INSERT IGNORE INTO  auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
-                        `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-                        VALUES (3712, '新增询价计划单', 3711, 1, 'purchase/purInquiry/purInquiry', 'purchase/purInquiry/purInquiry', '{\"pageType\":1}', 1, 0, 'C',
-                                '0', '0', 'purchase:purInquiry:purInquiry', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
-
-INSERT IGNORE INTO  auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
-                               `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-                            VALUES (3713, '待审核询价计划单', 3711, 2, 'purchase/purInquiry/purInquiryReviewed', 'purchase/purInquiry/purInquiryReviewed', '{\"pageType\":1}', 1, 0, 'C',
-                                    '0', '0', 'purchase:purInquiry:purInquiryReviewed', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+CALL Pro_Temp_ColumnWork('device_plan', 'planBillNo',
+                         'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''计划单号''',
+                         1);
+CALL Pro_Temp_ColumnWork('device_check', 'taskBillNo',
+                         'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''巡检任务单号''',
+                         1);
+CALL Pro_Temp_ColumnWork('device_repair_apply', 'repairApplyBillNo',
+                         'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''报修单号''',
+                         1);
+CALL Pro_Temp_ColumnWork('device_repair', 'repairBillNo',
+                         'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修单号''',
+                         1);
+CALL Pro_Temp_ColumnWork('device_upkeep', 'taskBillNo',
+                         'varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''保养任务单号''',
+                         1);
 
-INSERT IGNORE INTO  auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
-                               `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-                                VALUES (3714, '已审核询价计划单', 3711, 3, 'purchase/purInquiry/purInquiryFinish', 'purchase/purInquiry/purInquiryFinish', '{\"pageType\":1}', 1, 0, 'C',
-                                        '0', '0', 'purchase:purInquiry:purInquiryFinish', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
 
-INSERT IGNORE INTO  auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
-                               `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-                        VALUES (3715, '待审核询价报价单', 3711, 5, 'purchase/purInquiryOffer/purInquiryOfferReviewed', 'purchase/purInquiryOffer/purInquiryOfferReviewed', '{\"pageType\":1}', 1, 0, 'C',
-                                '0', '0', 'purchase:purInquiryOffer:purInquiryOfferReviewed', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
-INSERT IGNORE INTO  auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
-                               `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-                            VALUES (3716, '已审核询价报价单', 3711, 6, 'purchase/purInquiryOffer/purInquiryOfferFinish', 'purchase/purInquiryOffer/purInquiryOfferFinish', '{\"pageType\":1}', 1, 0, 'C',
-                                    '0', '0', 'purchase:purInquiryOffer:purInquiryOfferFinish', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                              `is_frame`, `is_cache`,
+                              `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
+                              `update_by`, `update_time`, `remark`)
+VALUES (3711, '询价管理', 1673, 2, 'purInquiry', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-08 17:01:50',
+        NULL, NULL, NULL);
 
-INSERT IGNORE INTO  auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
-                               `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-                                VALUES (3717, '待报价询价报价单', 3711, 4, 'purchase/purInquiryOffer/purInquiryOffer', 'purchase/purInquiryOffer/purInquiryOffer', '{\"pageType\":1}', 1, 0, 'C',
-                                        '0', '0', 'purchase:purInquiryOffer:purInquiryOffer', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                              `is_frame`, `is_cache`, `menu_type`,
+                              `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
+                              `update_time`, `remark`)
+VALUES (3712, '新增询价计划单', 3711, 1, 'purchase/purInquiry/purInquiry', 'purchase/purInquiry/purInquiry',
+        '{\"pageType\":1}', 1, 0, 'C',
+        '0', '0', 'purchase:purInquiry:purInquiry', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+
+INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                              `is_frame`, `is_cache`, `menu_type`,
+                              `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
+                              `update_time`, `remark`)
+VALUES (3713, '待审核询价计划单', 3711, 2, 'purchase/purInquiry/purInquiryReviewed', 'purchase/purInquiry/purInquiryReviewed',
+        '{\"pageType\":1}', 1, 0, 'C',
+        '0', '0', 'purchase:purInquiry:purInquiryReviewed', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+
+INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                              `is_frame`, `is_cache`, `menu_type`,
+                              `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
+                              `update_time`, `remark`)
+VALUES (3714, '已审核询价计划单', 3711, 3, 'purchase/purInquiry/purInquiryFinish', 'purchase/purInquiry/purInquiryFinish',
+        '{\"pageType\":1}', 1, 0, 'C',
+        '0', '0', 'purchase:purInquiry:purInquiryFinish', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+
+INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                              `is_frame`, `is_cache`, `menu_type`,
+                              `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
+                              `update_time`, `remark`)
+VALUES (3715, '待审核询价报价单', 3711, 5, 'purchase/purInquiryOffer/purInquiryOfferReviewed',
+        'purchase/purInquiryOffer/purInquiryOfferReviewed', '{\"pageType\":1}', 1, 0, 'C',
+        '0', '0', 'purchase:purInquiryOffer:purInquiryOfferReviewed', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL,
+        NULL);
+INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                              `is_frame`, `is_cache`, `menu_type`,
+                              `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
+                              `update_time`, `remark`)
+VALUES (3716, '已审核询价报价单', 3711, 6, 'purchase/purInquiryOffer/purInquiryOfferFinish',
+        'purchase/purInquiryOffer/purInquiryOfferFinish', '{\"pageType\":1}', 1, 0, 'C',
+        '0', '0', 'purchase:purInquiryOffer:purInquiryOfferFinish', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL,
+        NULL);
+
+INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                              `is_frame`, `is_cache`, `menu_type`,
+                              `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
+                              `update_time`, `remark`)
+VALUES (3717, '待报价询价报价单', 3711, 4, 'purchase/purInquiryOffer/purInquiryOffer',
+        'purchase/purInquiryOffer/purInquiryOffer', '{\"pageType\":1}', 1, 0, 'C',
+        '0', '0', 'purchase:purInquiryOffer:purInquiryOffer', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
 
-INSERT IGNORE INTO  sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`)
+INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`,
+                                            `updateUser`, `updateTime`)
 VALUES ('7', 'xjjh', '询价计划单据', 7, NULL, NULL, NULL, NULL);
 
-INSERT IGNORE INTO  sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`, `updateUser`, `updateTime`)
+INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`,
+                                            `updateUser`, `updateTime`)
 VALUES ('8', 'xjbj', '询价报价单据', 8, NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for pur_inquiry
 -- ----------------------------
-CREATE TABLE IF NOT EXISTS `pur_inquiry`  (
-                                `id` bigint(0) NOT NULL AUTO_INCREMENT,
-                                `billNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '询价单据号',
-                                `billDate` datetime(0) NULL DEFAULT NULL COMMENT '询价发起日期',
-                                `status` tinyint(0) NULL DEFAULT NULL COMMENT '状态（1.草稿，2.未审核，3.已审核,4.已拒绝）',
-                                `billType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-                                `remark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '询价说明',
-                                `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '当前仓库',
-                                `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属部门',
-                                `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
-                                `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-                                `auditUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核人',
-                                `auditTime` datetime(0) NULL DEFAULT NULL COMMENT '审核时间',
-                                `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
-                                `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-                                `auditRemark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核说明',
-                                `targetInvCode` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '目标仓库',
-                                `targetDeptCode` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '目标部门',
-                                `planBillNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成采购计划单据号',
-                                `generatePlan` tinyint(0) NULL DEFAULT NULL COMMENT '是否已生成采购计划',
-                                `emergency` tinyint(0) NULL DEFAULT NULL COMMENT '紧急情况',
-                                `arrivalTime` datetime(0) NULL DEFAULT NULL COMMENT '期望到货时间',
-                                `approvalFlowId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批表主键(关联审批流程主表)',
-                                `pageType` int(0) NOT NULL DEFAULT 1 COMMENT '1:业务管理；2：设备管理',
-                                `validUntil` datetime(0) NULL DEFAULT NULL COMMENT '询价截止时间',
-                                `supIds` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ids',
-                                PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 97 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '询价业务' ROW_FORMAT = Dynamic;
+CREATE TABLE IF NOT EXISTS `pur_inquiry`
+(
+    `id`             bigint(0)                                                     NOT NULL AUTO_INCREMENT,
+    `billNo`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '询价单据号',
+    `billDate`       datetime(0)                                                   NULL     DEFAULT NULL COMMENT '询价发起日期',
+    `status`         tinyint(0)                                                    NULL     DEFAULT NULL COMMENT '状态（1.草稿，2.未审核，3.已审核,4.已拒绝）',
+    `billType`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL,
+    `remark`         varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '询价说明',
+    `invCode`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '当前仓库',
+    `deptCode`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '所属部门',
+    `createUser`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '创建人',
+    `createTime`     datetime(0)                                                   NULL     DEFAULT NULL COMMENT '创建时间',
+    `auditUser`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '审核人',
+    `auditTime`      datetime(0)                                                   NULL     DEFAULT NULL COMMENT '审核时间',
+    `updateUser`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '更新人',
+    `updateTime`     datetime(0)                                                   NULL     DEFAULT NULL COMMENT '更新时间',
+    `auditRemark`    varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '审核说明',
+    `targetInvCode`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL     DEFAULT NULL COMMENT '目标仓库',
+    `targetDeptCode` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL     DEFAULT NULL COMMENT '目标部门',
+    `planBillNo`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '生成采购计划单据号',
+    `generatePlan`   tinyint(0)                                                    NULL     DEFAULT NULL COMMENT '是否已生成采购计划',
+    `emergency`      tinyint(0)                                                    NULL     DEFAULT NULL COMMENT '紧急情况',
+    `arrivalTime`    datetime(0)                                                   NULL     DEFAULT NULL COMMENT '期望到货时间',
+    `approvalFlowId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL     DEFAULT NULL COMMENT '审批表主键(关联审批流程主表)',
+    `pageType`       int(0)                                                        NOT NULL DEFAULT 1 COMMENT '1:业务管理；2：设备管理',
+    `validUntil`     datetime(0)                                                   NULL     DEFAULT NULL COMMENT '询价截止时间',
+    `supIds`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '供应商ids',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 97
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '询价业务'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for pur_inquiry_item
 -- ----------------------------
-CREATE TABLE IF NOT EXISTS `pur_inquiry_item`  (
-                                     `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-                                     `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询价编号',
-                                     `count` int(0) NULL DEFAULT NULL COMMENT '询价数量',
-                                     `price` decimal(10, 2) NULL DEFAULT NULL COMMENT '期望单价',
-                                     `totalPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '期望总价',
-                                     `attachmentPath` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '询价附件的路径或URL（如产品规格书、图纸等）',
-                                     `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '说明',
-                                     `productId` bigint(0) NULL DEFAULT NULL COMMENT '产品编码',
-                                     `productUniqueId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '产品唯一id uniqueId',
-                                     `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '最小销售标识',
-                                     `batchNo` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '批次号',
-                                     `productName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '产品名称',
-                                     `productCompany` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '生产厂家',
-                                     `produceDate` date NULL DEFAULT NULL COMMENT '生产日期',
-                                     `expireDate` date NULL DEFAULT NULL COMMENT '过期时间',
-                                     `zczbhhzbapzbh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '注册证/备案号',
-                                     `ggxh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '规格型号',
-                                     `packRatio` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '包装级别',
-                                     `measname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '单位',
-                                     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1791362555050999838 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_as_cs COMMENT = '询价业务明细表' ROW_FORMAT = Dynamic;
+CREATE TABLE IF NOT EXISTS `pur_inquiry_item`
+(
+    `id`              bigint(0)                                                     NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `orderIdFk`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询价编号',
+    `count`           int(0)                                                        NULL DEFAULT NULL COMMENT '询价数量',
+    `price`           decimal(10, 2)                                                NULL DEFAULT NULL COMMENT '期望单价',
+    `totalPrice`      decimal(10, 2)                                                NULL DEFAULT NULL COMMENT '期望总价',
+    `attachmentPath`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '询价附件的路径或URL（如产品规格书、图纸等）',
+    `remark`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '说明',
+    `productId`       bigint(0)                                                     NULL DEFAULT NULL COMMENT '产品编码',
+    `productUniqueId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '产品唯一id uniqueId',
+    `nameCode`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '最小销售标识',
+    `batchNo`         varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NULL DEFAULT NULL COMMENT '批次号',
+    `productName`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '产品名称',
+    `productCompany`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '生产厂家',
+    `produceDate`     date                                                          NULL DEFAULT NULL COMMENT '生产日期',
+    `expireDate`      date                                                          NULL DEFAULT NULL COMMENT '过期时间',
+    `zczbhhzbapzbh`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '注册证/备案号',
+    `ggxh`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '规格型号',
+    `packRatio`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '包装级别',
+    `measname`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '单位',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1791362555050999838
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_as_cs COMMENT = '询价业务明细表'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for pur_inquiry_item_detail
 -- ----------------------------
-CREATE TABLE IF NOT EXISTS `pur_inquiry_item_detail`  (
-                                            `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-                                            `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询价编号',
-                                            `orderItemIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询明细价id',
-                                            `supNumber` int(0) NOT NULL COMMENT '供应商报价第几次',
-                                            `supId` bigint(0) NOT NULL COMMENT '供应商id',
-                                            `supName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商名称',
-                                            `supPerson` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人姓名',
-                                            `supPhone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人电话',
-                                            `supEmail` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人电子邮件',
-                                            `supFilePath` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商附件的路径或URL',
-                                            `supCount` int(0) NULL DEFAULT NULL COMMENT '供应商报价数量',
-                                            `supPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '供应商报价单价',
-                                            `supTotalPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '供应商报价总价',
-                                            `supRemark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '说明',
-                                            `accord` int(0) NULL DEFAULT NULL COMMENT '是否符合 1 符合 ；0 不符合',
-                                            `adopt` int(0) NULL DEFAULT NULL COMMENT '是否采纳 1 采纳 ；0 不采纳',
-                                            PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 235 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_as_cs COMMENT = '询价业务明细详情表' ROW_FORMAT = Dynamic;
+CREATE TABLE IF NOT EXISTS `pur_inquiry_item_detail`
+(
+    `id`            bigint(0)                                                     NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `orderIdFk`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询价编号',
+    `orderItemIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询明细价id',
+    `supNumber`     int(0)                                                        NOT NULL COMMENT '供应商报价第几次',
+    `supId`         bigint(0)                                                     NOT NULL COMMENT '供应商id',
+    `supName`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商名称',
+    `supPerson`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人姓名',
+    `supPhone`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人电话',
+    `supEmail`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人电子邮件',
+    `supFilePath`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商附件的路径或URL',
+    `supCount`      int(0)                                                        NULL DEFAULT NULL COMMENT '供应商报价数量',
+    `supPrice`      decimal(10, 2)                                                NULL DEFAULT NULL COMMENT '供应商报价单价',
+    `supTotalPrice` decimal(10, 2)                                                NULL DEFAULT NULL COMMENT '供应商报价总价',
+    `supRemark`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '说明',
+    `accord`        int(0)                                                        NULL DEFAULT NULL COMMENT '是否符合 1 符合 ；0 不符合',
+    `adopt`         int(0)                                                        NULL DEFAULT NULL COMMENT '是否采纳 1 采纳 ；0 不采纳',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 235
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_as_cs COMMENT = '询价业务明细详情表'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for pur_inquiry_offer
 -- ----------------------------
-CREATE TABLE IF NOT EXISTS `pur_inquiry_offer`  (
-                                      `id` bigint(0) NOT NULL AUTO_INCREMENT,
-                                      `billNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '询价单据号',
-                                      `billDate` datetime(0) NULL DEFAULT NULL COMMENT '询价发起日期',
-                                      `status` tinyint(0) NULL DEFAULT NULL COMMENT '状态（1.草稿，2.未审核，3.已审核,4.已拒绝）',
-                                      `billType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-                                      `remark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '询价说明',
-                                      `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '当前仓库',
-                                      `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属部门',
-                                      `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
-                                      `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-                                      `auditUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核人',
-                                      `auditTime` datetime(0) NULL DEFAULT NULL COMMENT '审核时间',
-                                      `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
-                                      `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-                                      `auditRemark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '审核说明',
-                                      `targetInvCode` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '目标仓库',
-                                      `targetDeptCode` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '目标部门',
-                                      `planBillNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生成采购计划单据号',
-                                      `generatePlan` tinyint(0) NULL DEFAULT NULL COMMENT '是否已生成采购计划',
-                                      `emergency` tinyint(0) NULL DEFAULT NULL COMMENT '紧急情况',
-                                      `arrivalTime` datetime(0) NULL DEFAULT NULL COMMENT '期望到货时间',
-                                      `approvalFlowId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '审批表主键(关联审批流程主表)',
-                                      `pageType` int(0) NOT NULL DEFAULT 1 COMMENT '1:业务管理；2：设备管理',
-                                      `validUntil` datetime(0) NULL DEFAULT NULL COMMENT '询价截止时间',
-                                      `supIds` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ids',
-                                      PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 97 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '询价报价业务' ROW_FORMAT = Dynamic;
+CREATE TABLE IF NOT EXISTS `pur_inquiry_offer`
+(
+    `id`             bigint(0)                                                     NOT NULL AUTO_INCREMENT,
+    `billNo`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '询价单据号',
+    `billDate`       datetime(0)                                                   NULL     DEFAULT NULL COMMENT '询价发起日期',
+    `status`         tinyint(0)                                                    NULL     DEFAULT NULL COMMENT '状态（1.草稿，2.未审核，3.已审核,4.已拒绝）',
+    `billType`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL,
+    `remark`         varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '询价说明',
+    `invCode`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '当前仓库',
+    `deptCode`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '所属部门',
+    `createUser`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '创建人',
+    `createTime`     datetime(0)                                                   NULL     DEFAULT NULL COMMENT '创建时间',
+    `auditUser`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '审核人',
+    `auditTime`      datetime(0)                                                   NULL     DEFAULT NULL COMMENT '审核时间',
+    `updateUser`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '更新人',
+    `updateTime`     datetime(0)                                                   NULL     DEFAULT NULL COMMENT '更新时间',
+    `auditRemark`    varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '审核说明',
+    `targetInvCode`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL     DEFAULT NULL COMMENT '目标仓库',
+    `targetDeptCode` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL     DEFAULT NULL COMMENT '目标部门',
+    `planBillNo`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '生成采购计划单据号',
+    `generatePlan`   tinyint(0)                                                    NULL     DEFAULT NULL COMMENT '是否已生成采购计划',
+    `emergency`      tinyint(0)                                                    NULL     DEFAULT NULL COMMENT '紧急情况',
+    `arrivalTime`    datetime(0)                                                   NULL     DEFAULT NULL COMMENT '期望到货时间',
+    `approvalFlowId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL     DEFAULT NULL COMMENT '审批表主键(关联审批流程主表)',
+    `pageType`       int(0)                                                        NOT NULL DEFAULT 1 COMMENT '1:业务管理；2：设备管理',
+    `validUntil`     datetime(0)                                                   NULL     DEFAULT NULL COMMENT '询价截止时间',
+    `supIds`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL     DEFAULT NULL COMMENT '供应商ids',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 97
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '询价报价业务'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for pur_inquiry_offer_item
 -- ----------------------------
-CREATE TABLE IF NOT EXISTS `pur_inquiry_offer_item`  (
-                                           `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-                                           `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询价编号',
-                                           `count` int(0) NULL DEFAULT NULL COMMENT '询价数量',
-                                           `price` decimal(10, 2) NULL DEFAULT NULL COMMENT '期望单价',
-                                           `totalPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '期望总价',
-                                           `attachmentPath` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '询价附件的路径或URL（如产品规格书、图纸等）',
-                                           `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '说明',
-                                           `productId` bigint(0) NULL DEFAULT NULL COMMENT '产品编码',
-                                           `productUniqueId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '产品唯一id uniqueId',
-                                           `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '最小销售标识',
-                                           `batchNo` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '批次号',
-                                           `productName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '产品名称',
-                                           `productCompany` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '生产厂家',
-                                           `produceDate` date NULL DEFAULT NULL COMMENT '生产日期',
-                                           `expireDate` date NULL DEFAULT NULL COMMENT '过期时间',
-                                           `zczbhhzbapzbh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '注册证/备案号',
-                                           `ggxh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '规格型号',
-                                           `packRatio` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '包装级别',
-                                           `measname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '单位',
-                                           PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1791362555050999838 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_as_cs COMMENT = '询价报价业务明细表' ROW_FORMAT = Dynamic;
+CREATE TABLE IF NOT EXISTS `pur_inquiry_offer_item`
+(
+    `id`              bigint(0)                                                     NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `orderIdFk`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询价编号',
+    `count`           int(0)                                                        NULL DEFAULT NULL COMMENT '询价数量',
+    `price`           decimal(10, 2)                                                NULL DEFAULT NULL COMMENT '期望单价',
+    `totalPrice`      decimal(10, 2)                                                NULL DEFAULT NULL COMMENT '期望总价',
+    `attachmentPath`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '询价附件的路径或URL（如产品规格书、图纸等）',
+    `remark`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '说明',
+    `productId`       bigint(0)                                                     NULL DEFAULT NULL COMMENT '产品编码',
+    `productUniqueId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '产品唯一id uniqueId',
+    `nameCode`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '最小销售标识',
+    `batchNo`         varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NULL DEFAULT NULL COMMENT '批次号',
+    `productName`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '产品名称',
+    `productCompany`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '生产厂家',
+    `produceDate`     date                                                          NULL DEFAULT NULL COMMENT '生产日期',
+    `expireDate`      date                                                          NULL DEFAULT NULL COMMENT '过期时间',
+    `zczbhhzbapzbh`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '注册证/备案号',
+    `ggxh`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '规格型号',
+    `packRatio`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '包装级别',
+    `measname`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '单位',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1791362555050999838
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_as_cs COMMENT = '询价报价业务明细表'
+  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for pur_inquiry_offer_item_detail
 -- ----------------------------
-CREATE TABLE IF NOT EXISTS `pur_inquiry_offer_item_detail`  (
-                                                  `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-                                                  `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询价编号',
-                                                  `orderItemIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询明细价id',
-                                                  `supNumber` int(0) NOT NULL COMMENT '供应商报价第几次',
-                                                  `supId` bigint(0) NOT NULL COMMENT '供应商id',
-                                                  `supName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商名称',
-                                                  `supPerson` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人姓名',
-                                                  `supPhone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人电话',
-                                                  `supEmail` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人电子邮件',
-                                                  `supFilePath` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商附件的路径或URL',
-                                                  `supCount` int(0) NULL DEFAULT NULL COMMENT '供应商报价数量',
-                                                  `supPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '供应商报价单价',
-                                                  `supTotalPrice` decimal(10, 2) NULL DEFAULT NULL COMMENT '供应商报价总价',
-                                                  `supRemark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '说明',
-                                                  `accord` int(0) NULL DEFAULT NULL COMMENT '是否符合 1 符合 ；0 不符合',
-                                                  `adopt` int(0) NULL DEFAULT NULL COMMENT '是否采纳 1 采纳 ；0 不采纳',
-                                                  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 250 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_as_cs COMMENT = '询价报价业务明细详情表' ROW_FORMAT = Dynamic;
+CREATE TABLE IF NOT EXISTS `pur_inquiry_offer_item_detail`
+(
+    `id`            bigint(0)                                                     NOT NULL AUTO_INCREMENT COMMENT 'ID',
+    `orderIdFk`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询价编号',
+    `orderItemIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT '关联询明细价id',
+    `supNumber`     int(0)                                                        NOT NULL COMMENT '供应商报价第几次',
+    `supId`         bigint(0)                                                     NOT NULL COMMENT '供应商id',
+    `supName`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商名称',
+    `supPerson`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人姓名',
+    `supPhone`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人电话',
+    `supEmail`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '供应商联系人电子邮件',
+    `supFilePath`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商附件的路径或URL',
+    `supCount`      int(0)                                                        NULL DEFAULT NULL COMMENT '供应商报价数量',
+    `supPrice`      decimal(10, 2)                                                NULL DEFAULT NULL COMMENT '供应商报价单价',
+    `supTotalPrice` decimal(10, 2)                                                NULL DEFAULT NULL COMMENT '供应商报价总价',
+    `supRemark`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '说明',
+    `accord`        int(0)                                                        NULL DEFAULT NULL COMMENT '是否符合 1 符合 ；0 不符合',
+    `adopt`         int(0)                                                        NULL DEFAULT NULL COMMENT '是否采纳 1 采纳 ；0 不采纳',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 250
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_as_cs COMMENT = '询价报价业务明细详情表'
+  ROW_FORMAT = Dynamic;
 
 
 CALL Pro_Temp_ColumnWork('pur_apply_detail', 'measname',
@@ -3622,85 +3701,127 @@ CALL Pro_Temp_ColumnWork('pur_apply_detail', 'measname',
 -- ----------------------------
 -- Table structure for pur_apply_argument
 -- ----------------------------
-CREATE TABLE IF NOT EXISTS `pur_apply_argument`  (
-                                       `id` bigint(0) NOT NULL AUTO_INCREMENT,
-                                       `orderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单外键',
-                                       `orderDetailIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单详情外键',
-                                       `applyBillNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申领单据号',
-                                       `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '当前仓库',
-                                       `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属部门',
-                                       `deptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属部门名字',
-                                       `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
-                                       `createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-                                       `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
-                                       `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-                                       `productId` bigint(0) NULL DEFAULT NULL COMMENT '产品ID',
-                                       `productName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品名称',
-                                       `count` int(0) NULL DEFAULT NULL COMMENT '数量',
-                                       `measname` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL DEFAULT NULL COMMENT '单位',
-                                       `mainParam` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL COMMENT '配置要求及主要技术参数',
-                                       `applicationReason` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL COMMENT '申请理由',
-                                       `benefitPrediction` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL COMMENT '效益预测',
-                                       `supportCondition` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NULL COMMENT '配套条件',
-                                       `supportPerson` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '使用科室人员配备情况',
-                                       `maintenanceForce` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '维修技术力量的保证或维修途径',
-                                       `fundSource` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '资金来源',
-                                       `feasibility` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '可行性论证',
-                                       `argStatus` int(0) NULL DEFAULT 0 COMMENT '论证状态',
-                                       `createName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人昵称',
-                                       PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 91 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
-
-INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`,
-                        `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
-                        `update_time`, `remark`)
-                        VALUES (3718, '论证管理', 1703, 0, 'purApplyArgument', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL,
-                                '超级用户', '2023-02-08 17:01:50', NULL, NULL, NULL);
-INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`,
-                       `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-                       VALUES (3719, '论证明细', 3718, 1, 'purchase/purApplyArgument/purApplyArgument', 'purchase/purApplyArgument/purApplyArgument', '{\"pageType\":2}', 1, 0, 'C',
-                               '0', '0', 'purchase:purApplyArgument:purApplyArgument', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
-
-INSERT IGNORE INTO  sys_pdf_template(`id`, `name`, `type`, `module`, `param`, `path`, `rowCount`, `qrcodeCount`, `remark`, `create_time`, `update_time`, `jrxmlPath`,
-                                     `bussinessType`, `bussinessStatus`) VALUES (6, '设备申购论证单据模板', 2, 0, '', '', 10, 1, '', '2024-05-21 17:04:11', '2024-05-21 17:04:11', '', NULL, NULL);
-
-
-
-INSERT IGNORE INTO  sys_pdf_template_relevance_statemen(`id`, `templateId`, `customerId`, `adminId`, `moduleId`, `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
-                                                        `modelKey`, `updateTime`) VALUES (7, 33, 110, 0, NULL, '设备论证单据打印', NULL, NULL, NULL, NULL, 'reportForms', NULL);
+CREATE TABLE IF NOT EXISTS `pur_apply_argument`
+(
+    `id`                bigint(0)                                                     NOT NULL AUTO_INCREMENT,
+    `orderIdFk`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单外键',
+    `orderDetailIdFk`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '订单详情外键',
+    `applyBillNo`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '申领单据号',
+    `invCode`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '当前仓库',
+    `deptCode`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属部门',
+    `deptName`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属部门名字',
+    `createUser`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
+    `createTime`        datetime(0)                                                   NULL DEFAULT NULL COMMENT '创建时间',
+    `updateUser`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
+    `updateTime`        datetime(0)                                                   NULL DEFAULT NULL COMMENT '更新时间',
+    `productId`         bigint(0)                                                     NULL DEFAULT NULL COMMENT '产品ID',
+    `productName`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品名称',
+    `count`             int(0)                                                        NULL DEFAULT NULL COMMENT '数量',
+    `measname`          varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs  NULL DEFAULT NULL COMMENT '单位',
+    `mainParam`         text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs         NULL COMMENT '配置要求及主要技术参数',
+    `applicationReason` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs         NULL COMMENT '申请理由',
+    `benefitPrediction` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs         NULL COMMENT '效益预测',
+    `supportCondition`  text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs         NULL COMMENT '配套条件',
+    `supportPerson`     text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci         NULL COMMENT '使用科室人员配备情况',
+    `maintenanceForce`  text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci         NULL COMMENT '维修技术力量的保证或维修途径',
+    `fundSource`        text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci         NULL COMMENT '资金来源',
+    `feasibility`       text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci         NULL COMMENT '可行性论证',
+    `argStatus`         int(0)                                                        NULL DEFAULT 0 COMMENT '论证状态',
+    `createName`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人昵称',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 91
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+
+INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                             `is_frame`,
+                             `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
+                             `update_by`,
+                             `update_time`, `remark`)
+VALUES (3718, '论证管理', 1703, 0, 'purApplyArgument', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL,
+        '超级用户', '2023-02-08 17:01:50', NULL, NULL, NULL);
+INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
+                             `is_frame`,
+                             `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
+                             `update_by`, `update_time`, `remark`)
+VALUES (3719, '论证明细', 3718, 1, 'purchase/purApplyArgument/purApplyArgument',
+        'purchase/purApplyArgument/purApplyArgument', '{\"pageType\":2}', 1, 0, 'C',
+        '0', '0', 'purchase:purApplyArgument:purApplyArgument', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+
+INSERT IGNORE INTO sys_pdf_template(`id`, `name`, `type`, `module`, `param`, `path`, `rowCount`, `qrcodeCount`,
+                                    `remark`, `create_time`, `update_time`, `jrxmlPath`,
+                                    `bussinessType`, `bussinessStatus`)
+VALUES (6, '设备申购论证单据模板', 2, 0, '', '', 10, 1, '', '2024-05-21 17:04:11', '2024-05-21 17:04:11', '', NULL, NULL);
+
+
+
+INSERT IGNORE INTO sys_pdf_template_relevance_statemen(`id`, `templateId`, `customerId`, `adminId`, `moduleId`,
+                                                       `localAction`, `remark1`, `remark2`, `remark3`, `printType`,
+                                                       `modelKey`, `updateTime`)
+VALUES (7, 33, 110, 0, NULL, '设备论证单据打印', NULL, NULL, NULL, NULL, 'reportForms', NULL);
 
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType',
                          'tinyint    NULL DEFAULT NULL COMMENT '' 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材''', 1);
 
-CREATE TABLE IF NOT EXISTS `thr_medical_product_category` (
-                                                              `id` int NOT NULL AUTO_INCREMENT,
-                                                              `materialId` int DEFAULT NULL COMMENT '物资分类编码',
-                                                              `materialName` varchar(255) DEFAULT NULL COMMENT '物资分类的名称',
-                                                              `firstLevelCategoryCode` int DEFAULT NULL COMMENT '一级分类的编码',
-                                                              `firstLevelCategoryName` varchar(255) DEFAULT NULL COMMENT '一级分类的名称',
-                                                              `secondLevelCategoryCode` int DEFAULT NULL COMMENT '二级分类的编码',
-                                                              `secondLevelCategoryName` varchar(255) DEFAULT NULL COMMENT '二级分类的名称',
-                                                              `managementType` int DEFAULT NULL COMMENT '管理类别 ',
-                                                              `materialCode` varchar(255) DEFAULT NULL COMMENT '标识',
-                                                              PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=160 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='医疗产品分类标识';
+CREATE TABLE IF NOT EXISTS `thr_medical_product_category`
+(
+    `id`                      int NOT NULL AUTO_INCREMENT,
+    `materialId`              int          DEFAULT NULL COMMENT '物资分类编码',
+    `materialName`            varchar(255) DEFAULT NULL COMMENT '物资分类的名称',
+    `firstLevelCategoryCode`  int          DEFAULT NULL COMMENT '一级分类的编码',
+    `firstLevelCategoryName`  varchar(255) DEFAULT NULL COMMENT '一级分类的名称',
+    `secondLevelCategoryCode` int          DEFAULT NULL COMMENT '二级分类的编码',
+    `secondLevelCategoryName` varchar(255) DEFAULT NULL COMMENT '二级分类的名称',
+    `managementType`          int          DEFAULT NULL COMMENT '管理类别 ',
+    `materialCode`            varchar(255) DEFAULT NULL COMMENT '标识',
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 160
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT ='医疗产品分类标识';
 
 CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode',
                          'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''',
                          1);
 
-INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
+                                               `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                               `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                               `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                               `dataFuc`, `isShowXx`)
+VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireScanCode',
                          'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''',
                          1);
 
 
-INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
+                                               `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                               `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                               `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                               `dataFuc`, `isShowXx`)
+VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
-INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41780, 94, '2', 1, 'corpName', '供应商', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41781, 94, '1', 1, 'corpName', '供应商', 'text', NULL, NULL, NULL, 160, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
+                                               `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                               `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                               `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                               `dataFuc`, `isShowXx`)
+VALUES (41780, 94, '2', 1, 'corpName', '供应商', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
+                                               `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                               `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                               `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                               `dataFuc`, `isShowXx`)
+VALUES (41781, 94, '1', 1, 'corpName', '供应商', 'text', NULL, NULL, NULL, 160, 1, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 CALL Pro_Temp_ColumnWork('device_repair_apply', 'livePath',
                          'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修现场照片''',
@@ -3713,11 +3834,16 @@ CALL Pro_Temp_ColumnWork('device_check_item_dict', 'updateTime',
 
 
 
-ALTER TABLE sup_evaluate MODIFY COLUMN `id` BIGINT NOT NULL;
-ALTER TABLE sup_evaluate_detail MODIFY COLUMN `id` BIGINT NOT NULL;
-ALTER TABLE sup_evaluate_plan MODIFY COLUMN `id` BIGINT NOT NULL;
-ALTER TABLE sup_evaluate_plan_detail MODIFY COLUMN `id` BIGINT NOT NULL;
-ALTER TABLE sup_evaluate_detail MODIFY COLUMN `planDetailId` BIGINT ;
+ALTER TABLE sup_evaluate
+    MODIFY COLUMN `id` BIGINT NOT NULL;
+ALTER TABLE sup_evaluate_detail
+    MODIFY COLUMN `id` BIGINT NOT NULL;
+ALTER TABLE sup_evaluate_plan
+    MODIFY COLUMN `id` BIGINT NOT NULL;
+ALTER TABLE sup_evaluate_plan_detail
+    MODIFY COLUMN `id` BIGINT NOT NULL;
+ALTER TABLE sup_evaluate_detail
+    MODIFY COLUMN `planDetailId` BIGINT;
 
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'codeCheck',
@@ -3734,16 +3860,20 @@ CALL Pro_Temp_ColumnWork('basic_sk_sicker', 'outHospTime',
                          ' datetime NULL DEFAULT NULL COMMENT ''出院时间''',
                          1);
 
-CREATE TABLE IF NOT EXISTS `sys_workplace`  (
-                                  `id` bigint NOT NULL,
-                                  `workplaceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工位名称',
-                                  `invCode` int NULL DEFAULT NULL COMMENT '所属仓库',
-                                  `remake` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
-                                  `createTime` datetime NULL DEFAULT NULL,
-                                  `updateTime` datetime NULL DEFAULT NULL,
-                                  `workplaceId` bigint NULL DEFAULT NULL COMMENT '工位编码',
-                                  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+CREATE TABLE IF NOT EXISTS `sys_workplace`
+(
+    `id`            bigint                                                        NOT NULL,
+    `workplaceName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '工位名称',
+    `invCode`       int                                                           NULL DEFAULT NULL COMMENT '所属仓库',
+    `remake`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+    `createTime`    datetime                                                      NULL DEFAULT NULL,
+    `updateTime`    datetime                                                      NULL DEFAULT NULL,
+    `workplaceId`   bigint                                                        NULL DEFAULT NULL COMMENT '工位编码',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
 
 
 CALL Pro_Temp_ColumnWork('basic_products', 'productsType',
@@ -3819,3 +3949,44 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'useLevelUnit',
 CALL Pro_Temp_ColumnWork('basic_udirel', 'useLeverCount',
                          'int NULL DEFAULT NULL COMMENT ''使用是当前层级包含计量单元数量''',
                          1);
+CALL Pro_Temp_ColumnWork('io_order', 'workPlaceCode', 'varchar(20)', 1);
+
+
+CALL Pro_Temp_ColumnWork('basic_udirel', 'payFeeCode',
+                         'varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''收费项目编码''',
+                         1);
+
+
+INSERT IGNORE INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`, `enable`, `remark`, `thirdSysFk`,
+                                          `genUnit`, `innerOrder`, `secCheckEnable`, `checkEnable`, `checkUdims`,
+                                          `checkPdaEd`, `checkPdaUn`, `checkPc`, `checkWebNew`, `checkSp`,
+                                          `checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`,
+                                          `secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`,
+                                          `supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`,
+                                          `expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`, `ullageFill`,
+                                          `scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`, `defaultSubInv`,
+                                          `defaultInv`, `orderVisibleType`, `checkCopy`, `secCheckCopy`, `originAction`,
+                                          `advanceType`, `changeEnable`, `spUse`, `preIn`, `preInBack`, `supplementAll`,
+                                          `createUser`, `createTime`, `updateUser`, `vailDispatch`, `vailGroupBuy`,
+                                          `busType`, `inStock`, `actionType`, `thrCheckEnable`, `thrCheckWebNew`,
+                                          `thrCheckPdaUn`, `thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`,
+                                          `thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`,
+                                          `checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`,
+                                          `backPreinType`, `checkPreInOrders`, `advancePreIn`, `sortNum`, `spaceOut`,
+                                          `checkReview`, `secCheckReview`, `thrCheckReview`, `checkWebNewType`,
+                                          `editType`, `inPreInBack`, `deptNoInvType`, `vailPrescribe`, `inputSick`,
+                                          `groupBuySplit`, `vailInvBatchNo`, `vailProductAttributes`, `devInType`,
+                                          `vailHcType`, `requireScanCode`, `codeCheck`)
+VALUES (1816739249285963776, 'WareHouseOut', 'SC72197936495755', '科室拆零出库', 1, '', '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 4, '', 0, 0, 0, 1, '2024-07-26 15:36:05', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0,
+        0, NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,
+        NULL, 1, NULL, 0, 999, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, NULL, 0, NULL, 0, NULL, b'0', NULL);
+
+
+INSERT IGNORE INTO `basic_corp`(`id`, `erpId`, `name`, `spell`, `addr`, `status`, `type`, `contact`, `mobile`,
+                                `creditNo`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `thirdName`,
+                                `thirdName1`, `thirdName2`, `thirdName3`, `thirdName4`, `corpType`, `outType`,
+                                `createUser`, `createTime`, `updateUser`, `updateTime`, `remark`, `adSickNum`)
+VALUES (1816742449581842432, '72198012799726', '拆零预出库', 'clyck', '', NULL, '', '', '', '000', NULL, NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, 4, 1, '', NULL, '', '2024-07-26 15:48:48', '', NULL);
+