去除API依赖

yxt_supervise/pom.xml

@@ -14,7 +14,6 @@
         <module>supervise-portal</module>
       <!--  <module>supervise-supplychain</module>-->
         <module>supervise-system</module>
-        <module>yxt_adapter</module>
         <module>supervise-rms</module>
         <module>yxt-supervise-enterprisecentre</module>
         <module>supervise-crm</module>

yxt_supervise/supervise-portal/pom.xml

@@ -7,7 +7,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>supervise-portal</artifactId>
     <modules>
-        <module>supervise-portal-api</module>
         <module>supervise-portal-biz</module>
     </modules>
     <groupId>com.yxt.supervise</groupId>

yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml

@@ -40,16 +40,15 @@
 
             <!--            </exclusions>-->
         </dependency>
-        <dependency>
-            <artifactId>supervise-portal-api</artifactId>
-            <groupId>com.yxt.supervise</groupId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
         <!--mysql-->
         <dependency>
             <groupId>mysql</groupId>
@@ -177,6 +176,12 @@
             <artifactId>commons-codec</artifactId>
             <version>1.10</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel-core</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitionstore;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionStore.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStore <br/>
+ * Description: 采购订单商品信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单商品信息", description = "采购订单商品信息")
+@TableName("purchase_requisition_store")
+public class PurchaseRequisitionStore extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+	@ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+	@ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+	@ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+	@ApiModelProperty("金额")
+    private String price; // 金额
+	@ApiModelProperty("批次")
+    private String pc; // 批次
+	@ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitionstore;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionStoreVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreVo <br/>
+ * Description: 采购订单商品信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单商品信息 视图数据详情", description = "采购订单商品信息 视图数据详情")
+public class PurchaseRequisitionStoreDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitionstore;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionStoreDto.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreDto <br/>
+ * Description: 采购订单商品信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单商品信息 数据传输对象", description = "采购订单商品信息 数据传输对象")
+public class PurchaseRequisitionStoreDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitionstore;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionStoreFeign.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreFeign <br/>
+ * Description: 采购订单商品信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购订单商品信息")
+@FeignClient(
+        contextId = "yxt-supervise-PurchaseRequisitionStore",
+        name = "yxt-supervise",
+        path = "v1/purchaserequisitionstore",
+        fallback = PurchaseRequisitionStoreFeignFallback.class)
+public interface PurchaseRequisitionStoreFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<PurchaseRequisitionStoreVo>> listPage(@RequestBody PagerQuery<PurchaseRequisitionStoreQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody PurchaseRequisitionStoreDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<PurchaseRequisitionStoreDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitionstore;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionStoreFeignFallback.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreFeignFallback <br/>
+ * Description: 采购订单商品信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class PurchaseRequisitionStoreFeignFallback implements PurchaseRequisitionStoreFeign {
+
+	@Override
+	public ResultBean<PagerVo<PurchaseRequisitionStoreVo>> listPage(PagerQuery<PurchaseRequisitionStoreQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/purchaserequisitionstore/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(PurchaseRequisitionStoreDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitionstore/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitionstore/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<PurchaseRequisitionStoreDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/purchaserequisitionstore/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitionstore;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionStoreQuery.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreQuery <br/>
+ * Description: 采购订单商品信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单商品信息 查询条件", description = "采购订单商品信息 查询条件")
+public class PurchaseRequisitionStoreQuery implements Query {
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitionstore;
+
+
+import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoDetailsVo;
+import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionStoreVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreVo <br/>
+ * Description: 采购订单商品信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单商品信息 视图数据对象", description = "采购订单商品信息 视图数据对象")
+public class PurchaseRequisitionStoreVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("创建者")
+    private String createSid; // 创建者
+    @ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("烟草证编码")
+    private String yCode; // 烟草证编码
+    @ApiModelProperty("门店代码")
+    private String storeCode; // 门店代码
+    @ApiModelProperty("门店名称")
+    private String storeName; // 门店名称
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("明细总金额")
+    private String detailPrice; // 明细总金额
+
+    private List<PurchaseRequisitionTobaccoDetails> detailsList = new ArrayList<>();
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java

@@ -0,0 +1,104 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobacco;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobacco.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco <br/>
+ * Description: 采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表", description = "采购订单表")
+@TableName("purchase_requisition_tobacco")
+public class PurchaseRequisitionTobacco extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+	@ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+	@ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+	@ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java

@@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobacco;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoVo <br/>
+ * Description: 采购订单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表 视图数据详情", description = "采购订单表 视图数据详情")
+public class PurchaseRequisitionTobaccoDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+	@ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+	@ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+	@ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java

@@ -0,0 +1,108 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobacco;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoDto.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoDto <br/>
+ * Description: 采购订单表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表 数据传输对象", description = "采购订单表 数据传输对象")
+public class PurchaseRequisitionTobaccoDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+	@ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+	@ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+	@ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobacco;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoFeign.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoFeign <br/>
+ * Description: 采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购订单表")
+@FeignClient(
+        contextId = "yxt-supervise-PurchaseRequisitionTobacco",
+        name = "yxt-supervise",
+        path = "v1/purchaserequisitiontobacco",
+        fallback = PurchaseRequisitionTobaccoFeignFallback.class)
+public interface PurchaseRequisitionTobaccoFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<PurchaseRequisitionTobaccoVo>> listPage(@RequestBody PagerQuery<PurchaseRequisitionTobaccoQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody PurchaseRequisitionTobaccoDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<PurchaseRequisitionTobaccoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobacco;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoFeignFallback.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoFeignFallback <br/>
+ * Description: 采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class PurchaseRequisitionTobaccoFeignFallback implements PurchaseRequisitionTobaccoFeign {
+
+	@Override
+	public ResultBean<PagerVo<PurchaseRequisitionTobaccoVo>> listPage(PagerQuery<PurchaseRequisitionTobaccoQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/purchaserequisitiontobacco/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(PurchaseRequisitionTobaccoDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitiontobacco/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitiontobacco/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<PurchaseRequisitionTobaccoDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/purchaserequisitiontobacco/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java

@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobacco;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoQuery.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoQuery <br/>
+ * Description: 采购订单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表 查询条件", description = "采购订单表 查询条件")
+public class PurchaseRequisitionTobaccoQuery implements Query {
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+	@ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+	@ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+	@ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java

@@ -0,0 +1,116 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobacco;
+
+
+import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreVo;
+import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoVo <br/>
+ * Description: 采购订单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表 视图数据对象", description = "采购订单表 视图数据对象")
+public class PurchaseRequisitionTobaccoVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("供应商唯一编码")
+    private String supplierOnlyCode; // 供应商唯一编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("监管0未审核，1审核通过，2审核不通过")
+    private String purchaseState; // 监管0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("监管审批意见")
+    private String purchaseRemarks; // 监管审批意见
+	@ApiModelProperty("银行0未审核，1审核通过，2审核不通过")
+    private String bankState; // 银行0未审核，1审核通过，2审核不通过
+	@ApiModelProperty("银行审批意见")
+    private String bankRemarks; // 银行审批意见
+	@ApiModelProperty("完成状态")
+    private String completionStatus; // 完成状态
+	@ApiModelProperty("完成状态Key")
+    private String completionStatusKey; // 完成状态Key
+    @ApiModelProperty("填单人code")
+    private String tdrCode;
+    @ApiModelProperty("填单人姓名")
+    private String tdrName;
+
+
+    private List<PurchaseRequisitionStoreVo> storeList = new ArrayList<>();
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoDetails.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails <br/>
+ * Description: 采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表", description = "采购订单表")
+@TableName("purchase_requisition_tobacco_details")
+public class PurchaseRequisitionTobaccoDetails extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+	@ApiModelProperty("卷烟代码")
+    private String yCode; // 卷烟代码
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 门店名称编码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 门店名称
+	@ApiModelProperty("批发价")
+    private String pfj; // 批发价
+	@ApiModelProperty("要货量")
+    private String yhl; // 要货量
+	@ApiModelProperty("订单量")
+    private String ddl; // 订单量
+	@ApiModelProperty("金额")
+    private String price; // 金额
+	@ApiModelProperty("厂家名称")
+    private String cjmc; // 厂家名称
+	@ApiModelProperty("零售指导价")
+    private String lszdj; // 零售指导价
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoDetailsVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsVo <br/>
+ * Description: 采购订单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表 视图数据详情", description = "采购订单表 视图数据详情")
+public class PurchaseRequisitionTobaccoDetailsDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("卷烟代码")
+    private String yCode; // 卷烟代码
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 门店名称编码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 门店名称
+    @ApiModelProperty("批发价")
+    private String pfj; // 批发价
+    @ApiModelProperty("要货量")
+    private String yhl; // 要货量
+    @ApiModelProperty("订单量")
+    private String ddl; // 订单量
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("厂家名称")
+    private String cjmc; // 厂家名称
+    @ApiModelProperty("零售指导价")
+    private String lszdj; // 零售指导价
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoDetailsDto.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsDto <br/>
+ * Description: 采购订单表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表 数据传输对象", description = "采购订单表 数据传输对象")
+public class PurchaseRequisitionTobaccoDetailsDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("卷烟代码")
+    private String yCode; // 卷烟代码
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 门店名称编码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 门店名称
+    @ApiModelProperty("批发价")
+    private String pfj; // 批发价
+    @ApiModelProperty("要货量")
+    private String yhl; // 要货量
+    @ApiModelProperty("订单量")
+    private String ddl; // 订单量
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("厂家名称")
+    private String cjmc; // 厂家名称
+    @ApiModelProperty("零售指导价")
+    private String lszdj; // 零售指导价
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoDetailsFeign.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsFeign <br/>
+ * Description: 采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购订单表")
+@FeignClient(
+        contextId = "yxt-supervise-PurchaseRequisitionTobaccoDetails",
+        name = "yxt-supervise",
+        path = "v1/purchaserequisitiontobaccodetails",
+        fallback = PurchaseRequisitionTobaccoDetailsFeignFallback.class)
+public interface PurchaseRequisitionTobaccoDetailsFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<PurchaseRequisitionTobaccoDetailsVo>> listPage(@RequestBody PagerQuery<PurchaseRequisitionTobaccoDetailsQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody PurchaseRequisitionTobaccoDetailsDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<PurchaseRequisitionTobaccoDetailsDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoDetailsFeignFallback.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsFeignFallback <br/>
+ * Description: 采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class PurchaseRequisitionTobaccoDetailsFeignFallback implements PurchaseRequisitionTobaccoDetailsFeign {
+
+	@Override
+	public ResultBean<PagerVo<PurchaseRequisitionTobaccoDetailsVo>> listPage(PagerQuery<PurchaseRequisitionTobaccoDetailsQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/purchaserequisitiontobaccodetails/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(PurchaseRequisitionTobaccoDetailsDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitiontobaccodetails/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitiontobaccodetails/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<PurchaseRequisitionTobaccoDetailsDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/purchaserequisitiontobaccodetails/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoDetailsQuery.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsQuery <br/>
+ * Description: 采购订单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表 查询条件", description = "采购订单表 查询条件")
+public class PurchaseRequisitionTobaccoDetailsQuery implements Query {
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("卷烟代码")
+    private String yCode; // 卷烟代码
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 门店名称编码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 门店名称
+    @ApiModelProperty("批发价")
+    private String pfj; // 批发价
+    @ApiModelProperty("要货量")
+    private String yhl; // 要货量
+    @ApiModelProperty("订单量")
+    private String ddl; // 订单量
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("厂家名称")
+    private String cjmc; // 厂家名称
+    @ApiModelProperty("零售指导价")
+    private String lszdj; // 零售指导价
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: PurchaseRequisitionTobaccoDetailsVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsVo <br/>
+ * Description: 采购订单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-28 11:37:54 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购订单表 视图数据对象", description = "采购订单表 视图数据对象")
+public class PurchaseRequisitionTobaccoDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+    @ApiModelProperty("关联表sid")
+    private String mainSid; // 关联表sid
+    @ApiModelProperty("卷烟代码")
+    private String yCode; // 卷烟代码
+    @ApiModelProperty("商品编码")
+    private String prodCode; // 门店名称编码
+    @ApiModelProperty("商品名称")
+    private String prodName; // 门店名称
+    @ApiModelProperty("批发价")
+    private String pfj; // 批发价
+    @ApiModelProperty("要货量")
+    private String yhl; // 要货量
+    @ApiModelProperty("订单量")
+    private String ddl; // 订单量
+    @ApiModelProperty("金额")
+    private String price; // 金额
+    @ApiModelProperty("厂家名称")
+    private String cjmc; // 厂家名称
+    @ApiModelProperty("零售指导价")
+    private String lszdj; // 零售指导价
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/brandinfo/BrandInfo.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.brandinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfo.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfo <br/>
+ * Description: 品牌信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息", description = "品牌信息")
+@TableName("brand_info")
+public class BrandInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/brandinfo/BrandInfoDetailsVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.brandinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoVo.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoVo <br/>
+ * Description: 品牌信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 视图数据详情", description = "品牌信息 视图数据详情")
+public class BrandInfoDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/brandinfo/BrandInfoDto.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.brandinfo;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoDto.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoDto <br/>
+ * Description: 品牌信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 数据传输对象", description = "品牌信息 数据传输对象")
+public class BrandInfoDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/brandinfo/BrandInfoFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.brandinfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoFeign.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoFeign <br/>
+ * Description: 品牌信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "品牌信息")
+@FeignClient(
+        contextId = "yxt-supervise-BrandInfo",
+        name = "yxt-supervise",
+        path = "v1/brandinfo",
+        fallback = BrandInfoFeignFallback.class)
+public interface BrandInfoFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BrandInfoVo>> listPage(@RequestBody PagerQuery<BrandInfoQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BrandInfoDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BrandInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/brandinfo/BrandInfoFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.brandinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoFeignFallback.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoFeignFallback <br/>
+ * Description: 品牌信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BrandInfoFeignFallback implements BrandInfoFeign {
+
+	@Override
+	public ResultBean<PagerVo<BrandInfoVo>> listPage(PagerQuery<BrandInfoQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt_supervise/brandinfo/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BrandInfoDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt_supervise/brandinfo/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt_supervise/brandinfo/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BrandInfoDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt_supervise/brandinfo/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/brandinfo/BrandInfoQuery.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.brandinfo;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoQuery.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoQuery <br/>
+ * Description: 品牌信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 查询条件", description = "品牌信息 查询条件")
+public class BrandInfoQuery implements Query {
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/brandinfo/BrandInfoVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.brandinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoVo.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoVo <br/>
+ * Description: 品牌信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 视图数据对象", description = "品牌信息 视图数据对象")
+public class BrandInfoVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommon.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.dictcommon;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommon.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommon <br/>
+ * Description: 数据字典——数据项. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项", description = "数据字典——数据项")
+@TableName("dict_common")
+public class DictCommon extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/dictcommon/DictCommonDetailsVo.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDetailsVo.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.dictcommon;
+package com.yxt.supervise.portal.api.dictcommon;
 
 
 import com.yxt.common.core.vo.Vo;

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/dictcommon/DictCommonDto.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonDto.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.dictcommon;
+package com.yxt.supervise.portal.api.dictcommon;
 
 
 import com.yxt.common.core.dto.Dto;

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/dictcommon/DictCommonFeign.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeign.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.dictcommon;
+package com.yxt.supervise.portal.api.dictcommon;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/dictcommon/DictCommonFeignFallback.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonFeignFallback.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.dictcommon;
+package com.yxt.supervise.portal.api.dictcommon;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/dictcommon/DictCommonQuery.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonQuery.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.dictcommon;
+package com.yxt.supervise.portal.api.dictcommon;
 
 
 import com.yxt.common.core.query.Query;

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/dictcommon/DictCommonVo.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dictcommon/DictCommonVo.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.dictcommon;
+package com.yxt.supervise.portal.api.dictcommon;
 
 
 import com.yxt.common.core.vo.Vo;

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dicttype/DictType.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.dicttype;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictType.java <br/>
+ * Class: com.supervise.api.dicttype.DictType <br/>
+ * Description: 数据字典——数据类型. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型", description = "数据字典——数据类型")
+@TableName("dict_type")
+public class DictType extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("类型代码")
+    private String dictTypeCode; // 类型代码
+	@ApiModelProperty("类型名称")
+    private String dictTypeName; // 类型名称
+	@ApiModelProperty("级别")
+    private String dictTypeLevel; // 级别
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDetailsVo.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.dicttype;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictTypeVo.java <br/>
+ * Class: com.supervise.api.dicttype.DictTypeVo <br/>
+ * Description: 数据字典——数据类型 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 视图数据详情", description = "数据字典——数据类型 视图数据详情")
+public class DictTypeDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("类型代码")
+    private String dictTypeCode; // 类型代码
+	@ApiModelProperty("类型名称")
+    private String dictTypeName; // 类型名称
+	@ApiModelProperty("级别")
+    private String dictTypeLevel; // 级别
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeDto.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.dicttype;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictTypeDto.java <br/>
+ * Class: com.supervise.api.dicttype.DictTypeDto <br/>
+ * Description: 数据字典——数据类型 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 数据传输对象", description = "数据字典——数据类型 数据传输对象")
+public class DictTypeDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("类型代码")
+    private String dictTypeCode; // 类型代码
+	@ApiModelProperty("类型名称")
+    private String dictTypeName; // 类型名称
+	@ApiModelProperty("级别")
+    private String dictTypeLevel; // 级别
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeign.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.dicttype;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictTypeFeign.java <br/>
+ * Class: com.supervise.api.dicttype.DictTypeFeign <br/>
+ * Description: 数据字典——数据类型. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "数据字典——数据类型")
+@FeignClient(
+        contextId = "yxt-supervise-DictType",
+        name = "yxt-supervise",
+        path = "v1/dicttype",
+        fallback = DictTypeFeignFallback.class)
+public interface DictTypeFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<DictTypeVo>> listPage(@RequestBody PagerQuery<DictTypeQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody DictTypeDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<DictTypeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeFeignFallback.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.dicttype;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictTypeFeignFallback.java <br/>
+ * Class: com.supervise.api.dicttype.DictTypeFeignFallback <br/>
+ * Description: 数据字典——数据类型. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class DictTypeFeignFallback implements DictTypeFeign {
+
+	@Override
+	public ResultBean<PagerVo<DictTypeVo>> listPage(PagerQuery<DictTypeQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt_supervise/dicttype/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(DictTypeDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt_supervise/dicttype/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt_supervise/dicttype/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<DictTypeDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt_supervise/dicttype/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeQuery.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.dicttype;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictTypeQuery.java <br/>
+ * Class: com.supervise.api.dicttype.DictTypeQuery <br/>
+ * Description: 数据字典——数据类型 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 查询条件", description = "数据字典——数据类型 查询条件")
+public class DictTypeQuery implements Query {
+
+	@ApiModelProperty("类型代码")
+    private String dictTypeCode; // 类型代码
+	@ApiModelProperty("类型名称")
+    private String dictTypeName; // 类型名称
+	@ApiModelProperty("级别")
+    private String dictTypeLevel; // 级别
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/dicttype/DictTypeVo.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.dicttype;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictTypeVo.java <br/>
+ * Class: com.supervise.api.dicttype.DictTypeVo <br/>
+ * Description: 数据字典——数据类型 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据类型 视图数据对象", description = "数据字典——数据类型 视图数据对象")
+public class DictTypeVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("类型代码")
+    private String dictTypeCode; // 类型代码
+	@ApiModelProperty("类型名称")
+    private String dictTypeName; // 类型名称
+	@ApiModelProperty("级别")
+    private String dictTypeLevel; // 级别
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReport.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/14 11:08
+ */
+@Data
+@ApiModel(value = "销售信息", description = "销售信息")
+@TableName("gd_sales_gd")
+public class GdSalesReport extends BaseEntity {
+    private String storeName;
+    private String salesVolume;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReportFeign.java

@@ -0,0 +1,52 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProFeignFallback;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProQuery;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 16:11
+ */
+@Api(tags = "销售商品信息")
+@FeignClient(
+        contextId = "yxt-supervise-gdsalesreport",
+        name = "yxt-supervise",
+        path = "v1/gdsalesreport",
+        fallback = GdSalesReportFeignFalback.class)
+public interface GdSalesReportFeign {
+
+    @ApiOperation("查询门店销售信息")
+    @PostMapping("/getAllStoreSalesReport")
+    @ResponseBody
+    public List<StoreSalesReportExcelVo> getAllStoreSalesReport(@RequestBody PagerQuery<GdSalesReportQuery> pq);
+
+
+    @ApiOperation("查询门店商品销售信息")
+    @PostMapping("/getAllGoodsSalesReport")
+    @ResponseBody
+    public List<GoodsSalesReportExcelVo> getAllGoodsSalesReport(@RequestBody PagerQuery<GdSalesReportQuery> pq);
+
+
+    @ApiOperation("查询门店烟草销售信息")
+    @PostMapping("/StoreSalesYcReportExcelVo")
+    @ResponseBody
+    public List<StoreSalesReportExcelVo>  StoreSalesYcReportExcelVo(@RequestBody PagerQuery<GdSalesReportQuery> pq);
+
+
+    @ApiOperation("查询门店烟草商品销售信息")
+    @PostMapping("/GoodsSalesReportYcExcelVo")
+    @ResponseBody
+    public List<GoodsSalesReportExcelVo> GoodsSalesReportYcExcelVo(@RequestBody PagerQuery<GdSalesReportQuery> pq);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReportFeignFalback.java

@@ -0,0 +1,37 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProQuery;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/23 16:12
+ */
+@Component
+public class GdSalesReportFeignFalback implements GdSalesReportFeign{
+    @Override
+    public List<StoreSalesReportExcelVo> getAllStoreSalesReport(PagerQuery<GdSalesReportQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public List<GoodsSalesReportExcelVo> getAllGoodsSalesReport(PagerQuery<GdSalesReportQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public List<StoreSalesReportExcelVo> StoreSalesYcReportExcelVo(PagerQuery<GdSalesReportQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public List<GoodsSalesReportExcelVo> GoodsSalesReportYcExcelVo(PagerQuery<GdSalesReportQuery> pq) {
+        return null;
+    }
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReportQuery.java

@@ -0,0 +1,13 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/14 11:10
+ */
+@Data
+public class GdSalesReportQuery implements Query {
+    private String date;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GdSalesReportVo.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/14 11:10
+ */
+@Data
+public class GdSalesReportVo implements Vo {
+    private String id;
+    @ApiModelProperty("渠道")
+    private String storeName;
+    private String salesVolume;
+    @ApiModelProperty("商品名")
+    private String prodName;
+    @ApiModelProperty("数量")
+    private String saleNum;
+    @ApiModelProperty("价格")
+    private String salePrice;
+    @ApiModelProperty("总计")
+    private String total;
+    @ApiModelProperty("类型")
+    private String orderType;
+    @ApiModelProperty("销售订单号")
+    private String orderNo;
+    @ApiModelProperty("商品编码")
+    private String prodCode;
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/GoodsSalesReportExcelVo.java

@@ -0,0 +1,25 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/17 9:07
+ */
+@Data
+public class GoodsSalesReportExcelVo implements Vo {
+    private String serialNumber;
+    private String prodName;
+    private String storeName;
+    private String saleNum;
+    private String salePrice;
+    private BigDecimal total;
+    private String orderType;
+    private String orderNo;
+    private String prodCode;
+
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/MyHandler.java

@@ -0,0 +1,87 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.RegionUtil;
+import java.util.List;
+
+/**
+ * 合并单元格处理类
+ */
+public class MyHandler extends AbstractMergeStrategy {
+
+
+    /**
+     * 合并开始行
+     */
+    private Integer startRow = 0;
+    /**
+     * list表格所有的合并列集合
+     */
+    private List<CellRangeAddress> cellRangeAddressList = null;
+
+    public MyHandler() {
+    }
+
+    public MyHandler(int startRow, List<CellRangeAddress> cellRangeAddressList) {
+        this.startRow = startRow;
+        this.cellRangeAddressList = cellRangeAddressList;
+    }
+
+    @Override
+    protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
+        // 设置样式
+        CellStyle cellStyle = cell.getCellStyle();
+        //水平居中
+        cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        //自动换行
+        cellStyle.setWrapText(true);
+        //在这里判断从哪一行开始调用合并的方法
+        if (cell.getRowIndex() > this.startRow) {
+            if (relativeRowIndex == null || relativeRowIndex == 0) {
+                return;
+            }
+            mergeColumn(sheet, cell, head, relativeRowIndex);
+        }
+    }
+
+    /**
+     * 合并单元格
+     *
+     * @param sheet
+     * @param cell
+     * @param head
+     * @param relativeRowIndex
+     */
+    protected void mergeColumn(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
+        int rowIndex = cell.getRowIndex();
+        int colIndex = cell.getColumnIndex();
+        sheet = cell.getSheet();
+        // 获取前一行
+        Row preRow = sheet.getRow(rowIndex - 1);
+        //获取前一列
+        Cell preCell = preRow.getCell(colIndex);
+        List<CellRangeAddress> list = this.cellRangeAddressList;
+        for (int i = 0; i < list.size(); i++) {
+            CellRangeAddress cellRangeAddress = list.get(i);
+            if (cellRangeAddress.containsColumn(preCell.getColumnIndex())) {
+                int lastColIndex = cellRangeAddress.getLastColumn();
+                int firstColIndex = cellRangeAddress.getFirstColumn();
+                CellRangeAddress cra = new CellRangeAddress(cell.getRowIndex(), cell.getRowIndex(), firstColIndex, lastColIndex);
+                sheet.addMergedRegion(cra);
+                // 加边框
+                RegionUtil.setBorderBottom(BorderStyle.THIN, cra, sheet);
+                RegionUtil.setBorderLeft(BorderStyle.THIN, cra, sheet);
+                RegionUtil.setBorderRight(BorderStyle.THIN, cra, sheet);
+                RegionUtil.setBorderTop(BorderStyle.THIN, cra, sheet);
+                return;
+            }
+        }
+
+    }
+
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/StoreSalesReportExcelVo.java

@@ -0,0 +1,29 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/17 9:03
+ */
+@Data
+public class StoreSalesReportExcelVo implements Vo {
+//    private String id;
+    private String serialNumber;
+    @ExcelProperty(value = "渠道")
+    @ApiModelProperty("渠道")
+    private String storeName;
+    @ExcelProperty(value = "销售额")
+    @ApiModelProperty("销售额")
+    private BigDecimal salesVolume;
+    //@ApiModelProperty("渠道数量")
+    //private String storeNum;
+    private String sum;
+    private String date;
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/gdsalesreport/TotalSales.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.portal.api.gdsalesreport;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/17 18:03
+ */
+@Data
+public class TotalSales {
+    private String sum;
+    private String date;
+    private String storeNum;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/inventoryinformation/InventoryInformation.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.inventoryinformation;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: InventoryInformation.java <br/>
+ * Class: com.yxt.supervise.api.inventoryinformation.InventoryInformation <br/>
+ * Description: 台账信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:10:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "台账信息", description = "台账信息")
+@TableName("inventory_information")
+public class InventoryInformation extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("仓库编码")
+    private String warehouseCode; // 仓库编码
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+	@ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+	@ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+	@ApiModelProperty("仓库类型")
+    private String warehouseType; // 仓库类型
+	@ApiModelProperty("商品数量")
+    private String prodNum; // 商品数量
+	@ApiModelProperty("商品货值")
+    private String prodValue; // 商品货值
+    @ApiModelProperty("供应商")
+    private String suppliderSid; // 供应商
+    @ApiModelProperty("供应商")
+    private String suppliderName; // 供应商
+    @ApiModelProperty("新的库存数")
+    private String newInventory;//新的库存数  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("新的货值")
+    private String newValue;//新的货值  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("偏差数量")
+    private String deviations;//偏差数量 维护盘库后与系统中偏差的数值
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/inventoryinformation/InventoryInformationDetailsVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.inventoryinformation;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: InventoryInformationVo.java <br/>
+ * Class: com.yxt.supervise.api.inventoryinformation.InventoryInformationVo <br/>
+ * Description: 台账信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:10:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "台账信息 视图数据详情", description = "台账信息 视图数据详情")
+public class InventoryInformationDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("仓库编码")
+    private String warehouseCode; // 仓库编码
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+	@ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+	@ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+	@ApiModelProperty("仓库类型")
+    private String warehouseType; // 仓库类型
+	@ApiModelProperty("商品数量")
+    private String prodNum; // 商品数量
+	@ApiModelProperty("商品货值")
+    private String prodValue; // 商品货值
+	@ApiModelProperty("供应商")
+    private String suppliderSid; // 供应商
+    @ApiModelProperty("新的库存数")
+    private String newInventory;//新的库存数  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("新的货值")
+    private String newValue;//新的货值  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("偏差数量")
+    private String deviations;//偏差数量 维护盘库后与系统中偏差的数值
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/inventoryinformation/InventoryInformationDto.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.inventoryinformation;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: InventoryInformationDto.java <br/>
+ * Class: com.yxt.supervise.api.inventoryinformation.InventoryInformationDto <br/>
+ * Description: 台账信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:10:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "台账信息 数据传输对象", description = "台账信息 数据传输对象")
+public class InventoryInformationDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("仓库编码")
+    private String warehouseCode; // 仓库编码
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+	@ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+	@ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+	@ApiModelProperty("仓库类型")
+    private String warehouseType; // 仓库类型
+	@ApiModelProperty("商品数量")
+    private String prodNum; // 商品数量
+	@ApiModelProperty("商品货值")
+    private String prodValue; // 商品货值
+	@ApiModelProperty("供应商")
+    private String suppliderSid; // 供应商
+    @ApiModelProperty("新的库存数")
+    private String newInventory;//新的库存数  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("新的货值")
+    private String newValue;//新的货值  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("偏差数量")
+    private String deviations;//偏差数量 维护盘库后与系统中偏差的数值
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/inventoryinformation/InventoryInformationFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.inventoryinformation;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: InventoryInformationFeign.java <br/>
+ * Class: com.yxt.supervise.api.inventoryinformation.InventoryInformationFeign <br/>
+ * Description: 台账信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:10:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "台账信息")
+@FeignClient(
+        contextId = "yxt-supervise-InventoryInformation",
+        name = "yxt-supervise",
+        path = "v1/inventoryinformation",
+        fallback = InventoryInformationFeignFallback.class)
+public interface InventoryInformationFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<InventoryInformationVo>> listPage(@RequestBody PagerQuery<InventoryInformationQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody InventoryInformationDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<InventoryInformationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/inventoryinformation/InventoryInformationFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.inventoryinformation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: InventoryInformationFeignFallback.java <br/>
+ * Class: com.yxt.supervise.api.inventoryinformation.InventoryInformationFeignFallback <br/>
+ * Description: 台账信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:10:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class InventoryInformationFeignFallback implements InventoryInformationFeign {
+
+	@Override
+	public ResultBean<PagerVo<InventoryInformationVo>> listPage(PagerQuery<InventoryInformationQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/inventoryinformation/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(InventoryInformationDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/inventoryinformation/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/inventoryinformation/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<InventoryInformationDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/inventoryinformation/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/inventoryinformation/InventoryInformationQuery.java

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.inventoryinformation;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: InventoryInformationQuery.java <br/>
+ * Class: com.yxt.supervise.api.inventoryinformation.InventoryInformationQuery <br/>
+ * Description: 台账信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:10:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "台账信息 查询条件", description = "台账信息 查询条件")
+public class InventoryInformationQuery implements Query {
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("仓库编码")
+    private String warehouseCode; // 仓库编码
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+	@ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+	@ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+	@ApiModelProperty("仓库类型")
+    private String warehouseType; // 仓库类型
+	@ApiModelProperty("商品数量")
+    private String prodNum; // 商品数量
+	@ApiModelProperty("商品货值")
+    private String prodValue; // 商品货值
+	@ApiModelProperty("供应商")
+    private String suppliderSid; // 供应商
+    @ApiModelProperty("新的库存数")
+    private String newInventory;//新的库存数  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("新的货值")
+    private String newValue;//新的货值  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("偏差数量")
+    private String deviations;//偏差数量 维护盘库后与系统中偏差的数值
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/inventoryinformation/InventoryInformationVo.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.inventoryinformation;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: InventoryInformationVo.java <br/>
+ * Class: com.yxt.supervise.api.inventoryinformation.InventoryInformationVo <br/>
+ * Description: 台账信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:10:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "台账信息 视图数据对象", description = "台账信息 视图数据对象")
+public class InventoryInformationVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("仓库编码")
+    private String warehouseCode; // 仓库编码
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("商品编码")
+    private String prodCode; // 商品编码
+	@ApiModelProperty("商品条码")
+    private String prodBarCode; // 商品条码
+	@ApiModelProperty("商品名称")
+    private String prodName; // 商品名称
+	@ApiModelProperty("仓库类型")
+    private String warehouseType; // 仓库类型
+	@ApiModelProperty("商品数量")
+    private String prodNum; // 商品数量
+	@ApiModelProperty("商品货值")
+    private String prodValue; // 商品货值
+	@ApiModelProperty("供应商")
+    private String suppliderSid; // 供应商
+    @ApiModelProperty("新的库存数")
+    private String newInventory;//新的库存数  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("新的货值")
+    private String newValue;//新的货值  根据入库单 出库单、销售数据进行维护的
+    @ApiModelProperty("偏差数量")
+    private String deviations;//偏差数量 维护盘库后与系统中偏差的数值
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisition.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisition;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisition.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisition <br/>
+ * Description: 库房提供的采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房提供的采购订单表", description = "库房提供的采购订单表")
+@TableName("kf_purchase_requisition")
+public class KfPurchaseRequisition extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("新的订单编号")
+    private String newCode; // 新的订单编号
+	@ApiModelProperty("旧的订单编号")
+    private String oldCode; // 旧的订单编号
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionDetailsVo.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisition;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionVo <br/>
+ * Description: 库房提供的采购订单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房提供的采购订单表 视图数据详情", description = "库房提供的采购订单表 视图数据详情")
+public class KfPurchaseRequisitionDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("新的订单编号")
+    private String newCode; // 新的订单编号
+	@ApiModelProperty("旧的订单编号")
+    private String oldCode; // 旧的订单编号
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionDto.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisition;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionDto.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionDto <br/>
+ * Description: 库房提供的采购订单表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房提供的采购订单表 数据传输对象", description = "库房提供的采购订单表 数据传输对象")
+public class KfPurchaseRequisitionDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("新的订单编号")
+    private String newCode; // 新的订单编号
+	@ApiModelProperty("旧的订单编号")
+    private String oldCode; // 旧的订单编号
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisition;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionFeign.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionFeign <br/>
+ * Description: 库房提供的采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库房提供的采购订单表")
+@FeignClient(
+        contextId = "yxt-supervise-KfPurchaseRequisition",
+        name = "yxt-supervise",
+        path = "v1/kfpurchaserequisition",
+        fallback = KfPurchaseRequisitionFeignFallback.class)
+public interface KfPurchaseRequisitionFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<KfPurchaseRequisitionVo>> listPage(@RequestBody PagerQuery<KfPurchaseRequisitionQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody KfPurchaseRequisitionDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<KfPurchaseRequisitionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisition;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionFeignFallback.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionFeignFallback <br/>
+ * Description: 库房提供的采购订单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class KfPurchaseRequisitionFeignFallback implements KfPurchaseRequisitionFeign {
+
+	@Override
+	public ResultBean<PagerVo<KfPurchaseRequisitionVo>> listPage(PagerQuery<KfPurchaseRequisitionQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/kfpurchaserequisition/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(KfPurchaseRequisitionDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/kfpurchaserequisition/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/kfpurchaserequisition/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<KfPurchaseRequisitionDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/kfpurchaserequisition/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionQuery.java

@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisition;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionQuery.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionQuery <br/>
+ * Description: 库房提供的采购订单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房提供的采购订单表 查询条件", description = "库房提供的采购订单表 查询条件")
+public class KfPurchaseRequisitionQuery implements Query {
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("新的订单编号")
+    private String newCode; // 新的订单编号
+	@ApiModelProperty("旧的订单编号")
+    private String oldCode; // 旧的订单编号
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionVo.java

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisition;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionVo <br/>
+ * Description: 库房提供的采购订单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房提供的采购订单表 视图数据对象", description = "库房提供的采购订单表 视图数据对象")
+public class KfPurchaseRequisitionVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("单号")
+    private String code; // 单号
+	@ApiModelProperty("采购员姓名")
+    private String buyerName; // 采购员姓名
+	@ApiModelProperty("采购员编码")
+    private String buyerCode; // 采购员编码
+	@ApiModelProperty("采购日期(填单日期)")
+    private String purchaseDate; // 采购日期(填单日期)
+	@ApiModelProperty("到货日期")
+    private String arrivalDate; // 到货日期
+	@ApiModelProperty("采购组织名称(默认36524集团)")
+    private String purchasingOrgName; // 采购组织名称(默认36524集团)
+	@ApiModelProperty("采购组织编码(36524)")
+    private String purchasingOrgCode; // 采购组织编码(36524)
+	@ApiModelProperty("采购部门名称(默认生活通)")
+    private String purchasingDeptCode; // 采购部门名称(默认生活通)
+	@ApiModelProperty("采购部门编码(默认生活通编码)")
+    private String purchasingDeptName; // 采购部门编码(默认生活通编码)
+	@ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+	@ApiModelProperty("供应商编码")
+    private String supplierCode; // 供应商编码
+	@ApiModelProperty("物流公司名称(和供应商相同)")
+    private String logisticsCompanyName; // 物流公司名称(和供应商相同)
+	@ApiModelProperty("物流公司编码")
+    private String logisticsCompanyCode; // 物流公司编码
+	@ApiModelProperty("单据到效期")
+    private String expiryDate; // 单据到效期
+	@ApiModelProperty("仓位")
+    private String warehousePosition; // 仓位
+	@ApiModelProperty("仓位code")
+    private String warehousePositionCode; // 仓位code
+	@ApiModelProperty("新的订单编号")
+    private String newCode; // 新的订单编号
+	@ApiModelProperty("旧的订单编号")
+    private String oldCode; // 旧的订单编号
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionPro.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisitionpro;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionPro.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionPro <br/>
+ * Description: 库房采购订单商品信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房采购订单商品信息", description = "库房采购订单商品信息")
+@TableName("kf_purchase_requisition_pro")
+public class KfPurchaseRequisitionPro extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("商品代码")
+    private String proCode; // 商品代码
+	@ApiModelProperty("商品名称")
+    private String proName; // 商品名称
+	@ApiModelProperty("规格型号(来自商品档案中的规格型号)")
+    private String content; // 规格型号(来自商品档案中的规格型号)
+	@ApiModelProperty("数量(对应采购订单中的数量)")
+    private String number; // 数量(对应采购订单中的数量)
+	@ApiModelProperty("包装数量（对应采购订单包装数量，作废以后不用这个字段了）")
+    private String packageNumber; // 包装数量（对应采购订单包装数量，作废以后不用这个字段了）
+	@ApiModelProperty("包内数量（对应采购订单中的规格）")
+    private String packageInsideNumber; // 包内数量（对应采购订单中的规格）
+	@ApiModelProperty("包装规格（对应采购订单中的包装）")
+    private String packageSpec; // 包装规格（对应采购订单中的包装）
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("包装价格（元）（对应采购订单中的送货价）")
+    private String packagePrice; // 包装价格（元）（对应采购订单中的送货价）
+	@ApiModelProperty("包合计（元）（对应采购订单中的送货金额）")
+    private String packageTotalPrice; // 包合计（元）（对应采购订单中的送货金额）
+	@ApiModelProperty("单价（元）（进货价/规格=单价）")
+    private String unitPrice; // 单价（元）（进货价/规格=单价）
+	@ApiModelProperty("含税单价（元）（含税金额/包装数量或者规格价）")
+    private String unitPriceTax; // 含税单价（元）（含税金额/包装数量或者规格价）
+	@ApiModelProperty("合计（元）（单价*数量=订货金额）")
+    private String totalPrice; // 合计（元）（单价*数量=订货金额）
+	@ApiModelProperty("商品品类名称")
+    private String category; // 商品品类名称
+	@ApiModelProperty("商品品类编码")
+    private String categoryKey; // 商品品类编码
+	@ApiModelProperty("品牌名称（来自商品档案中的品牌）")
+    private String brand; // 品牌名称（来自商品档案中的品牌）
+	@ApiModelProperty("品牌编码")
+    private String brandCode; // 品牌编码
+	@ApiModelProperty("发货日期")
+    private String issuanceDate; // 发货日期
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("零售金额（对应采购订单中的零售金额）")
+    private String retailAmount; // 零售金额（对应采购订单中的零售金额）
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProDetailsVo.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisitionpro;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionProVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo <br/>
+ * Description: 库房采购订单商品信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房采购订单商品信息 视图数据详情", description = "库房采购订单商品信息 视图数据详情")
+public class KfPurchaseRequisitionProDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("商品代码")
+    private String proCode; // 商品代码
+	@ApiModelProperty("商品名称")
+    private String proName; // 商品名称
+	@ApiModelProperty("规格型号(来自商品档案中的规格型号)")
+    private String content; // 规格型号(来自商品档案中的规格型号)
+	@ApiModelProperty("数量(对应采购订单中的数量)")
+    private String number; // 数量(对应采购订单中的数量)
+	@ApiModelProperty("包装数量（对应采购订单包装数量，作废以后不用这个字段了）")
+    private String packageNumber; // 包装数量（对应采购订单包装数量，作废以后不用这个字段了）
+	@ApiModelProperty("包内数量（对应采购订单中的规格）")
+    private String packageInsideNumber; // 包内数量（对应采购订单中的规格）
+	@ApiModelProperty("包装规格（对应采购订单中的包装）")
+    private String packageSpec; // 包装规格（对应采购订单中的包装）
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("包装价格（元）（对应采购订单中的送货价）")
+    private String packagePrice; // 包装价格（元）（对应采购订单中的送货价）
+	@ApiModelProperty("包合计（元）（对应采购订单中的送货金额）")
+    private String packageTotalPrice; // 包合计（元）（对应采购订单中的送货金额）
+	@ApiModelProperty("单价（元）（进货价/规格=单价）")
+    private String unitPrice; // 单价（元）（进货价/规格=单价）
+	@ApiModelProperty("含税单价（元）（含税金额/包装数量或者规格价）")
+    private String unitPriceTax; // 含税单价（元）（含税金额/包装数量或者规格价）
+	@ApiModelProperty("合计（元）（单价*数量=订货金额）")
+    private String totalPrice; // 合计（元）（单价*数量=订货金额）
+	@ApiModelProperty("商品品类名称")
+    private String category; // 商品品类名称
+	@ApiModelProperty("商品品类编码")
+    private String categoryKey; // 商品品类编码
+	@ApiModelProperty("品牌名称（来自商品档案中的品牌）")
+    private String brand; // 品牌名称（来自商品档案中的品牌）
+	@ApiModelProperty("品牌编码")
+    private String brandCode; // 品牌编码
+	@ApiModelProperty("发货日期")
+    private String issuanceDate; // 发货日期
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("零售金额（对应采购订单中的零售金额）")
+    private String retailAmount; // 零售金额（对应采购订单中的零售金额）
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProDto.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisitionpro;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionProDto.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProDto <br/>
+ * Description: 库房采购订单商品信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房采购订单商品信息 数据传输对象", description = "库房采购订单商品信息 数据传输对象")
+public class KfPurchaseRequisitionProDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("商品代码")
+    private String proCode; // 商品代码
+	@ApiModelProperty("商品名称")
+    private String proName; // 商品名称
+	@ApiModelProperty("规格型号(来自商品档案中的规格型号)")
+    private String content; // 规格型号(来自商品档案中的规格型号)
+	@ApiModelProperty("数量(对应采购订单中的数量)")
+    private String number; // 数量(对应采购订单中的数量)
+	@ApiModelProperty("包装数量（对应采购订单包装数量，作废以后不用这个字段了）")
+    private String packageNumber; // 包装数量（对应采购订单包装数量，作废以后不用这个字段了）
+	@ApiModelProperty("包内数量（对应采购订单中的规格）")
+    private String packageInsideNumber; // 包内数量（对应采购订单中的规格）
+	@ApiModelProperty("包装规格（对应采购订单中的包装）")
+    private String packageSpec; // 包装规格（对应采购订单中的包装）
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("包装价格（元）（对应采购订单中的送货价）")
+    private String packagePrice; // 包装价格（元）（对应采购订单中的送货价）
+	@ApiModelProperty("包合计（元）（对应采购订单中的送货金额）")
+    private String packageTotalPrice; // 包合计（元）（对应采购订单中的送货金额）
+	@ApiModelProperty("单价（元）（进货价/规格=单价）")
+    private String unitPrice; // 单价（元）（进货价/规格=单价）
+	@ApiModelProperty("含税单价（元）（含税金额/包装数量或者规格价）")
+    private String unitPriceTax; // 含税单价（元）（含税金额/包装数量或者规格价）
+	@ApiModelProperty("合计（元）（单价*数量=订货金额）")
+    private String totalPrice; // 合计（元）（单价*数量=订货金额）
+	@ApiModelProperty("商品品类名称")
+    private String category; // 商品品类名称
+	@ApiModelProperty("商品品类编码")
+    private String categoryKey; // 商品品类编码
+	@ApiModelProperty("品牌名称（来自商品档案中的品牌）")
+    private String brand; // 品牌名称（来自商品档案中的品牌）
+	@ApiModelProperty("品牌编码")
+    private String brandCode; // 品牌编码
+	@ApiModelProperty("发货日期")
+    private String issuanceDate; // 发货日期
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("零售金额（对应采购订单中的零售金额）")
+    private String retailAmount; // 零售金额（对应采购订单中的零售金额）
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisitionpro;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionProFeign.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProFeign <br/>
+ * Description: 库房采购订单商品信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库房采购订单商品信息")
+@FeignClient(
+        contextId = "yxt-supervise-KfPurchaseRequisitionPro",
+        name = "yxt-supervise",
+        path = "v1/kfpurchaserequisitionpro",
+        fallback = KfPurchaseRequisitionProFeignFallback.class)
+public interface KfPurchaseRequisitionProFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<KfPurchaseRequisitionProVo>> listPage(@RequestBody PagerQuery<KfPurchaseRequisitionProQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody KfPurchaseRequisitionProDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<KfPurchaseRequisitionProDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisitionpro;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionProFeignFallback.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProFeignFallback <br/>
+ * Description: 库房采购订单商品信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class KfPurchaseRequisitionProFeignFallback implements KfPurchaseRequisitionProFeign {
+
+	@Override
+	public ResultBean<PagerVo<KfPurchaseRequisitionProVo>> listPage(PagerQuery<KfPurchaseRequisitionProQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/kfpurchaserequisitionpro/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(KfPurchaseRequisitionProDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/kfpurchaserequisitionpro/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt-supervise/kfpurchaserequisitionpro/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<KfPurchaseRequisitionProDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt-supervise/kfpurchaserequisitionpro/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProQuery.java

@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisitionpro;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionProQuery.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProQuery <br/>
+ * Description: 库房采购订单商品信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房采购订单商品信息 查询条件", description = "库房采购订单商品信息 查询条件")
+public class KfPurchaseRequisitionProQuery implements Query {
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("商品代码")
+    private String proCode; // 商品代码
+	@ApiModelProperty("商品名称")
+    private String proName; // 商品名称
+	@ApiModelProperty("规格型号(来自商品档案中的规格型号)")
+    private String content; // 规格型号(来自商品档案中的规格型号)
+	@ApiModelProperty("数量(对应采购订单中的数量)")
+    private String number; // 数量(对应采购订单中的数量)
+	@ApiModelProperty("包装数量（对应采购订单包装数量，作废以后不用这个字段了）")
+    private String packageNumber; // 包装数量（对应采购订单包装数量，作废以后不用这个字段了）
+	@ApiModelProperty("包内数量（对应采购订单中的规格）")
+    private String packageInsideNumber; // 包内数量（对应采购订单中的规格）
+	@ApiModelProperty("包装规格（对应采购订单中的包装）")
+    private String packageSpec; // 包装规格（对应采购订单中的包装）
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("包装价格（元）（对应采购订单中的送货价）")
+    private String packagePrice; // 包装价格（元）（对应采购订单中的送货价）
+	@ApiModelProperty("包合计（元）（对应采购订单中的送货金额）")
+    private String packageTotalPrice; // 包合计（元）（对应采购订单中的送货金额）
+	@ApiModelProperty("单价（元）（进货价/规格=单价）")
+    private String unitPrice; // 单价（元）（进货价/规格=单价）
+	@ApiModelProperty("含税单价（元）（含税金额/包装数量或者规格价）")
+    private String unitPriceTax; // 含税单价（元）（含税金额/包装数量或者规格价）
+	@ApiModelProperty("合计（元）（单价*数量=订货金额）")
+    private String totalPrice; // 合计（元）（单价*数量=订货金额）
+	@ApiModelProperty("商品品类名称")
+    private String category; // 商品品类名称
+	@ApiModelProperty("商品品类编码")
+    private String categoryKey; // 商品品类编码
+	@ApiModelProperty("品牌名称（来自商品档案中的品牌）")
+    private String brand; // 品牌名称（来自商品档案中的品牌）
+	@ApiModelProperty("品牌编码")
+    private String brandCode; // 品牌编码
+	@ApiModelProperty("发货日期")
+    private String issuanceDate; // 发货日期
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("零售金额（对应采购订单中的零售金额）")
+    private String retailAmount; // 零售金额（对应采购订单中的零售金额）
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProVo.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.kfpurchaserequisitionpro;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-supervise(宇信通监管) <br/>
+ * File: KfPurchaseRequisitionProVo.java <br/>
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo <br/>
+ * Description: 库房采购订单商品信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-07 16:24:41 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库房采购订单商品信息 视图数据对象", description = "库房采购订单商品信息 视图数据对象")
+public class KfPurchaseRequisitionProVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("商品代码")
+    private String proCode; // 商品代码
+	@ApiModelProperty("商品名称")
+    private String proName; // 商品名称
+	@ApiModelProperty("规格型号(来自商品档案中的规格型号)")
+    private String content; // 规格型号(来自商品档案中的规格型号)
+	@ApiModelProperty("数量(对应采购订单中的数量)")
+    private String number; // 数量(对应采购订单中的数量)
+	@ApiModelProperty("包装数量（对应采购订单包装数量，作废以后不用这个字段了）")
+    private String packageNumber; // 包装数量（对应采购订单包装数量，作废以后不用这个字段了）
+	@ApiModelProperty("包内数量（对应采购订单中的规格）")
+    private String packageInsideNumber; // 包内数量（对应采购订单中的规格）
+	@ApiModelProperty("包装规格（对应采购订单中的包装）")
+    private String packageSpec; // 包装规格（对应采购订单中的包装）
+	@ApiModelProperty("单位")
+    private String unit; // 单位
+	@ApiModelProperty("包装价格（元）（对应采购订单中的送货价）")
+    private String packagePrice; // 包装价格（元）（对应采购订单中的送货价）
+	@ApiModelProperty("包合计（元）（对应采购订单中的送货金额）")
+    private String packageTotalPrice; // 包合计（元）（对应采购订单中的送货金额）
+	@ApiModelProperty("单价（元）（进货价/规格=单价）")
+    private String unitPrice; // 单价（元）（进货价/规格=单价）
+	@ApiModelProperty("含税单价（元）（含税金额/包装数量或者规格价）")
+    private String unitPriceTax; // 含税单价（元）（含税金额/包装数量或者规格价）
+	@ApiModelProperty("合计（元）（单价*数量=订货金额）")
+    private String totalPrice; // 合计（元）（单价*数量=订货金额）
+	@ApiModelProperty("商品品类名称")
+    private String category; // 商品品类名称
+	@ApiModelProperty("商品品类编码")
+    private String categoryKey; // 商品品类编码
+	@ApiModelProperty("品牌名称（来自商品档案中的品牌）")
+    private String brand; // 品牌名称（来自商品档案中的品牌）
+	@ApiModelProperty("品牌编码")
+    private String brandCode; // 品牌编码
+	@ApiModelProperty("发货日期")
+    private String issuanceDate; // 发货日期
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("零售金额（对应采购订单中的零售金额）")
+    private String retailAmount; // 零售金额（对应采购订单中的零售金额）
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/logisticscompany/LogisticsCompany.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.logisticscompany;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: 宇信通监管(宇信通监管) <br/>
+ * File: LogisticsCompany.java <br/>
+ * Class: com.yxt.supervise.api.logisticscompany.LogisticsCompany <br/>
+ * Description: 物流公司信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-20 16:44:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "物流公司信息", description = "物流公司信息")
+@TableName("logistics_company")
+public class LogisticsCompany extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("电话")
+    private String telephone; // 电话
+	@ApiModelProperty("联系人")
+    private String contacts; // 联系人
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/logisticscompany/LogisticsCompanyDetailsVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.logisticscompany;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: 宇信通监管(宇信通监管) <br/>
+ * File: LogisticsCompanyVo.java <br/>
+ * Class: com.yxt.supervise.api.logisticscompany.LogisticsCompanyVo <br/>
+ * Description: 物流公司信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-20 16:44:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "物流公司信息 视图数据详情", description = "物流公司信息 视图数据详情")
+public class LogisticsCompanyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("电话")
+    private String telephone; // 电话
+	@ApiModelProperty("联系人")
+    private String contacts; // 联系人
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/logisticscompany/LogisticsCompanyDto.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.logisticscompany;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: 宇信通监管(宇信通监管) <br/>
+ * File: LogisticsCompanyDto.java <br/>
+ * Class: com.yxt.supervise.api.logisticscompany.LogisticsCompanyDto <br/>
+ * Description: 物流公司信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-20 16:44:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "物流公司信息 数据传输对象", description = "物流公司信息 数据传输对象")
+public class LogisticsCompanyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("电话")
+    private String telephone; // 电话
+	@ApiModelProperty("联系人")
+    private String contacts; // 联系人
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/logisticscompany/LogisticsCompanyFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.logisticscompany;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: 宇信通监管(宇信通监管) <br/>
+ * File: LogisticsCompanyFeign.java <br/>
+ * Class: com.yxt.supervise.api.logisticscompany.LogisticsCompanyFeign <br/>
+ * Description: 物流公司信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-20 16:44:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "物流公司信息")
+@FeignClient(
+        contextId = "LogisticsCompany",
+        name = "yxt-supervise",
+        path = "v1/logisticscompany",
+        fallback = LogisticsCompanyFeignFallback.class)
+public interface LogisticsCompanyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<LogisticsCompanyVo>> listPage(@RequestBody PagerQuery<LogisticsCompanyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody LogisticsCompanyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<LogisticsCompanyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/logisticscompany/LogisticsCompanyFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.logisticscompany;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: 宇信通监管(宇信通监管) <br/>
+ * File: LogisticsCompanyFeignFallback.java <br/>
+ * Class: com.yxt.supervise.api.logisticscompany.LogisticsCompanyFeignFallback <br/>
+ * Description: 物流公司信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-20 16:44:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class LogisticsCompanyFeignFallback implements LogisticsCompanyFeign {
+
+	@Override
+	public ResultBean<PagerVo<LogisticsCompanyVo>> listPage(PagerQuery<LogisticsCompanyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口宇信通监管/logisticscompany/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(LogisticsCompanyDto dto){
+		return ResultBean.fireFail().setMsg("接口宇信通监管/logisticscompany/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口宇信通监管/logisticscompany/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<LogisticsCompanyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口宇信通监管/logisticscompany/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/logisticscompany/LogisticsCompanyQuery.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.logisticscompany;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: 宇信通监管(宇信通监管) <br/>
+ * File: LogisticsCompanyQuery.java <br/>
+ * Class: com.yxt.supervise.api.logisticscompany.LogisticsCompanyQuery <br/>
+ * Description: 物流公司信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-20 16:44:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "物流公司信息 查询条件", description = "物流公司信息 查询条件")
+public class LogisticsCompanyQuery implements Query {
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("电话")
+    private String telephone; // 电话
+	@ApiModelProperty("联系人")
+    private String contacts; // 联系人
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/logisticscompany/LogisticsCompanyVo.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.logisticscompany;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: 宇信通监管(宇信通监管) <br/>
+ * File: LogisticsCompanyVo.java <br/>
+ * Class: com.yxt.supervise.api.logisticscompany.LogisticsCompanyVo <br/>
+ * Description: 物流公司信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-20 16:44:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "物流公司信息 视图数据对象", description = "物流公司信息 视图数据对象")
+public class LogisticsCompanyVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建者")
+    private String createSid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modifySid; // 更新者
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("电话")
+    private String telephone; // 电话
+	@ApiModelProperty("联系人")
+    private String contacts; // 联系人
+
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/manufacturerinfo/ManufacturerInfo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.manufacturerinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ManufacturerInfo.java <br/>
+ * Class: com.supervise.api.manufacturerinfo.ManufacturerInfo <br/>
+ * Description: 厂商信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "厂商信息", description = "厂商信息")
+@TableName("manufacturer_info")
+public class ManufacturerInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("地址")
+    private String address; // 地址
+	@ApiModelProperty("电话")
+    private String telephone; // 电话
+	@ApiModelProperty("联系人")
+    private String contacts; // 联系人
+
+}

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/manufacturerinfo/ManufacturerInfoDetailsVo.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/manufacturerinfo/ManufacturerInfoDetailsVo.java

@@ -23,17 +23,17 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.manufacturerinfo;
+package com.yxt.supervise.portal.api.manufacturerinfo;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * Project: yxt_supervise(宇信通监管) <br/>
  * File: ManufacturerInfoVo.java <br/>

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/manufacturerinfo/ManufacturerInfoDto.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/manufacturerinfo/ManufacturerInfoDto.java

@@ -23,17 +23,17 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.manufacturerinfo;
+package com.yxt.supervise.portal.api.manufacturerinfo;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * Project: yxt_supervise(宇信通监管) <br/>
  * File: ManufacturerInfoDto.java <br/>

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/manufacturerinfo/ManufacturerInfoFeign.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/manufacturerinfo/ManufacturerInfoFeign.java

@@ -23,16 +23,18 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.manufacturerinfo;
+package com.yxt.supervise.portal.api.manufacturerinfo;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: yxt_supervise(宇信通监管) <br/>
  * File: ManufacturerInfoFeign.java <br/>

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/manufacturerinfo/ManufacturerInfoFeignFallback.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/manufacturerinfo/ManufacturerInfoFeignFallback.java

@@ -23,13 +23,15 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.manufacturerinfo;
+package com.yxt.supervise.portal.api.manufacturerinfo;
 
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: yxt_supervise(宇信通监管) <br/>
  * File: ManufacturerInfoFeignFallback.java <br/>

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/manufacturerinfo/ManufacturerInfoQuery.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/manufacturerinfo/ManufacturerInfoQuery.java

@@ -23,17 +23,17 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.manufacturerinfo;
+package com.yxt.supervise.portal.api.manufacturerinfo;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * Project: yxt_supervise(宇信通监管) <br/>
  * File: ManufacturerInfoQuery.java <br/>

yxt_supervise/supervise-supplychain/src/main/java/com/yxt/supervise/supplychain/feign/manufacturerinfo/ManufacturerInfoVo.java → yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/manufacturerinfo/ManufacturerInfoVo.java

@@ -23,17 +23,17 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.supervise.supplychain.feign.manufacturerinfo;
+package com.yxt.supervise.portal.api.manufacturerinfo;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * Project: yxt_supervise(宇信通监管) <br/>
  * File: ManufacturerInfoVo.java <br/>

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productinformation/ProductInformation.java

@@ -0,0 +1,156 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productinformation;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ProductInformation.java <br/>
+ * Class: com.supervise.api.productinformation.ProductInformation <br/>
+ * Description: 商品档案信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息", description = "商品档案信息")
+@TableName("product_information")
+public class ProductInformation extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("含量")
+    private String content; // 含量
+	@ApiModelProperty("类别")
+    private String category; // 类别
+	@ApiModelProperty("类别key")
+    private String categoryKey; // 类别key
+	@ApiModelProperty("规格单位")
+    private String unit; // 规格单位
+	@ApiModelProperty("制造厂")
+    private String manufacturer; // 制造厂
+	@ApiModelProperty("制造厂sid")
+    private String manufacturerSid; // 制造厂sid
+	@ApiModelProperty("品牌")
+    private String brand; // 品牌
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("产地")
+    private String placeOfOrigin; // 产地
+	@ApiModelProperty("等级")
+    private String grade; // 等级
+	@ApiModelProperty("等级key")
+    private String gradeKey; // 等级key
+	@ApiModelProperty("保质期")
+    private String qualityGuaranteePeriod; // 保质期
+	@ApiModelProperty("部门")
+    private String deptartment; // 部门
+	@ApiModelProperty("货架")
+    private String goodsShelves; // 货架
+	@ApiModelProperty("货架code")
+    private String goodsShelvesCode; // 货架code
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("毛利率")
+    private String grossProfitMargin; // 毛利率
+	@ApiModelProperty("采购员")
+    private String buyer; // 采购员
+	@ApiModelProperty("核算售价")
+    private String accountingSalesPrice; // 核算售价
+	@ApiModelProperty("最新进价（系统中导出的）")
+    private String latestPurchasePrice; // 最新进价
+	@ApiModelProperty("库存价")
+    private String inventoryPrice; // 库存价
+	@ApiModelProperty("合同进价")
+    private String contractPurchasePrice; // 合同进价
+	@ApiModelProperty("会员价")
+    private String membershipPrice; // 会员价
+	@ApiModelProperty("进项税率")
+    private String inputTaxRate; // 进项税率
+	@ApiModelProperty("销项税率")
+    private String outputTaxRate; // 销项税率
+	@ApiModelProperty("仓位")
+    private String position; // 仓位
+	@ApiModelProperty("仓位code")
+    private String positionCode; // 仓位code
+	@ApiModelProperty("结算供应商")
+    private String supplier; // 结算供应商
+	@ApiModelProperty("结算供应商Sid")
+    private String supplierSid; // 结算供应商Sid
+	@ApiModelProperty("配货方式")
+    private String distributionMethod; // 配货方式
+	@ApiModelProperty("配货方式Key")
+    private String distributionMethodKey; // 配货方式Key
+	@ApiModelProperty("来源单位")
+    private String sourceUnit; // 来源单位
+	@ApiModelProperty("管理到效期")
+    private String managementExpirationDate; // 管理到效期
+	@ApiModelProperty("配货价")
+    private String rationingPrice; // 配货价
+	@ApiModelProperty("最低售价")
+    private String lowestSellingPrice; // 最低售价
+	@ApiModelProperty("缺省进价")
+    private String defaultPurchasePrice; // 缺省进价
+	@ApiModelProperty("批发价")
+    private String tradePrice; // 批发价
+	@ApiModelProperty("规格说明")
+    private String specifications; // 规格说明
+	@ApiModelProperty("规格长宽高")
+    private String description; // 规格长宽高
+	@ApiModelProperty("规格重量")
+    private String weight; // 规格重量
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后调价时间")
+    private Date priceAdjustmentTime; // 最后调价时间
+	@ApiModelProperty("对方系统代码")
+    private String systemCode; // 对方系统代码
+	@ApiModelProperty("去税最新进价")
+    private String priceWithoutTax; // 去税最新进价
+	@ApiModelProperty("去税库存价")
+    private String taxableInventoryPrice; // 去税库存价
+	@ApiModelProperty("去税合同进价")
+    private String ContractPriceExcludingTax; // 去税合同进价
+    @ApiModelProperty("商品状态")
+    private String productStatus; // 商品状态
+    @ApiModelProperty("商品状态key")
+    private String productStatusKey; // 商品状态key
+    @ApiModelProperty("最新进价（需要每次导入采购订单更新的）")
+    private String newestPurchasePrice;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productinformation/ProductInformationDetailsVo.java

@@ -0,0 +1,174 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productinformation;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ProductInformationVo.java <br/>
+ * Class: com.supervise.api.productinformation.ProductInformationVo <br/>
+ * Description: 商品档案信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息 视图数据详情", description = "商品档案信息 视图数据详情")
+public class ProductInformationDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("含量")
+    private String content; // 含量
+	@ApiModelProperty("类别")
+    private String category; // 类别
+	@ApiModelProperty("类别key")
+    private String categoryKey; // 类别key
+	@ApiModelProperty("规格单位")
+    private String unit; // 规格单位
+	@ApiModelProperty("制造厂")
+    private String manufacturer; // 制造厂
+	@ApiModelProperty("制造厂sid")
+    private String manufacturerSid; // 制造厂sid
+	@ApiModelProperty("品牌")
+    private String brand; // 品牌
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("产地")
+    private String placeOfOrigin; // 产地
+	@ApiModelProperty("等级")
+    private String grade; // 等级
+	@ApiModelProperty("等级key")
+    private String gradeKey; // 等级key
+	@ApiModelProperty("保质期")
+    private String qualityGuaranteePeriod; // 保质期
+	@ApiModelProperty("部门")
+    private String deptartment; // 部门
+	@ApiModelProperty("货架")
+    private String goodsShelves; // 货架
+	@ApiModelProperty("货架code")
+    private String goodsShelvesCode; // 货架code
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("毛利率")
+    private String grossProfitMargin; // 毛利率
+	@ApiModelProperty("采购员")
+    private String buyer; // 采购员
+	@ApiModelProperty("核算售价")
+    private String accountingSalesPrice; // 核算售价
+	@ApiModelProperty("最新进价")
+    private String latestPurchasePrice; // 最新进价
+	@ApiModelProperty("库存价")
+    private String inventoryPrice; // 库存价
+	@ApiModelProperty("合同进价")
+    private String contractPurchasePrice; // 合同进价
+	@ApiModelProperty("会员价")
+    private String membershipPrice; // 会员价
+	@ApiModelProperty("进项税率")
+    private String inputTaxRate; // 进项税率
+	@ApiModelProperty("销项税率")
+    private String outputTaxRate; // 销项税率
+	@ApiModelProperty("仓位")
+    private String position; // 仓位
+	@ApiModelProperty("仓位code")
+    private String positionCode; // 仓位code
+	@ApiModelProperty("结算供应商")
+    private String supplier; // 结算供应商
+	@ApiModelProperty("结算供应商Sid")
+    private String supplierSid; // 结算供应商Sid
+	@ApiModelProperty("配货方式")
+    private String distributionMethod; // 配货方式
+	@ApiModelProperty("配货方式Key")
+    private String distributionMethodKey; // 配货方式Key
+	@ApiModelProperty("来源单位")
+    private String sourceUnit; // 来源单位
+	@ApiModelProperty("管理到效期")
+    private String managementExpirationDate; // 管理到效期
+	@ApiModelProperty("配货价")
+    private String rationingPrice; // 配货价
+	@ApiModelProperty("最低售价")
+    private String lowestSellingPrice; // 最低售价
+	@ApiModelProperty("缺省进价")
+    private String defaultPurchasePrice; // 缺省进价
+	@ApiModelProperty("批发价")
+    private String tradePrice; // 批发价
+	@ApiModelProperty("规格说明")
+    private String specifications; // 规格说明
+	@ApiModelProperty("规格长宽高")
+    private String description; // 规格长宽高
+	@ApiModelProperty("规格重量")
+    private String weight; // 规格重量
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后调价时间")
+    private Date priceAdjustmentTimeStart; // 最后调价时间
+    private Date priceAdjustmentTimeEnd; // 最后调价时间
+	@ApiModelProperty("对方系统代码")
+    private String systemCode; // 对方系统代码
+	@ApiModelProperty("去税最新进价")
+    private String priceWithoutTax; // 去税最新进价
+	@ApiModelProperty("去税库存价")
+    private String taxableInventoryPrice; // 去税库存价
+	@ApiModelProperty("去税合同进价")
+    private String ContractPriceExcludingTax; // 去税合同进价
+	@ApiModelProperty("商品状态")
+    private String productStatus; // 商品状态
+    @ApiModelProperty("最新进价（需要每次导入采购订单更新的）")
+    private String newestPurchasePrice;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productinformation/ProductInformationDto.java

@@ -0,0 +1,174 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productinformation;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ProductInformationDto.java <br/>
+ * Class: com.supervise.api.productinformation.ProductInformationDto <br/>
+ * Description: 商品档案信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息 数据传输对象", description = "商品档案信息 数据传输对象")
+public class ProductInformationDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("含量")
+    private String content; // 含量
+	@ApiModelProperty("类别")
+    private String category; // 类别
+	@ApiModelProperty("类别key")
+    private String categoryKey; // 类别key
+	@ApiModelProperty("规格单位")
+    private String unit; // 规格单位
+	@ApiModelProperty("制造厂")
+    private String manufacturer; // 制造厂
+	@ApiModelProperty("制造厂sid")
+    private String manufacturerSid; // 制造厂sid
+	@ApiModelProperty("品牌")
+    private String brand; // 品牌
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("产地")
+    private String placeOfOrigin; // 产地
+	@ApiModelProperty("等级")
+    private String grade; // 等级
+	@ApiModelProperty("等级key")
+    private String gradeKey; // 等级key
+	@ApiModelProperty("保质期")
+    private String qualityGuaranteePeriod; // 保质期
+	@ApiModelProperty("部门")
+    private String deptartment; // 部门
+	@ApiModelProperty("货架")
+    private String goodsShelves; // 货架
+	@ApiModelProperty("货架code")
+    private String goodsShelvesCode; // 货架code
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("毛利率")
+    private String grossProfitMargin; // 毛利率
+	@ApiModelProperty("采购员")
+    private String buyer; // 采购员
+	@ApiModelProperty("核算售价")
+    private String accountingSalesPrice; // 核算售价
+	@ApiModelProperty("最新进价")
+    private String latestPurchasePrice; // 最新进价
+	@ApiModelProperty("库存价")
+    private String inventoryPrice; // 库存价
+	@ApiModelProperty("合同进价")
+    private String contractPurchasePrice; // 合同进价
+	@ApiModelProperty("会员价")
+    private String membershipPrice; // 会员价
+	@ApiModelProperty("进项税率")
+    private String inputTaxRate; // 进项税率
+	@ApiModelProperty("销项税率")
+    private String outputTaxRate; // 销项税率
+	@ApiModelProperty("仓位")
+    private String position; // 仓位
+	@ApiModelProperty("仓位code")
+    private String positionCode; // 仓位code
+	@ApiModelProperty("结算供应商")
+    private String supplier; // 结算供应商
+	@ApiModelProperty("结算供应商Sid")
+    private String supplierSid; // 结算供应商Sid
+	@ApiModelProperty("配货方式")
+    private String distributionMethod; // 配货方式
+	@ApiModelProperty("配货方式Key")
+    private String distributionMethodKey; // 配货方式Key
+	@ApiModelProperty("来源单位")
+    private String sourceUnit; // 来源单位
+	@ApiModelProperty("管理到效期")
+    private String managementExpirationDate; // 管理到效期
+	@ApiModelProperty("配货价")
+    private String rationingPrice; // 配货价
+	@ApiModelProperty("最低售价")
+    private String lowestSellingPrice; // 最低售价
+	@ApiModelProperty("缺省进价")
+    private String defaultPurchasePrice; // 缺省进价
+	@ApiModelProperty("批发价")
+    private String tradePrice; // 批发价
+	@ApiModelProperty("规格说明")
+    private String specifications; // 规格说明
+	@ApiModelProperty("规格长宽高")
+    private String description; // 规格长宽高
+	@ApiModelProperty("规格重量")
+    private String weight; // 规格重量
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后调价时间")
+    private Date priceAdjustmentTimeStart; // 最后调价时间
+    private Date priceAdjustmentTimeEnd; // 最后调价时间
+	@ApiModelProperty("对方系统代码")
+    private String systemCode; // 对方系统代码
+	@ApiModelProperty("去税最新进价")
+    private String priceWithoutTax; // 去税最新进价
+	@ApiModelProperty("去税库存价")
+    private String taxableInventoryPrice; // 去税库存价
+	@ApiModelProperty("去税合同进价")
+    private String ContractPriceExcludingTax; // 去税合同进价
+	@ApiModelProperty("商品状态")
+    private String productStatus; // 商品状态
+    @ApiModelProperty("最新进价（需要每次导入采购订单更新的）")
+    private String newestPurchasePrice;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productinformation/ProductInformationFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productinformation;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ProductInformationFeign.java <br/>
+ * Class: com.supervise.api.productinformation.ProductInformationFeign <br/>
+ * Description: 商品档案信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "商品档案信息")
+@FeignClient(
+        contextId = "yxt-supervise-ProductInformation",
+        name = "yxt-supervise",
+        path = "v1/productinformation",
+        fallback = ProductInformationFeignFallback.class)
+public interface ProductInformationFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ProductInformationVo>> listPage(@RequestBody PagerQuery<ProductInformationQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ProductInformationDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ProductInformationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productinformation/ProductInformationFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productinformation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ProductInformationFeignFallback.java <br/>
+ * Class: com.supervise.api.productinformation.ProductInformationFeignFallback <br/>
+ * Description: 商品档案信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ProductInformationFeignFallback implements ProductInformationFeign {
+
+	@Override
+	public ResultBean<PagerVo<ProductInformationVo>> listPage(PagerQuery<ProductInformationQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt_supervise/productinformation/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ProductInformationDto dto){
+		return ResultBean.fireFail().setMsg("接口yxt_supervise/productinformation/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口yxt_supervise/productinformation/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ProductInformationDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口yxt_supervise/productinformation/fetchDetailsBySid无法访问");
+	}
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productinformation/ProductInformationQuery.java

@@ -0,0 +1,172 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productinformation;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ProductInformationQuery.java <br/>
+ * Class: com.supervise.api.productinformation.ProductInformationQuery <br/>
+ * Description: 商品档案信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息 查询条件", description = "商品档案信息 查询条件")
+public class ProductInformationQuery implements Query {
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("含量")
+    private String content; // 含量
+	@ApiModelProperty("类别")
+    private String category; // 类别
+	@ApiModelProperty("类别key")
+    private String categoryKey; // 类别key
+	@ApiModelProperty("规格单位")
+    private String unit; // 规格单位
+	@ApiModelProperty("制造厂")
+    private String manufacturer; // 制造厂
+	@ApiModelProperty("制造厂sid")
+    private String manufacturerSid; // 制造厂sid
+	@ApiModelProperty("品牌")
+    private String brand; // 品牌
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("产地")
+    private String placeOfOrigin; // 产地
+	@ApiModelProperty("等级")
+    private String grade; // 等级
+	@ApiModelProperty("等级key")
+    private String gradeKey; // 等级key
+	@ApiModelProperty("保质期")
+    private String qualityGuaranteePeriod; // 保质期
+	@ApiModelProperty("部门")
+    private String deptartment; // 部门
+	@ApiModelProperty("货架")
+    private String goodsShelves; // 货架
+	@ApiModelProperty("货架code")
+    private String goodsShelvesCode; // 货架code
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("毛利率")
+    private String grossProfitMargin; // 毛利率
+	@ApiModelProperty("采购员")
+    private String buyer; // 采购员
+	@ApiModelProperty("核算售价")
+    private String accountingSalesPrice; // 核算售价
+	@ApiModelProperty("最新进价")
+    private String latestPurchasePrice; // 最新进价
+	@ApiModelProperty("库存价")
+    private String inventoryPrice; // 库存价
+	@ApiModelProperty("合同进价")
+    private String contractPurchasePrice; // 合同进价
+	@ApiModelProperty("会员价")
+    private String membershipPrice; // 会员价
+	@ApiModelProperty("进项税率")
+    private String inputTaxRate; // 进项税率
+	@ApiModelProperty("销项税率")
+    private String outputTaxRate; // 销项税率
+	@ApiModelProperty("仓位")
+    private String position; // 仓位
+	@ApiModelProperty("仓位code")
+    private String positionCode; // 仓位code
+	@ApiModelProperty("结算供应商")
+    private String supplier; // 结算供应商
+	@ApiModelProperty("结算供应商Sid")
+    private String supplierSid; // 结算供应商Sid
+	@ApiModelProperty("配货方式")
+    private String distributionMethod; // 配货方式
+	@ApiModelProperty("配货方式Key")
+    private String distributionMethodKey; // 配货方式Key
+	@ApiModelProperty("来源单位")
+    private String sourceUnit; // 来源单位
+	@ApiModelProperty("管理到效期")
+    private String managementExpirationDate; // 管理到效期
+	@ApiModelProperty("配货价")
+    private String rationingPrice; // 配货价
+	@ApiModelProperty("最低售价")
+    private String lowestSellingPrice; // 最低售价
+	@ApiModelProperty("缺省进价")
+    private String defaultPurchasePrice; // 缺省进价
+	@ApiModelProperty("批发价")
+    private String tradePrice; // 批发价
+	@ApiModelProperty("规格说明")
+    private String specifications; // 规格说明
+	@ApiModelProperty("规格长宽高")
+    private String description; // 规格长宽高
+	@ApiModelProperty("规格重量")
+    private String weight; // 规格重量
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后调价时间")
+    private Date priceAdjustmentTimeStart; // 最后调价时间
+    private Date priceAdjustmentTimeEnd; // 最后调价时间
+	@ApiModelProperty("对方系统代码")
+    private String systemCode; // 对方系统代码
+	@ApiModelProperty("去税最新进价")
+    private String priceWithoutTax; // 去税最新进价
+	@ApiModelProperty("去税库存价")
+    private String taxableInventoryPrice; // 去税库存价
+	@ApiModelProperty("去税合同进价")
+    private String ContractPriceExcludingTax; // 去税合同进价
+	@ApiModelProperty("商品状态")
+    private String productStatus; // 商品状态
+    @ApiModelProperty("最新进价（需要每次导入采购订单更新的）")
+    private String newestPurchasePrice;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productinformation/ProductInformationVo.java

@@ -0,0 +1,174 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productinformation;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: ProductInformationVo.java <br/>
+ * Class: com.supervise.api.productinformation.ProductInformationVo <br/>
+ * Description: 商品档案信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品档案信息 视图数据对象", description = "商品档案信息 视图数据对象")
+public class ProductInformationVo implements Vo {
+
+    private String sid; // sid
+    private String id; // sid
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+	@ApiModelProperty("含量")
+    private String content; // 含量
+	@ApiModelProperty("类别")
+    private String category; // 类别
+	@ApiModelProperty("类别key")
+    private String categoryKey; // 类别key
+	@ApiModelProperty("规格单位")
+    private String unit; // 规格单位
+	@ApiModelProperty("制造厂")
+    private String manufacturer; // 制造厂
+	@ApiModelProperty("制造厂sid")
+    private String manufacturerSid; // 制造厂sid
+	@ApiModelProperty("品牌")
+    private String brand; // 品牌
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("产地")
+    private String placeOfOrigin; // 产地
+	@ApiModelProperty("等级")
+    private String grade; // 等级
+	@ApiModelProperty("等级key")
+    private String gradeKey; // 等级key
+	@ApiModelProperty("保质期")
+    private String qualityGuaranteePeriod; // 保质期
+	@ApiModelProperty("部门")
+    private String deptartment; // 部门
+	@ApiModelProperty("货架")
+    private String goodsShelves; // 货架
+	@ApiModelProperty("货架code")
+    private String goodsShelvesCode; // 货架code
+	@ApiModelProperty("第二代码")
+    private String secondCode; // 第二代码
+	@ApiModelProperty("毛利率")
+    private String grossProfitMargin; // 毛利率
+	@ApiModelProperty("采购员")
+    private String buyer; // 采购员
+	@ApiModelProperty("核算售价")
+    private String accountingSalesPrice; // 核算售价
+	@ApiModelProperty("最新进价")
+    private String latestPurchasePrice; // 最新进价
+	@ApiModelProperty("库存价")
+    private String inventoryPrice; // 库存价
+	@ApiModelProperty("合同进价")
+    private String contractPurchasePrice; // 合同进价
+	@ApiModelProperty("会员价")
+    private String membershipPrice; // 会员价
+	@ApiModelProperty("进项税率")
+    private String inputTaxRate; // 进项税率
+	@ApiModelProperty("销项税率")
+    private String outputTaxRate; // 销项税率
+	@ApiModelProperty("仓位")
+    private String position; // 仓位
+	@ApiModelProperty("仓位code")
+    private String positionCode; // 仓位code
+	@ApiModelProperty("结算供应商")
+    private String supplier; // 结算供应商
+	@ApiModelProperty("结算供应商Sid")
+    private String supplierSid; // 结算供应商Sid
+	@ApiModelProperty("配货方式")
+    private String distributionMethod; // 配货方式
+	@ApiModelProperty("配货方式Key")
+    private String distributionMethodKey; // 配货方式Key
+	@ApiModelProperty("来源单位")
+    private String sourceUnit; // 来源单位
+	@ApiModelProperty("管理到效期")
+    private String managementExpirationDate; // 管理到效期
+	@ApiModelProperty("配货价")
+    private String rationingPrice; // 配货价
+	@ApiModelProperty("最低售价")
+    private String lowestSellingPrice; // 最低售价
+	@ApiModelProperty("缺省进价")
+    private String defaultPurchasePrice; // 缺省进价
+	@ApiModelProperty("批发价")
+    private String tradePrice; // 批发价
+	@ApiModelProperty("规格说明")
+    private String specifications; // 规格说明
+	@ApiModelProperty("规格长宽高")
+    private String description; // 规格长宽高
+	@ApiModelProperty("规格重量")
+    private String weight; // 规格重量
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后调价时间")
+    private Date priceAdjustmentTimeStart; // 最后调价时间
+    private Date priceAdjustmentTimeEnd; // 最后调价时间
+	@ApiModelProperty("对方系统代码")
+    private String systemCode; // 对方系统代码
+	@ApiModelProperty("去税最新进价")
+    private String priceWithoutTax; // 去税最新进价
+	@ApiModelProperty("去税库存价")
+    private String taxableInventoryPrice; // 去税库存价
+	@ApiModelProperty("去税合同进价")
+    private String ContractPriceExcludingTax; // 去税合同进价
+	@ApiModelProperty("商品状态")
+    private String productStatus; // 商品状态
+    @ApiModelProperty("最新进价（需要每次导入采购订单更新的）")
+    private String newestPurchasePrice;
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productnum/ProductNum.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productnum;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: com.supervise(宇信通监管) <br/>
+ * File: WarehouseInfo.java <br/>
+ * Class: com.supervise.api.warehouseinfo.WarehouseInfo <br/>
+ * Description: 商品代码、商品名称. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-12 09:42:36 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品代码、商品名称信息", description = "商品代码、商品名称信息")
+@TableName("product_num")
+public class ProductNum extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("编码")
+    private String code; // 编码
+    @ApiModelProperty("名称")
+    private String name; // 名称
+    @ApiModelProperty("品类")
+    private String category; // 品类
+    @ApiModelProperty("品牌")
+    private String brand; // 品牌
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("结算供应商code")
+    private String supplierCode; // 结算供应商
+    @ApiModelProperty("结算供应商name")
+    private String supplierName; // 结算供应商
+    @ApiModelProperty("条码")
+    private String barCode; // 条码
+    @ApiModelProperty("单位")
+    private String unit; // 单位
+
+    @ApiModelProperty("进价")
+    private String purchasePrice; // 进价
+    @ApiModelProperty("配价")
+    private String valence;//配价
+    @ApiModelProperty("售价")
+    private String price; // 售价
+
+    @ApiModelProperty("箱规")
+    private String boxGauge; // 箱规
+    @ApiModelProperty("订货数量")
+    private String num; // 订货数量
+    @ApiModelProperty("订货金额")
+    private String orderAmount; // 订货金额
+
+    @ApiModelProperty("税票")
+    private String taxReceipt; // 税票
+    @ApiModelProperty("降价折扣")
+    private String discount;//降价折扣
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productnum/ProductNumDetailsVo.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productnum;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: com.supervise(宇信通监管) <br/>
+ * File: WarehouseInfoVo.java <br/>
+ * Class: com.supervise.api.warehouseinfo.WarehouseInfoVo <br/>
+ * Description: 商品代码、商品名称信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-12 09:42:36 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品代码、商品名称信息", description = "商品代码、商品名称信息")
+public class ProductNumDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("编码")
+    private String code; // 编码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+    @ApiModelProperty("品类")
+    private String category; // 品类
+    @ApiModelProperty("品牌")
+    private String brand; // 品牌
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("结算供应商code")
+    private String supplierCode; // 结算供应商
+    @ApiModelProperty("结算供应商name")
+    private String supplierName; // 结算供应商
+    @ApiModelProperty("条码")
+    private String barCode; // 条码
+    @ApiModelProperty("单位")
+    private String unit; // 单位
+
+    @ApiModelProperty("进价")
+    private String purchasePrice; // 进价
+    @ApiModelProperty("售价")
+    private String price; // 售价
+    @ApiModelProperty("箱规")
+    private String boxGauge; // 箱规
+    @ApiModelProperty("订货数量")
+    private String num; // 订货数量
+    @ApiModelProperty("订货金额")
+    private String orderAmount; // 订货金额
+
+    @ApiModelProperty("税票")
+    private String taxReceipt; // 税票
+    @ApiModelProperty("降价折扣")
+    private String discount;//降价折扣
+    @ApiModelProperty("配价")
+    private String valence;//配价
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productnum/ProductNumDto.java

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productnum;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: com.supervise(宇信通监管) <br/>
+ * File: WarehouseInfoDto.java <br/>
+ * Class: com.supervise.api.warehouseinfo.WarehouseInfoDto <br/>
+ * Description: 商品代码、商品名称信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-12 09:42:36 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "商品代码、商品名称信息", description = "商品代码、商品名称信息")
+public class ProductNumDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("编码")
+    private String code; // 编码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+    @ApiModelProperty("品类")
+    private String category; // 品类
+    @ApiModelProperty("品牌")
+    private String brand; // 品牌
+    @ApiModelProperty("批次")
+    private String pc; // 批次
+    @ApiModelProperty("结算供应商code")
+    private String supplierCode; // 结算供应商
+    @ApiModelProperty("结算供应商name")
+    private String supplierName; // 结算供应商
+    @ApiModelProperty("条码")
+    private String barCode; // 条码
+    @ApiModelProperty("单位")
+    private String unit; // 单位
+
+    @ApiModelProperty("进价")
+    private String purchasePrice; // 进价
+    @ApiModelProperty("售价")
+    private String price; // 售价
+    @ApiModelProperty("箱规")
+    private String boxGauge; // 箱规
+    @ApiModelProperty("订货数量")
+    private String num; // 订货数量
+    @ApiModelProperty("订货金额")
+    private String orderAmount; // 订货金额
+
+    @ApiModelProperty("税票")
+    private String taxReceipt; // 税票
+    @ApiModelProperty("降价折扣")
+    private String discount;//降价折扣
+    @ApiModelProperty("配价")
+    private String valence;//配价
+}

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/api/productnum/ProductNumFeign.java

@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.api.productnum;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: com.supervise(宇信通监管) <br/>
+ * File: WarehouseInfoFeign.java <br/>
+ * Class: com.supervise.api.warehouseinfo.WarehouseInfoFeign <br/>
+ * Description: 商品代码、商品名称信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-12 09:42:36 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "商品代码、商品名称信息")
+@FeignClient(
+        contextId = "com.supervise-ProductNum",
+        name = "com.supervise",
+        path = "v1/productnum",
+        fallback = ProductNumFeignFallback.class)
+public interface ProductNumFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ProductNumVo>> listPage(@RequestBody PagerQuery<ProductNumQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ProductNumDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ProductNumDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}