diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisition.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisition.java
new file mode 100644
index 00000000..69ce0388
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisition.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisition
+ * Description: 库房提供的采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @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; // 旧的订单编号
+
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionDetailsVo.java
new file mode 100644
index 00000000..34016013
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionVo.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionVo
+ * Description: 库房提供的采购订单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @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; // 旧的订单编号
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionDto.java
new file mode 100644
index 00000000..e059a980
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionDto.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionDto
+ * Description: 库房提供的采购订单表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @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; // 旧的订单编号
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionFeign.java
new file mode 100644
index 00000000..2c4a9d04
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionFeign.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionFeign
+ * Description: 库房提供的采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @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> listPage(@RequestBody PagerQuery 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 fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionFeignFallback.java
new file mode 100644
index 00000000..e80e9a12
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionFeignFallback.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionFeignFallback
+ * Description: 库房提供的采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class KfPurchaseRequisitionFeignFallback implements KfPurchaseRequisitionFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery 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 fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt-supervise/kfpurchaserequisition/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionQuery.java
new file mode 100644
index 00000000..dd9b6ff1
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionQuery.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionQuery
+ * Description: 库房提供的采购订单表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @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; // 旧的订单编号
+
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisition/KfPurchaseRequisitionVo.java
new file mode 100644
index 00000000..a044218d
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionVo.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionVo
+ * Description: 库房提供的采购订单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @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; // 旧的订单编号
+
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionPro.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionPro.java
new file mode 100644
index 00000000..ff3e9157
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionPro.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionPro
+ * Description: 库房采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @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; // 零售金额（对应采购订单中的零售金额）
+
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProDetailsVo.java
new file mode 100644
index 00000000..22e44ce0
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionProVo.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo
+ * Description: 库房采购订单商品信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @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; // 零售金额（对应采购订单中的零售金额）
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProDto.java
new file mode 100644
index 00000000..446d46f0
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionProDto.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProDto
+ * Description: 库房采购订单商品信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @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; // 零售金额（对应采购订单中的零售金额）
+
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProFeign.java
new file mode 100644
index 00000000..845ca49f
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionProFeign.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProFeign
+ * Description: 库房采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @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> listPage(@RequestBody PagerQuery 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 fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProFeignFallback.java
new file mode 100644
index 00000000..df4aa63d
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionProFeignFallback.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProFeignFallback
+ * Description: 库房采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class KfPurchaseRequisitionProFeignFallback implements KfPurchaseRequisitionProFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery 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 fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口yxt-supervise/kfpurchaserequisitionpro/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProQuery.java
new file mode 100644
index 00000000..1f56773d
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionProQuery.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProQuery
+ * Description: 库房采购订单商品信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @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; // 零售金额（对应采购订单中的零售金额）
+
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/kfpurchaserequisitionpro/KfPurchaseRequisitionProVo.java
new file mode 100644
index 00000000..90bf53dc
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/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(宇信通监管)
+ * File: KfPurchaseRequisitionProVo.java
+ * Class: com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo
+ * Description: 库房采购订单商品信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @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; // 零售金额（对应采购订单中的零售金额）
+
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisition.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisition.java
index b27eff63..3e5e786f 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisition.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisition.java
@@ -84,4 +84,8 @@ public class PurchaseRequisition extends BaseEntity {
private String warehousePosition;//仓位
@ApiModelProperty("仓位code")
private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java
index 7cab9f7f..c4b111ae 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java
@@ -84,4 +84,8 @@ public class PurchaseRequisitionDetailsVo implements Vo {
private String warehousePosition;//仓位
@ApiModelProperty("仓位code")
private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java
index afd4019c..c814cfe6 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java
@@ -84,4 +84,8 @@ public class PurchaseRequisitionDto implements Dto {
private String warehousePosition;//仓位
@ApiModelProperty("仓位code")
private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionQuery.java
index d8e7b2a5..5bccc8a8 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionQuery.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionQuery.java
@@ -82,4 +82,8 @@ public class PurchaseRequisitionQuery implements Query {
private String warehousePosition;//仓位
@ApiModelProperty("仓位code")
private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionVo.java
index d3b14700..ea41d01a 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionVo.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionVo.java
@@ -84,4 +84,8 @@ public class PurchaseRequisitionVo implements Vo {
private String warehousePosition;//仓位
@ApiModelProperty("仓位code")
private String warehousePositionCode;//
+ @ApiModelProperty("新订单编号")
+ private String newCode;//
+ @ApiModelProperty("旧订单编号")
+ private String oldCode;//
}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionMapper.java
new file mode 100644
index 00000000..7de595ca
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.kfpurchaserequisition;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisition;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管)
+ * File: KfPurchaseRequisitionMapper.java
+ * Class: com.yxt.supervise.portal.biz.kfpurchaserequisition.KfPurchaseRequisitionMapper
+ * Description: 库房提供的采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface KfPurchaseRequisitionMapper extends BaseMapper {
+
+ //@Update("update kf_purchase_requisition set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from kf_purchase_requisition")
+ List selectListVo();
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionMapper.xml
new file mode 100644
index 00000000..a1b608f0
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionRest.java
new file mode 100644
index 00000000..2f2c0bd8
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionRest.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.kfpurchaserequisition;
+
+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.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisition;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionQuery;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionDetailsVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionDto;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionFeign;
+
+/**
+ * Project: yxt-supervise(宇信通监管)
+ * File: KfPurchaseRequisitionFeignFallback.java
+ * Class: com.yxt.supervise.portal.biz.kfpurchaserequisition.KfPurchaseRequisitionRest
+ * Description: 库房提供的采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库房提供的采购订单表")
+@RestController("com.yxt.supervise.portal.biz.kfpurchaserequisition.KfPurchaseRequisitionRest")
+@RequestMapping("v1/kfpurchaserequisition")
+public class KfPurchaseRequisitionRest implements KfPurchaseRequisitionFeign {
+
+ @Autowired
+ private KfPurchaseRequisitionService kfPurchaseRequisitionService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = kfPurchaseRequisitionService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody KfPurchaseRequisitionDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ kfPurchaseRequisitionService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ kfPurchaseRequisitionService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ KfPurchaseRequisitionDetailsVo vo = kfPurchaseRequisitionService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionService.java
new file mode 100644
index 00000000..6bd28b64
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisition/KfPurchaseRequisitionService.java
@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.kfpurchaserequisition;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+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.kfpurchaserequisition.KfPurchaseRequisition;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionQuery;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionDetailsVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionDto;
+import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管)
+ * File: KfPurchaseRequisitionService.java
+ * Class: com.yxt.supervise.portal.biz.kfpurchaserequisition.KfPurchaseRequisitionService
+ * Description: 库房提供的采购订单表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class KfPurchaseRequisitionService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(KfPurchaseRequisitionQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ KfPurchaseRequisitionQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(KfPurchaseRequisitionDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(KfPurchaseRequisitionDto dto){
+ KfPurchaseRequisition entity = new KfPurchaseRequisition();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(KfPurchaseRequisitionDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ KfPurchaseRequisition entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public KfPurchaseRequisitionDetailsVo fetchDetailsVoBySid(String sid){
+ KfPurchaseRequisition entity = fetchBySid(sid);
+ KfPurchaseRequisitionDetailsVo vo = new KfPurchaseRequisitionDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProMapper.java
new file mode 100644
index 00000000..411ee94d
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.kfpurchaserequisitionpro;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionPro;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管)
+ * File: KfPurchaseRequisitionProMapper.java
+ * Class: com.yxt.supervise.portal.biz.kfpurchaserequisitionpro.KfPurchaseRequisitionProMapper
+ * Description: 库房采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface KfPurchaseRequisitionProMapper extends BaseMapper {
+
+ //@Update("update kf_purchase_requisition_pro set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from kf_purchase_requisition_pro")
+ List selectListVo();
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProMapper.xml
new file mode 100644
index 00000000..c91828bd
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProRest.java
new file mode 100644
index 00000000..d77a49cc
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProRest.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.kfpurchaserequisitionpro;
+
+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.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionPro;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProQuery;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProDetailsVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProDto;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProFeign;
+
+/**
+ * Project: yxt-supervise(宇信通监管)
+ * File: KfPurchaseRequisitionProFeignFallback.java
+ * Class: com.yxt.supervise.portal.biz.kfpurchaserequisitionpro.KfPurchaseRequisitionProRest
+ * Description: 库房采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库房采购订单商品信息")
+@RestController("com.yxt.supervise.portal.biz.kfpurchaserequisitionpro.KfPurchaseRequisitionProRest")
+@RequestMapping("v1/kfpurchaserequisitionpro")
+public class KfPurchaseRequisitionProRest implements KfPurchaseRequisitionProFeign {
+
+ @Autowired
+ private KfPurchaseRequisitionProService kfPurchaseRequisitionProService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = kfPurchaseRequisitionProService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody KfPurchaseRequisitionProDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ kfPurchaseRequisitionProService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ kfPurchaseRequisitionProService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ KfPurchaseRequisitionProDetailsVo vo = kfPurchaseRequisitionProService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProService.java
new file mode 100644
index 00000000..101051ea
--- /dev/null
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/kfpurchaserequisitionpro/KfPurchaseRequisitionProService.java
@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.portal.biz.kfpurchaserequisitionpro;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+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.KfPurchaseRequisitionPro;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProQuery;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProDetailsVo;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProDto;
+import com.yxt.supervise.portal.api.kfpurchaserequisitionpro.KfPurchaseRequisitionProFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt-supervise(宇信通监管)
+ * File: KfPurchaseRequisitionProService.java
+ * Class: com.yxt.supervise.portal.biz.kfpurchaserequisitionpro.KfPurchaseRequisitionProService
+ * Description: 库房采购订单商品信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-07 16:24:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class KfPurchaseRequisitionProService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(KfPurchaseRequisitionProQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ KfPurchaseRequisitionProQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(KfPurchaseRequisitionProDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(KfPurchaseRequisitionProDto dto){
+ KfPurchaseRequisitionPro entity = new KfPurchaseRequisitionPro();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(KfPurchaseRequisitionProDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ KfPurchaseRequisitionPro entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public KfPurchaseRequisitionProDetailsVo fetchDetailsVoBySid(String sid){
+ KfPurchaseRequisitionPro entity = fetchBySid(sid);
+ KfPurchaseRequisitionProDetailsVo vo = new KfPurchaseRequisitionProDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java
index 7d13475c..ec20c4b8 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java
@@ -573,7 +573,7 @@ public class ProductNumService extends MybatisBaseService restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid);
+ if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){
+ pr.setState(1);
+ }else{
+ RestrictedCategory restrictedCategory=new RestrictedCategory();
+ restrictedCategory.setCategorys("["+categoryKey+"]");
+ restrictedCategory.setBrands("["+brandSid+"]");
+ restrictedCategoryService.insert(restrictedCategory);
+ }
}
if(StringUtils.isNotBlank(p.getCode())){
@@ -266,7 +289,7 @@ public class PurchaseRequisitionService extends MybatisBaseService ${ew.sqlSegment}
- insert into salestest(t1,t2,t3,t4,t5,t6,t7,t8,t9) values
+ insert into salestest(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10) values
(#{item.t1,jdbcType=VARCHAR},
#{item.t2,jdbcType=VARCHAR},
@@ -22,6 +22,7 @@
#{item.t7,jdbcType=VARCHAR},
#{item.t8,jdbcType=VARCHAR},
#{item.t9,jdbcType=VARCHAR})
+ #{item.t10,jdbcType=VARCHAR})
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java
index 3a2dda54..23edf381 100644
--- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java
+++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java
@@ -436,6 +436,7 @@ public class SalesDataService extends MybatisBaseService