From 57c0b7023e03d975d7ae91bed10ed30f1ea7bb4b Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 23 Jul 2024 17:36:09 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/func/goodsspu/GoodsSpuService.java | 21 +++++++++-- .../biz/func/goodsspu/SalesGoodsQuery.java | 2 ++ .../oms/biz/func/goodsspu/SalesGoodsVo.java | 26 ++++++++++++++ .../SmsSalesBillDetailDetailsVo.java | 20 +++++++++++ .../smssalesbill/SmsSalesBillDetailsVo.java | 14 ++++++++ .../func/smssalesbill/SmsSalesBillDto.java | 14 +++++++- .../WarehouseInventoryFeign.java | 36 +++++++++++++++++++ 7 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java index f76de80..46d94b9 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.oms.feign.goods.goodsSpu.GoodsSpuFeign; +import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,11 +22,25 @@ import java.util.stream.Collectors; * @date 2024/2/26 13:40 */ @Service -public class GoodsSpuService { - private GoodsSpuFeign goodsSpuFeign; +public class GoodsSpuService { + @Autowired + private GoodsSpuFeign goodsSpuFeign; + @Autowired + private WarehouseInventoryFeign warehouseInventoryFeign; public ResultBean> getGoodsForSales(PagerQuery pq) { - return goodsSpuFeign.getGoodsForSales(pq); + ResultBean> goodsForSales = goodsSpuFeign.getGoodsForSales(pq); + PagerVo data = goodsForSales.getData(); + List records = data.getRecords(); + if (!records.isEmpty()) { + for (SalesGoodsVo record : records) { + String count = warehouseInventoryFeign.selInventoryCountBySkuSid(record.getGoodsSkuSid()); + record.setInventoryCount(count); + } + } + data.setRecords(records); + goodsForSales.setData(data); + return goodsForSales; } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java index 2df5ca5..dd8f403 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java @@ -12,4 +12,6 @@ import lombok.Data; public class SalesGoodsQuery implements Query { private String goodsName; private String createOrgSid; + private String goodsSkuCode; + private String goodsSkuOwnSpec; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java index 46606c4..c162fe9 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java @@ -3,6 +3,9 @@ package com.yxt.oms.biz.func.goodsspu; import com.yxt.common.core.vo.Vo; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @author Fan * @description @@ -59,4 +62,27 @@ public class SalesGoodsVo implements Vo { * 重量（kg） */ private String weight; + + /** + * 成本均价 + */ + private String costPrice; + /** + * 参考进价 + */ + private String standardPurchasePrice; + /** + * 实际可用库存 + */ + private String inventoryCount; + + /** + * 图片 + */ + private List pic = new ArrayList<>(); + + private String picUrl; + + + } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java index 515d236..5ee5fb5 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java @@ -31,6 +31,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: ss-sales(ss-sales)
* File: SmsSalesBillDetailVo.java
@@ -90,4 +93,21 @@ public class SmsSalesBillDetailDetailsVo implements Vo { private String inventoryCount; // 库存数量 @ApiModelProperty("备注") private String remarks; // 备注 + + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @ApiModelProperty("税率") + private String taxRate; // 库存数量 + @ApiModelProperty("税额") + private String taxAmount; // 税额 + @ApiModelProperty("未含税价") + private String unTaxPrice; // 未含税价 + @ApiModelProperty("总税额（未含税总额）") + private String taxTotalAmount; // 总税额（未含税总额） + @ApiModelProperty("图片") + private String goodsImgUrl; // 图片 + /** + * 图片 + */ + private List pic = new ArrayList<>(); } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java index 8c039e4..6052d6a 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java @@ -165,4 +165,18 @@ public class SmsSalesBillDetailsVo implements Vo { @ApiModelProperty("付款凭证") private List files = new ArrayList<>(); // 付款凭证 + + //-------------补充------------- + @ApiModelProperty("快递公司sid") + private String logisticsNameSid; // 快递公司sid + @ApiModelProperty("收货人sid") + private String shipperSid; // 收货人sid + @ApiModelProperty("固定电话") + private String phone; // 固定电话 + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("订单号") + private String billNo; // 订单号 } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java index f77dcb7..b70c1d6 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java @@ -165,7 +165,19 @@ public class SmsSalesBillDto implements Dto { @ApiModelProperty("付款凭证") private List files = new ArrayList<>(); // 付款凭证 - + //-------------补充------------- + @ApiModelProperty("快递公司sid") + private String logisticsNameSid; // 快递公司sid + @ApiModelProperty("收货人sid") + private String shipperSid; // 收货人sid + @ApiModelProperty("固定电话") + private String phone; // 固定电话 + @ApiModelProperty("店铺sid") + private String shopSid; // 店铺sid + @ApiModelProperty("店铺名称") + private String shopName; // 店铺名称 + @ApiModelProperty("订单号") + private String billNo; // 订单号 } diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java new file mode 100644 index 0000000..d251fad --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java @@ -0,0 +1,36 @@ +package com.yxt.oms.feign.warehouse.warehouseInventory; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; +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.RequestParam; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库存") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseInventory", + name = "ss-common-WarehouseInventory", + path = "/apiadmin/inventory/Warehouseinventory" + ) +public interface WarehouseInventoryFeign { + @ApiOperation("根据skuSid查询商品库存") + @PostMapping("/selInventoryCountBySkuSid") + public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid); +} From d308c2207f7be25b7780231c495f46f8f7371b82 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 24 Jul 2024 08:59:38 +0800 Subject: [PATCH 02/20] .gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5f39bc0..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/oms-biz.iml -/gateway/gateway.iml -/oms/oms.iml From ee4eb46cda0c8a9994b301cb9e410a8fd0f05809 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 24 Jul 2024 09:50:26 +0800 Subject: [PATCH 03/20] =?UTF-8?q?oms=E9=87=87=E8=B4=AD=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../func/purchasebill/PurchaseBillQuery.java | 22 ++++++++++--------- .../biz/func/purchasebill/PurchaseBillVo.java | 13 +++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java index e4fd620..6dadc59 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java @@ -34,26 +34,28 @@ import lombok.Data; @ApiModel(value = "采购单 查询条件", description = "采购单 查询条件") public class PurchaseBillQuery implements Query { + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; @ApiModelProperty("供应商名称") - private String supplierName; + private String supplierSid; @ApiModelProperty("仓库名称") - private String wareHouseName; + private String wareHouseSid; @ApiModelProperty("收货状态key") private String receiveStateKey; @ApiModelProperty("物流单号") private String logisticsNum; - @ApiModelProperty("发货状态key") - private String deliveryStateKey; @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("采购员姓名") - private String purchaserName; + @ApiModelProperty("采购员") + private String purchaserSid; @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("创建开始日期") - private String createStartTime; - @ApiModelProperty("创建结束日期") - private String createEndTime; + @ApiModelProperty("发货状态key") + private String deliveryStateKey; + @ApiModelProperty("商品sid") + private String goodsSid; private String orgLevelKey; @ApiModelProperty("菜单路由") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java index e6f7ac7..0771f75 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java @@ -61,16 +61,29 @@ public class PurchaseBillVo implements Vo { private BigDecimal otherAmount; @ApiModelProperty("预付金额") private BigDecimal prepayment; + @ApiModelProperty("总税额") + private BigDecimal taxAmount; @ApiModelProperty("物流单号") private String logisticsNum; @ApiModelProperty("生产进度") private String productProgress; + @ApiModelProperty("未含税总价（未含税价*采购数量）") + private BigDecimal unTaxTotalAmount; @ApiModelProperty("总采购数量") private String countTotal; + @ApiModelProperty("已入库数量") + private BigDecimal enterWareCount; + @ApiModelProperty("已入库金额") + private BigDecimal enterWareAmount; + @ApiModelProperty("已发货数量") + private BigDecimal deliveryCount; @ApiModelProperty("发货状态value") private Integer deliveryStateValue; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("制单人姓名") private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("最后修改时间") + private Date modifyTime; } From bed39701df20f3492590e83f068b7b5c14bb04a6 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 24 Jul 2024 10:37:55 +0800 Subject: [PATCH 04/20] =?UTF-8?q?oms=E9=87=87=E8=B4=AD=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasebill/PurchaseBillDetailsVo.java | 3 + .../func/purchasebill/PurchaseBillDto.java | 3 + .../PurchaseBillBatchDetailsVo.java | 73 +++++++++++++++++++ .../PurchaseBillBatchDto.java | 73 +++++++++++++++++++ 4 files changed, 152 insertions(+) create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDto.java diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java index 8ffe5ea..84c3ea1 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java @@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl; import com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountDetailsVo; +import com.yxt.oms.biz.func.purchasebillbatch.PurchaseBillBatchDetailsVo; import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDetailsVo; import com.yxt.oms.biz.func.purchasebillextend.PurchaseBillExtendDetailsVo; import io.swagger.annotations.ApiModel; @@ -101,6 +102,8 @@ public class PurchaseBillDetailsVo implements Vo { private PurchaseBillExtendDetailsVo purchaseBillExtend; @ApiModelProperty("采购单商品明细") private List purchaseBillDetailList; + @ApiModelProperty("采购商品扩展") + private List purchaseBillBatchList; @ApiModelProperty("附件") private List purchaseAppendixList; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java index d7a0d34..de0c8a0 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java @@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; import com.yxt.oms.biz.func.purchaseappendix.PurchaseAppendixUrl; import com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountDto; +import com.yxt.oms.biz.func.purchasebillbatch.PurchaseBillBatchDto; import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto; import com.yxt.oms.biz.func.purchasebillextend.PurchaseBillExtendDto; import io.swagger.annotations.ApiModel; @@ -103,6 +104,8 @@ public class PurchaseBillDto implements Dto { private PurchaseBillExtendDto purchaseBillExtend; @ApiModelProperty("采购单商品明细") private List purchaseBillDetailList; + @ApiModelProperty("采购商品扩展") + private List purchaseBillBatchList; @ApiModelProperty("附件") private List purchaseAppendixList; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDetailsVo.java new file mode 100644 index 0000000..de63d25 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDetailsVo.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillbatch; + + +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: ss-purchase(采购单)
+ * File: PurchaseBillBatchVo.java
+ * Class: com.yxt.purchase.api.purchasebillbatch.PurchaseBillBatchVo
+ * Description: 采购单商品-批次 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单商品-批次 视图数据详情", description = "采购单商品-批次 视图数据详情") +public class PurchaseBillBatchDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("采购单商品明细sid") + private String billDetailSid; // 采购单商品明细sid + @ApiModelProperty("序列号") + private String sortNo; // 序列号 + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("生产日期") + private Date madeDate; // 生产日期 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("过期日期") + private Date expireDate; // 过期日期 + @ApiModelProperty("货号") + private String goodsNum; // 货号 + +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDto.java new file mode 100644 index 0000000..04c5a41 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebillbatch/PurchaseBillBatchDto.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebillbatch; + + +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: ss-purchase(采购单)
+ * File: PurchaseBillBatchDto.java
+ * Class: com.yxt.purchase.api.purchasebillbatch.PurchaseBillBatchDto
+ * Description: 采购单商品-批次 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单商品-批次 数据传输对象", description = "采购单商品-批次 数据传输对象") +public class PurchaseBillBatchDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("采购单sid") + private String billSid; // 采购单sid + @ApiModelProperty("采购单商品明细sid") + private String billDetailSid; // 采购单商品明细sid + @ApiModelProperty("序列号") + private String sortNo; // 序列号 + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("生产日期") + private Date madeDate; // 生产日期 + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("过期日期") + private Date expireDate; // 过期日期 + @ApiModelProperty("货号") + private String goodsNum; // 货号 + +} \ No newline at end of file From c3b7d9162565478906e66dda5c5969dd1bc58ff0 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 24 Jul 2024 17:54:02 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/CrmCustomerTempRest.java | 122 ++++++++++++++++++ .../crmcustomer/CrmCustomerTempService.java | 67 ++++++++++ .../func/crmcustomer/SalesCustomerQuery.java | 28 ++++ .../biz/func/crmcustomer/SalesCustomerVo.java | 59 +++++++++ .../biz/func/goodsspu/GoodsSpuService.java | 16 ++- .../oms/biz/func/smssalesbill/AccountVo.java | 21 +++ .../smssalesbill/SmsSalesBillDetailsVo.java | 10 +- .../func/smssalesbill/SmsSalesBillDto.java | 7 +- .../customertemp/CrmCustomerTempFeign.java | 94 ++++++++++++++ .../feign/goods/goodsSpu/GoodsSpuFeign.java | 2 +- .../oms/feign/goods/sku/GoodsSkuFeign.java | 2 +- .../sales/smssalesbill/SmsSalesBillFeign.java | 2 +- .../smssalesreturn/SmsSalesReturnFeign.java | 2 +- .../WarehouseInventoryFeign.java | 2 +- .../warehouseinfo/WarehouseInfoFeign.java | 2 +- 15 files changed, 415 insertions(+), 21 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmCustomerTempRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/AccountVo.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/customer/customertemp/CrmCustomerTempFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmCustomerTempRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmCustomerTempRest.java new file mode 100644 index 0000000..e459d4a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/CrmCustomerTempRest.java @@ -0,0 +1,122 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + +import com.yxt.oms.biz.func.crmcustomer.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +/** + * Project: anrui-crm(客户管理)
+ * File: CrmCustomerTempFeignFallback.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomertemp.CrmCustomerTempRest
+ * Description: 潜在客户信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-12 11:21:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "潜在客户信息") +@RestController +@RequestMapping("v1/crmcustomertemp") +public class CrmCustomerTempRest { + + @Autowired + private CrmCustomerTempService crmCustomerTempService; + + @ApiOperation("销售订单选择客户") + @PostMapping("/chooseCustomerList") + public ResultBean> chooseCustomerList(@RequestBody PagerQuery pq) { + return crmCustomerTempService.chooseCustomerList(pq); + } + +// +// /** +// * 潜在客户管理的分页查询 +// * +// * @param pq +// * @return +// */ +// @ApiOperation("根据条件分页查询数据的列表") +// @PostMapping("/listPage") +// public ResultBean> listPage(@RequestBody PagerQuery pq) { +// return crmCustomerTempService.listPageVo(pq); +// } +// +// +// /** +// * 潜在客户新增保存 +// * +// * @param dto 数据传输对象 +// * @return +// */ +// @ApiOperation("新增保存") +// @PostMapping("/save") +// public ResultBean save(@Valid @RequestBody CrmCustomerTempDto dto) { +// return crmCustomerTempService.saveCrmCustomer(dto); +// } +// +// /** +// * 潜在客户修改保存 +// * +// * @param dto 数据传输对象 +// * @param sid 潜在客户sid +// * @return +// */ +// @ApiOperation("修改保存") +// @PostMapping("/update/{sid}") +// public ResultBean update(@RequestBody CrmCustomerTempUpdateDto dto, @PathVariable("sid") String sid) { +// ResultBean rb = ResultBean.fireFail(); +// String weixin = dto.getWeixin(); +// if (StringUtils.isNotBlank(weixin)) { +// if (!weixin.matches("^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$") && !weixin.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) { +// return rb.setMsg("微信号格式不正确"); +// } +// } +// String email = dto.getE_mail(); +// if (StringUtils.isNotBlank(email)) { +// if (!email.matches("^[0-9A-Za-z][\\.-_0-9A-Za-z]*@[0-9A-Za-z]+(?:\\.[0-9A-Za-z]+)+$")) { +// return rb.setMsg("邮箱格式不正确"); +// } +// } +// ResultBean resultBean = crmCustomerTempService.updateCrmCustomer(dto, sid); +// if (!resultBean.getSuccess()) { +// return rb.setMsg(resultBean.getMsg()); +// } +// return rb.success().setMsg(resultBean.getMsg()); +// } +// +// @ApiOperation("删除记录") +// @DeleteMapping("/del") +// public ResultBean del(@RequestBody String[] sid) { +// ResultBean rb = ResultBean.fireFail(); +// crmCustomerTempService.delBySids(sid); +// return rb.success(); +// } +// +// @ApiOperation("获取一条记录") +// @GetMapping("/fetchSid/{sid}") +// public ResultBean fetchSid(@PathVariable("sid") String sid) { +// ResultBean rb = ResultBean.fireFail(); +// CrmCustomerTemp customerTemp = crmCustomerTempService.fetchBySid(sid); +// if (customerTemp == null) { +// return rb.setMsg("该客户不存在"); +// } +// CrmCustomerTempVo vo = crmCustomerTempService.fetchAllBySid(sid); +// return rb.success().setData(vo); +// } + + + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java new file mode 100644 index 0000000..9fe395d --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/CrmCustomerTempService.java @@ -0,0 +1,67 @@ +package com.yxt.oms.biz.func.crmcustomer; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.HanZiConverterPinYin; +import com.yxt.common.base.utils.HttpStatusEnum; +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.oms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.oms.feign.customer.customertemp.CrmCustomerTempFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserFeign; +import com.yxt.oms.feign.portal.sysuser.SysUserVo; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; + +/** + * Project: anrui-crm(客户管理)
+ * File: CrmCustomerTempService.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomertemp.CrmCustomerTempService
+ * Description: 潜在客户信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-12 11:21:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class CrmCustomerTempService { + public static final Logger logger = LoggerFactory.getLogger(CrmCustomerTempService.class); + + @Autowired + private FileUploadComponent fileUploadComponent; + @Resource + private SysUserFeign sysUserFeign; + @Autowired + private CrmCustomerTempFeign crmCustomerTempFeign; + +// public ResultBean> listPageVo(PagerQuery pq) { +// if (StringUtils.isNotBlank(pq.getParams().getUserSid())) { +// String staffSid = sysUserFeign.selectBySid(pq.getParams().getUserSid()).getData().getStaffSid(); +// pq.getParams().setStaffSid(staffSid); +// } +// return crmCustomerTempFeign.listPage(pq); +// } + + + public ResultBean> chooseCustomerList(PagerQuery pq) { + ResultBean> pagerVoResultBean = crmCustomerTempFeign.chooseCustomerList(pq); + return pagerVoResultBean; + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerQuery.java new file mode 100644 index 0000000..3147a6e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerQuery.java @@ -0,0 +1,28 @@ +package com.yxt.oms.biz.func.crmcustomer; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/24 15:17 + */ +@Data +public class SalesCustomerQuery implements Query { + + private String createOrgSid; + /** + * 客户编码 + */ + private String customerNo; + /** + * 手机号 + */ + private String mobile; + /** + * 客户名称 + */ + private String name; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerVo.java b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerVo.java new file mode 100644 index 0000000..5908015 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/crmcustomer/SalesCustomerVo.java @@ -0,0 +1,59 @@ +package com.yxt.oms.biz.func.crmcustomer; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/24 15:18 + */ +@Data +public class SalesCustomerVo { + + /** + * 地址 + */ + private String address; + /** + * 昵称 + */ + private String buyserNickname; + /** + * 市 + */ + private String city; + /** + * 县 + */ + private String county; + /** + * 客户编码 + */ + private String customerNo; + /** + * 手机 + */ + private String mobile; + /** + * 客户名称 + */ + private String name; + /** + * 平台 + */ + private String originalPlat; + /** + * 固话 + */ + private String phone; + /** + * 省 + */ + private String province; + private String sid; + /** + * 街道 + */ + private String street; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java index 46d94b9..829b20f 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java @@ -32,15 +32,17 @@ public class GoodsSpuService { public ResultBean> getGoodsForSales(PagerQuery pq) { ResultBean> goodsForSales = goodsSpuFeign.getGoodsForSales(pq); PagerVo data = goodsForSales.getData(); - List records = data.getRecords(); - if (!records.isEmpty()) { - for (SalesGoodsVo record : records) { - String count = warehouseInventoryFeign.selInventoryCountBySkuSid(record.getGoodsSkuSid()); - record.setInventoryCount(count); + if (data != null) { + List records = data.getRecords(); + if (!records.isEmpty()) { + for (SalesGoodsVo record : records) { + String count = warehouseInventoryFeign.selInventoryCountBySkuSid(record.getGoodsSkuSid()); + record.setInventoryCount(count); + } } + data.setRecords(records); + goodsForSales.setData(data); } - data.setRecords(records); - goodsForSales.setData(data); return goodsForSales; } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/AccountVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/AccountVo.java new file mode 100644 index 0000000..a6099fe --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/AccountVo.java @@ -0,0 +1,21 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/24 17:19 + */ +@Data +public class AccountVo { + + @ApiModelProperty("结算账户") + private String bankAccount; // 结算账户 + @ApiModelProperty("结算账户") + private String bankAccountKey; // 结算账户 + @ApiModelProperty("结算金额") + private String amount; // 结算金额 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java index 6052d6a..981b645 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java @@ -158,13 +158,13 @@ public class SmsSalesBillDetailsVo implements Vo { private String advanceBalance; // 预收款余额 //结算 @ApiModelProperty("结算账户") - private String bankAccount; // 结算账户 - @ApiModelProperty("结算金额") - private String settleAmount; // 结算金额 - + private List accounts; @ApiModelProperty("付款凭证") private List files = new ArrayList<>(); // 付款凭证 - + @ApiModelProperty("结算账户") + private String bankAccount; // 结算账户 + @ApiModelProperty("结算账户") + private String bankAccountKey; // 结算账户 //-------------补充------------- @ApiModelProperty("快递公司sid") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java index b70c1d6..a01f8ab 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java @@ -158,10 +158,11 @@ public class SmsSalesBillDto implements Dto { private String advanceBalance; // 预收款余额 //结算 @ApiModelProperty("结算账户") + private List accounts; + @ApiModelProperty("结算账户") private String bankAccount; // 结算账户 - @ApiModelProperty("结算金额") - private String settleAmount; // 结算金额 - + @ApiModelProperty("结算账户") + private String bankAccountKey; // 结算账户 @ApiModelProperty("付款凭证") private List files = new ArrayList<>(); // 付款凭证 diff --git a/oms/src/main/java/com/yxt/oms/feign/customer/customertemp/CrmCustomerTempFeign.java b/oms/src/main/java/com/yxt/oms/feign/customer/customertemp/CrmCustomerTempFeign.java new file mode 100644 index 0000000..2d49bdd --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/customer/customertemp/CrmCustomerTempFeign.java @@ -0,0 +1,94 @@ +package com.yxt.oms.feign.customer.customertemp; + + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.crmcustomer.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * Project: anrui-crm(客户管理)
+ * File: CrmCustomerTempFeign.java
+ * Class: com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign
+ * Description: 潜在客户信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-12 11:21:16
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "潜在客户信息") +@FeignClient( + contextId = "ss-common-customer-CrmCustomerTemp", + name = "ss-common-customer", + path = "v1/crmcustomertemp" + ) +public interface CrmCustomerTempFeign { + + @ApiOperation("销售订单选择客户") + @PostMapping("/chooseCustomerList") + public ResultBean> chooseCustomerList(@RequestBody PagerQuery pq); + +// /** +// * 潜在客户管理的分页查询 +// * +// * @param pq +// * @return +// */ +// @ApiOperation("根据条件分页查询数据的列表") +// @PostMapping("/listPage") +// public ResultBean> listPage(@RequestBody PagerQuery pq); +// +// /** +// * pc端潜在客户新增保存 +// * +// * @param dto 客户信息及运行信息数据传输对象 +// * @return +// */ +// @ApiOperation("新增保存") +// @PostMapping("/save") +// public ResultBean save(@Valid @RequestBody CrmCustomerTempDto dto); +// +// /** +// * pc端潜在客户编辑保存 +// * +// * @param dto 数据传输对象 +// * @param sid 潜在客户sid +// * @return +// */ +// @ApiOperation("修改保存") +// @PostMapping("/update/{sid}") +// public ResultBean update(@RequestBody CrmCustomerTempUpdateDto dto, @PathVariable("sid") String sid); +// +// /** +// * pc潜在客户的批量删除 +// * +// * @param sid +// * @return +// */ +// @ApiOperation("删除记录") +// @DeleteMapping("/del") +// public ResultBean del(@RequestBody String[] sid); +// +// /** +// * pc潜在客户的编辑回显 +// * +// * @param sid +// * @return +// */ +// @ApiOperation("获取一条记录") +// @GetMapping("/fetchSid/{sid}") +// public ResultBean fetchSid(@PathVariable("sid") String sid); + + + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java index 8c40793..5ba2975 100644 --- a/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; **/ @FeignClient( contextId = "ss-goods-GoodsSpu", - name = "ss-goods", + name = "ss-common-goods", path = "/apiadmin/base/basegoodsspu") public interface GoodsSpuFeign { diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java index 464393d..6b1fc7b 100644 --- a/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/goods/sku/GoodsSkuFeign.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; **/ @FeignClient( contextId = "ss-goods-GoodsSku", - name = "ss-goods", + name = "ss-common-goods", path = "/apiadmin/base/basegoodssku") public interface GoodsSkuFeign { diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java index 77ecaec..92f75bb 100644 --- a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; **/ @FeignClient( contextId = "ss-common-sales-SmsSalesBill", - name = "ss-common-smssalesbill", + name = "ss-common-sales", path = "/v1/smssalesbill", fallback = SmsSalesBillFeignFallback.class) public interface SmsSalesBillFeign { diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java index 8ab6cce..6d452ac 100644 --- a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java @@ -55,7 +55,7 @@ import java.util.List; @Api(tags = "销售退货单据") @FeignClient( contextId = "sms-SmsSalesReturn", - name = "sms", + name = "ss-common-sales", path = "v1/smssalesreturn" ) public interface SmsSalesReturnFeign { diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java index d251fad..abc23fb 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java @@ -26,7 +26,7 @@ import java.util.List; @Api(tags = "库存") @FeignClient( contextId = "ss-common-warehouse-WarehouseInventory", - name = "ss-common-WarehouseInventory", + name = "ss-common-warehouse", path = "/apiadmin/inventory/Warehouseinventory" ) public interface WarehouseInventoryFeign { diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java index 4621d05..c96771f 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java @@ -31,7 +31,7 @@ import java.util.List; @Api(tags = "仓库") @FeignClient( contextId = "ss-common-warehouse-WmsHouseInfo", - name = "ss-common-WmsHouseInfo", + name = "ss-common-warehouse", path = "/apiadmin/warehouseinfo" ) public interface WarehouseInfoFeign { From d8e0569b9b46c60900e7004151658f8b4e330857 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 25 Jul 2024 11:02:24 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=95=86=E5=93=81=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E9=87=87=E8=B4=AD=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90=20=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AE=A1=E6=A0=B8=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E6=93=8D=E4=BD=9C=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C?= =?UTF-8?q?=E6=88=90=20=E9=87=87=E8=B4=AD=E5=8D=95=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/PurchaseBillRest.java | 18 +++++ .../aggregation/PurchaseFlowNodeRest.java | 68 ++++++++++++++++++ .../purchasebill/GoodsSkuPurSelectList.java | 16 +++++ .../func/purchasebill/PurchaseBillExVo.java | 71 +++++++++++++++++++ .../purchasebill/PurchaseBillService.java | 13 +++- .../PurchaseBillDetailDetailsVo.java | 37 ++++++++-- .../PurchaseBillDetailDto.java | 39 ++++++++-- .../purchaseflownode/PurchaseFlowNode.java | 64 +++++++++++++++++ .../PurchaseFlowNodeQuery.java | 51 +++++++++++++ .../PurchaseFlowNodeService.java | 62 ++++++++++++++++ .../purchaseflownode/PurchaseFlowNodeVo.java | 68 ++++++++++++++++++ .../purchasebill/PurchaseBillFeign.java | 17 +++-- .../PurchaseFlowNodeFeign.java | 22 ++++++ 13 files changed, 528 insertions(+), 18 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNode.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeVo.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java index 25e1500..81f80bd 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java @@ -48,6 +48,12 @@ public class PurchaseBillRest { return purchaseBillService.listPageVo(pq); } + @ApiOperation("采购订单审核管理") + @PostMapping("/exlistPage") + public ResultBean> exlistPage(@RequestBody PagerQuery pq){ + return purchaseBillService.exlistPage(pq); + } + @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody PurchaseBillDto dto){ @@ -71,4 +77,16 @@ public class PurchaseBillRest { public ResultBean> purGoodsListPage(@RequestBody PagerQuery pq) { return purchaseBillService.purGoodsListPage(pq); } + + @ApiOperation("采购单提交") + @PostMapping("/submit") + public ResultBean submit(@RequestBody PurchaseBillDto dto){ + return purchaseBillService.submit(dto); + } + + @ApiOperation("采购单审核") + @PostMapping("/examine") + public ResultBean examine(@RequestParam("sid") String sid,@RequestParam("state") String state,@RequestParam("remarks") String remarks){ + return purchaseBillService.examine(sid,state,remarks); + } } diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java new file mode 100644 index 0000000..3008d97 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseFlowNodeRest.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeQuery; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeService; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Project: ss-purchase(采购单)
+ * File: PurchaseFlowNodeFeignFallback.java
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeRest
+ * Description: 工单-环节.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "工单-环节") +@RestController +@RequestMapping("/apiadmin/purchaseflownode") +public class PurchaseFlowNodeRest { + + @Autowired + private PurchaseFlowNodeService purchaseFlowNodeService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return purchaseFlowNodeService.listPageVo(pq); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java index 3a2c765..8c1bc5b 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/GoodsSkuPurSelectList.java @@ -2,6 +2,8 @@ package com.yxt.oms.biz.func.purchasebill; import lombok.Data; +import java.math.BigDecimal; + /** * @description: * @author: dimengzhe @@ -20,4 +22,18 @@ public class GoodsSkuPurSelectList { private String barCode; //规格名称 private String goodsSkuOwnSpec; + //单位 + private String unit; + //数量 + private BigDecimal count; + //数量1 + private BigDecimal count1; + //数量 + private BigDecimal pcsNum; + //吊牌价 + private BigDecimal tagPrice; + //单价 + private BigDecimal cost; + //单价1 + private BigDecimal cost1; } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java new file mode 100644 index 0000000..a0acd35 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillExVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchasebill; + +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.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象") +public class PurchaseBillExVo implements Vo { + + private String sid; // sid + + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("业务日期") + private Date createTime; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("仓库名称") + private String wareHouseName; + @ApiModelProperty("审核状态") + private String state; + @ApiModelProperty("商品总额") + private String amountTotal; + @ApiModelProperty("本次付款") + private BigDecimal thisPayAmount; + @ApiModelProperty("税额汇总") + private BigDecimal taxAmount; + @ApiModelProperty("总采购数量") + private String countTotal; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人姓名") + private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("最后修改时间") + private Date modifyTime; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java index 61738ce..8139646 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java @@ -159,7 +159,6 @@ public class PurchaseBillService extends MybatisBaseService> purGoodsListPage(PagerQuery pq) { return goodsSkuFeign.purGoodsListPage(pq); } + + public ResultBean submit(PurchaseBillDto dto) { + return purchaseBillFeign.submit(dto); + } + + public ResultBean> exlistPage(PagerQuery pq) { + return purchaseBillFeign.exlistPage(pq); + } + + public ResultBean examine(String sid, String state, String remarks) { + return purchaseBillFeign.examine(sid,state,remarks); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java index a76ec48..6431850 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java @@ -64,14 +64,28 @@ public class PurchaseBillDetailDetailsVo implements Vo { private String unit; // 计量单位 @ApiModelProperty("单价") private BigDecimal cost; // 单价 - @ApiModelProperty("采购数量") - private BigDecimal count; // 采购数量 + @ApiModelProperty("数量") + private BigDecimal count; + @ApiModelProperty("数量1") + private BigDecimal count1; + @ApiModelProperty("已入库数量") + private BigDecimal inCount; + @ApiModelProperty("已发货数量") + private BigDecimal outCount; + @ApiModelProperty("已入库数量1") + private BigDecimal inCount1; + @ApiModelProperty("待入库数量") + private BigDecimal notInCount; + @ApiModelProperty("待入库数量1") + private BigDecimal notInCount1; @ApiModelProperty("折扣率") private BigDecimal discountRate; // 折扣率 @ApiModelProperty("折后单价") private BigDecimal discountPrice; // 折后单价 @ApiModelProperty("分摊金额") private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("总价") + private BigDecimal costTotal; @ApiModelProperty("分配比例") private BigDecimal shareRate; // 分配比例 @ApiModelProperty("采购金额") @@ -81,8 +95,19 @@ public class PurchaseBillDetailDetailsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预期到货日期") private Date deliveryDate; // 预期到货日期 - @ApiModelProperty("税额") - private BigDecimal taxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal taxPrice; // 含税价 + + @ApiModelProperty("总税额") + private BigDecimal taxAmount; + @ApiModelProperty("商品图片") + private String goodsImgUrl; + @ApiModelProperty("数量(pcs)") + private BigDecimal pcsCount; + @ApiModelProperty("吊牌价") + private BigDecimal tagPrice; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("未含税价") + private BigDecimal unTaxPrice; + @ApiModelProperty("未含税总价（未含税价*采购数量）") + private BigDecimal unTaxTotalAmount; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java index 663dab8..82cafe8 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java @@ -64,25 +64,50 @@ public class PurchaseBillDetailDto implements Dto { private String unit; // 计量单位 @ApiModelProperty("单价") private BigDecimal cost; // 单价 - @ApiModelProperty("采购数量") - private BigDecimal count; // 采购数量 + @ApiModelProperty("数量") + private BigDecimal count; + @ApiModelProperty("数量1") + private BigDecimal count1; + @ApiModelProperty("已入库数量") + private BigDecimal inCount; + @ApiModelProperty("已发货数量") + private BigDecimal outCount; + @ApiModelProperty("已入库数量1") + private BigDecimal inCount1; + @ApiModelProperty("待入库数量") + private BigDecimal notInCount; + @ApiModelProperty("待入库数量1") + private BigDecimal notInCount1; @ApiModelProperty("折扣率") private BigDecimal discountRate; // 折扣率 @ApiModelProperty("折后单价") private BigDecimal discountPrice; // 折后单价 @ApiModelProperty("分摊金额") private BigDecimal shareAmount; // 分摊金额 + @ApiModelProperty("总价") + private BigDecimal costTotal; @ApiModelProperty("分配比例") private BigDecimal shareRate; // 分配比例 @ApiModelProperty("采购金额") private BigDecimal amount; // 采购金额 @ApiModelProperty("采购周期") private Integer cycle; // 采购周期 - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预期到货日期") private Date deliveryDate; // 预期到货日期 - @ApiModelProperty("税额") - private BigDecimal taxAmount; // 税额 - @ApiModelProperty("含税价") - private BigDecimal taxPrice; // 含税价 + + @ApiModelProperty("总税额") + private BigDecimal taxAmount; + @ApiModelProperty("商品图片") + private String goodsImgUrl; + @ApiModelProperty("数量(pcs)") + private BigDecimal pcsCount; + @ApiModelProperty("吊牌价") + private BigDecimal tagPrice; + @ApiModelProperty("税率") + private BigDecimal taxRate; + @ApiModelProperty("未含税价") + private BigDecimal unTaxPrice; + @ApiModelProperty("未含税总价（未含税价*采购数量）") + private BigDecimal unTaxTotalAmount; } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNode.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNode.java new file mode 100644 index 0000000..e6c16fb --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNode.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchaseflownode; + +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: ss-purchase(采购单)
+ * File: PurchaseFlowNode.java
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNode
+ * Description: 工单-环节.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "工单-环节", description = "工单-环节") +@TableName("purchase_flow_node") +public class PurchaseFlowNode extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("操作人姓名") + private String createByName; // 操作人姓名 + @ApiModelProperty("busSid") + private String billSid; // busSid + @ApiModelProperty("环节编码") + private String nodeCode; // 环节编码 + @ApiModelProperty("环节名称") + private String nodeName; // 环节名称 + @ApiModelProperty("结果（通过/不通过）") + private String result; // 结果（通过/不通过） + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeQuery.java new file mode 100644 index 0000000..b773bc5 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeQuery.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchaseflownode; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * Project: ss-purchase(采购单)
+ * File: PurchaseFlowNodeQuery.java
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeQuery
+ * Description: 工单-环节 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "工单-环节 查询条件", description = "工单-环节 查询条件") +public class PurchaseFlowNodeQuery implements Query { + + private String billSid; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java new file mode 100644 index 0000000..403e40a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeService.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchaseflownode; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.oms.feign.purchase.purchaseflownode.PurchaseFlowNodeFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Project: ss-purchase(采购单)
+ * File: PurchaseFlowNodeService.java
+ * Class: com.yxt.purchase.biz.purchaseflownode.PurchaseFlowNodeService
+ * Description: 工单-环节 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PurchaseFlowNodeService{ + + @Autowired + private PurchaseFlowNodeFeign purchaseFlowNodeFeign; + + public ResultBean> listPageVo(PagerQuery pq) { + return purchaseFlowNodeFeign.listPage(pq); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeVo.java new file mode 100644 index 0000000..83cf15a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchaseflownode/PurchaseFlowNodeVo.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.purchaseflownode; + + +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: ss-purchase(采购单)
+ * File: PurchaseFlowNodeVo.java
+ * Class: com.yxt.purchase.api.purchaseflownode.PurchaseFlowNodeVo
+ * Description: 工单-环节 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-07-23 10:44:59
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "工单-环节 视图数据对象", description = "工单-环节 视图数据对象") +public class PurchaseFlowNodeVo implements Vo { + + private String sid; // sid + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; + @ApiModelProperty("意见") + private String remarks; + @ApiModelProperty("操作人姓名") + private String createByName; // 操作人姓名 + @ApiModelProperty("环节名称") + private String nodeName; // 环节名称 + @ApiModelProperty("结果（通过/不通过）") + private String result; // 结果（通过/不通过） + +} diff --git a/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java index 4233000..1d9919d 100644 --- a/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/purchase/purchasebill/PurchaseBillFeign.java @@ -3,10 +3,7 @@ package com.yxt.oms.feign.purchase.purchasebill; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.purchasebill.PurchaseBillDetailsVo; -import com.yxt.oms.biz.func.purchasebill.PurchaseBillDto; -import com.yxt.oms.biz.func.purchasebill.PurchaseBillQuery; -import com.yxt.oms.biz.func.purchasebill.PurchaseBillVo; +import com.yxt.oms.biz.func.purchasebill.*; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -21,6 +18,10 @@ public interface PurchaseBillFeign { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq); + @ApiOperation("采购订单审核管理") + @PostMapping("/exlistPage") + public ResultBean> exlistPage(@RequestBody PagerQuery pq); + @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody PurchaseBillDto dto); @@ -32,4 +33,12 @@ public interface PurchaseBillFeign { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("采购单提交") + @PostMapping("/submit") + public ResultBean submit(@RequestBody PurchaseBillDto dto); + + @ApiOperation("采购单审核") + @PostMapping("/examine") + public ResultBean examine(@RequestParam("sid") String sid,@RequestParam("state") String state,@RequestParam("remarks") String remarks); } \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java b/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java new file mode 100644 index 0000000..0c271df --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/purchase/purchaseflownode/PurchaseFlowNodeFeign.java @@ -0,0 +1,22 @@ +package com.yxt.oms.feign.purchase.purchaseflownode; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.purchasebill.*; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeQuery; +import com.yxt.oms.biz.func.purchaseflownode.PurchaseFlowNodeVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +@FeignClient( + contextId = "ss-common-purchase-PurchaseFlowNode", + name = "ss-common-purchase", + path = "/apiadmin/purchaseflownode") +public interface PurchaseFlowNodeFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); +} \ No newline at end of file From 57372100049690d17df7685abe2b724ba9fad74a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 25 Jul 2024 14:55:36 +0800 Subject: [PATCH 07/20] =?UTF-8?q?oms=E5=A2=9E=E5=8A=A0=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/SupplierInfoRest.java | 51 ++++++++ .../biz/func/supplierinfo/SupplierInfo.java | 112 ++++++++++++++++++ .../func/supplierinfo/SupplierInfoChoice.java | 54 +++++++++ .../supplierinfo/SupplierInfoService.java | 43 +++++++ .../supplierinfo/SupplierInfoFeign.java | 36 ++++++ 5 files changed, 296 insertions(+) create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierInfoRest.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoChoice.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java create mode 100644 oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeign.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierInfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierInfoRest.java new file mode 100644 index 0000000..a6c2b5e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SupplierInfoRest.java @@ -0,0 +1,51 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.biz.func.supplierinfo.SupplierInfoChoice; +import com.yxt.oms.biz.func.supplierinfo.SupplierInfoService; +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; + +@Api(tags = "供应商信息") +@RestController +@RequestMapping("/apiadmin/supplierinfo") +public class SupplierInfoRest { + + @Autowired + private SupplierInfoService baseSupplierInfoService; + + @ApiOperation("选择供应商") + @GetMapping("/choiceSupplierInfo") + public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){ + return baseSupplierInfoService.choiceSupplierInfo(createOrgSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfo.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfo.java new file mode 100644 index 0000000..24b1b98 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfo.java @@ -0,0 +1,112 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierinfo; + +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-base(供应商管理)
+ * File: BaseSupplierInfo.java
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfo
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息", description = "供应商信息") +@TableName("base_supplier_info") +public class SupplierInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("编码") + private String supplierCode; // 编码 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商名称拼音") + private String supplierPY; // 供应商名称拼音 + @ApiModelProperty("供应商类型sid") + private String supplierTypeSid; // 供应商类型sid + @ApiModelProperty("供应商类型") + private String supplierTypeName; // 供应商类型 + @ApiModelProperty("省sid") + private String provinceSid; // 省sid + @ApiModelProperty("province") + private String province; // + @ApiModelProperty("市sid") + private String citySid; // 市sid + @ApiModelProperty("city") + private String city; // + @ApiModelProperty("收货县区sid") + private String countySid; // 收货县区sid + @ApiModelProperty("county") + private String county; // + @ApiModelProperty("详细地址") + private String address; // 详细地址 + @ApiModelProperty("手机") + private String contactMobile; // 手机 + @ApiModelProperty("电话") + private String contactTelePhone; // 电话 + @ApiModelProperty("联系人") + private String contactName; // 联系人 + @ApiModelProperty("传真") + private String fax; // 传真 + @ApiModelProperty("邮编") + private String zipCode; // 邮编 + @ApiModelProperty("电子邮件") + private String email; // 电子邮件 + @ApiModelProperty("网址") + private String website; // 网址 + @ApiModelProperty("开票公司名称") + private String billingCompanyName; // 开票公司名称 + @ApiModelProperty("税号") + private String registNum; // 税号 + @ApiModelProperty("法人") + private String legalName; // 法人 + @ApiModelProperty("采购员") + private String purchaser; // 采购员 + @ApiModelProperty("排序") + private Integer sortNo; // 排序 + @ApiModelProperty("开票类型key") + private String billingTypeKey; // 开票类型key + @ApiModelProperty("开票类型value") + private String billingTypeValue; // 开票类型value + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + private double taxRate; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoChoice.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoChoice.java new file mode 100644 index 0000000..a74e1c0 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoChoice.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierinfo; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierInfoVo.java
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") +public class SupplierInfoChoice implements Vo { + + private String sid; + @ApiModelProperty("供应商名称") + private String supplierName; +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java new file mode 100644 index 0000000..3943be4 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/supplierinfo/SupplierInfoService.java @@ -0,0 +1,43 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.oms.biz.func.supplierinfo; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.oms.feign.supplier.supplierinfo.SupplierInfoFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +public class SupplierInfoService { + + @Autowired + SupplierInfoFeign baseSupplierInfoFeign; + + public ResultBean> choiceSupplierInfo(String createOrgSid) { + return baseSupplierInfoFeign.choiceSupplierInfo(createOrgSid); + } +} \ No newline at end of file diff --git a/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeign.java new file mode 100644 index 0000000..e7e67a3 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/supplier/supplierinfo/SupplierInfoFeign.java @@ -0,0 +1,36 @@ +package com.yxt.oms.feign.supplier.supplierinfo; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.supplierinfo.SupplierInfoChoice; +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: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@FeignClient( + contextId = "ss-common-supplier-SupplierInfo", + name = "ss-common-supplier", + path = "/apiadmin/supplierinfo") +public interface SupplierInfoFeign { + + @ApiOperation("选择供应商") + @GetMapping("/choiceSupplierInfo") + public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid); +} \ No newline at end of file From d20434630c08b0b6adc4183dc0dbf8e35ef66a5e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 25 Jul 2024 15:08:46 +0800 Subject: [PATCH 08/20] =?UTF-8?q?oms=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BB=93=E5=BA=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/WarehouseInfoRest.java | 8 ++++ .../biz/func/warehouseinfo/WarehouseInfo.java | 30 +++++++++++++ .../warehouseinfo/WarehouseInfoService.java | 42 ++++++++++++------- .../warehouseinfo/WarehouseInfoFeign.java | 6 +++ 4 files changed, 70 insertions(+), 16 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java index 14719c2..e714975 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java @@ -4,7 +4,9 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; +import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfo; import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfoService; +import com.yxt.oms.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -30,4 +32,10 @@ public class WarehouseInfoRest { public ResultBean> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) { return wmsWarehouseService.getWareHouse(createOrgSid); } + + @ApiOperation("查询所有的仓库") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query) { + return wmsWarehouseService.listAll(query); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java new file mode 100644 index 0000000..786dc50 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfo.java @@ -0,0 +1,30 @@ +package com.yxt.oms.biz.func.warehouseinfo; + +import com.yxt.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:36 + */ +@Data +public class WarehouseInfo extends BaseEntity { + + private String warehouseName;//仓库名称 + private String warehouseCode;//仓库编码 + private String contacts;//联系人 + private String mob;//手机 + private String telephone;//联系电话 + private String manager;//主管 + private String areaSid;//地区sid + private String address;//地址 + private String longitude;//经度 + private String latitude;//纬度 + private String warehouseTypeKey;//仓库类型Key + private String warehouseTypeValue;//仓库类型value + private Integer usageStatus;//使用状态,0停用 1正常 + private String squareMeter;//平方米 + private Integer sortNo;//排序 + private String useOrgSid;//创建组织sid + private String createOrgSid;//创建组织sid +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java index 759100a..8edb8a8 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java @@ -1,30 +1,18 @@ package com.yxt.oms.biz.func.warehouseinfo; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateTime; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.oms.feign.warehouse.warehouseinfo.WarehouseInfoFeign; +import com.yxt.oms.utils.OrgPathQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; -import java.util.ArrayList; +import javax.annotation.Resource; import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.stream.Collectors; -/** - * @author wangpengfei - * @date 2024/2/26 13:40 - */ @Service public class WarehouseInfoService { @@ -32,8 +20,30 @@ public class WarehouseInfoService { @Autowired private WarehouseInfoFeign warehouseInfoFeign; + @Resource + private SysOrganizationFeign sysOrganizationFeign; + public ResultBean> getWareHouse(String createOrgSid) { return warehouseInfoFeign.getWareHouse(createOrgSid); } + + public ResultBean> listAll(OrgPathQuery query) { + ResultBean rb = ResultBean.fireFail(); + String useOrgSid = ""; + String orgPath = query.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + List list = warehouseInfoFeign.listAll(query).getData(); + return rb.success().setData(list); + } } diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java index c96771f..e133b39 100644 --- a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java @@ -4,7 +4,9 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; +import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfo; import com.yxt.oms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeignFallback; +import com.yxt.oms.utils.OrgPathQuery; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -38,4 +40,8 @@ public interface WarehouseInfoFeign { @ApiOperation("订单选择仓库") @PostMapping("/getWareHouse") public ResultBean> getWareHouse(@RequestParam("createOrgSid") String createOrgSid); + + @ApiOperation("查询所有的仓库") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody OrgPathQuery query); } From 7e8ae2225931f84b6506d289c5179222f61fc9a8 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 25 Jul 2024 17:21:46 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/SmsSalesBillRest.java | 37 ++++++- .../func/smssalesbill/OrderReviewQuery.java | 31 ++++++ .../biz/func/smssalesbill/OrderReviewVo.java | 100 ++++++++++++++++++ .../func/smssalesbill/ReviewConfirmDto.java | 20 ++++ .../func/smssalesbill/ReviewDetailsVo.java | 22 ++++ .../biz/func/smssalesbill/ReviewDiscount.java | 31 ++++++ .../biz/func/smssalesbill/ReviewGoods.java | 73 +++++++++++++ .../biz/func/smssalesbill/ReviewInvoice.java | 53 ++++++++++ .../biz/func/smssalesbill/ReviewRecord.java | 16 +++ .../func/smssalesbill/ReviewRemarksInfo.java | 17 +++ .../biz/func/smssalesbill/ReviewShipper.java | 32 ++++++ .../smssalesbill/SmsSalesBillService.java | 26 +++++ .../sales/smssalesbill/SmsSalesBillFeign.java | 27 ++++- .../SmsSalesBillFeignFallback.java | 35 +++++- 14 files changed, 511 insertions(+), 9 deletions(-) create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewQuery.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewConfirmDto.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDiscount.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewInvoice.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRecord.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRemarksInfo.java create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewShipper.java diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java index 670e1ed..f5a8f08 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesBillRest.java @@ -63,7 +63,6 @@ public class SmsSalesBillRest { return smsSalesBillService.listPage(pq); } - @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody SmsSalesBillDto dto){ @@ -82,4 +81,40 @@ public class SmsSalesBillRest { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ return smsSalesBillService.fetchDetailsVoBySid(sid); } + + @ApiOperation("销售订单审核列表") + @PostMapping("/reviewListPage") + public ResultBean> reviewListPage(@RequestBody PagerQuery pq){ + return smsSalesBillService.reviewListPage(pq); + } + + @ApiOperation("销售订单审核详情") + @GetMapping("/reviewDetails") + public ResultBean reviewDetails(@RequestParam("sid") String sid){ + return smsSalesBillService.reviewDetails(sid); + } + + @ApiOperation("收货地址保存") + @PostMapping("/saveShipper") + public ResultBean saveShipper(@RequestBody ReviewDetailsVo dto){ + return smsSalesBillService.saveShipper(dto); + } + + @ApiOperation("发票信息保存") + @PostMapping("/saveInvoice") + public ResultBean saveInvoice(@RequestBody ReviewDetailsVo dto){ + return smsSalesBillService.saveInvoice(dto); + } + + @ApiOperation("分页列表单条保存") + @PostMapping("/saveOneListData") + public ResultBean saveOneListData(@RequestBody OrderReviewVo dto){ + return smsSalesBillService.saveOneListData(dto); + } + + @ApiOperation("审核确认") + @PostMapping("/reviewConfirm") + public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto){ + return smsSalesBillService.reviewConfirm(dto); + } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewQuery.java new file mode 100644 index 0000000..8a5bf7a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewQuery.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/25 11:42 + */ +@Data +public class OrderReviewQuery implements Query { + + private String createOrgSid; + @ApiModelProperty("单据类型key（线下订单/预售订单等）") + private String billTypeKey; + @ApiModelProperty("店铺") + private String shopName; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("订单号") + private String billNo; + @ApiModelProperty("快递单号") + private String logisticsNum; + @ApiModelProperty("买家ID") + private String buyserID; + @ApiModelProperty("快递") + private String logisticsName; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewVo.java new file mode 100644 index 0000000..c7498b9 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/OrderReviewVo.java @@ -0,0 +1,100 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/7/25 11:19 + */ +@Data +public class OrderReviewVo implements Vo { + + private String sid; + @ApiModelProperty("订单标记（已开票、仓库打回等）") + private String billState; // 订单标记（已开票、仓库打回等） + @ApiModelProperty("提醒（拆、合、缺）") + private String noticeState; // 订单标记（已开票、仓库打回等） + @ApiModelProperty("剩余发货时间") + private String remainderTime; // 剩余发货时间 + @ApiModelProperty("商品总数") + private String goodsTotalCount; // 商品总数 + @ApiModelProperty("线上商品图片") + private List picOnline = new ArrayList<>(); + @ApiModelProperty("系统商品图片") + private List picSys = new ArrayList<>(); + @ApiModelProperty("线上备注/系统备注") + private String remarksOnlineSys; // 线上备注/系统备注 + @ApiModelProperty("买家留言/附加信息") + private String buyerMessage; // 买家留言/附加信息 + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("配送方式Value") + private String deliveryTypeValue; + @ApiModelProperty("快递") + private String logisticsName; + @ApiModelProperty("快递成本/干线费用") + private String logisticsCost; + @ApiModelProperty("买家ID") + private String buyserID; + @ApiModelProperty("收货地址") + private String deliveryAddress; + @ApiModelProperty("买家实付") + private String realPay; + @ApiModelProperty("优惠") + private String discountAmount; + @ApiModelProperty("应收") + private String dueAmount; + @ApiModelProperty("运费") + private String freight; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("声明价值（保价）") + private String declaredValue; + @ApiModelProperty("重量(Kg)") + private String weight; + @ApiModelProperty("体积(m³)") + private String volume; + @ApiModelProperty("订单号") + private String billNo; + @ApiModelProperty("系统单号") + private String sysBillNo; + @ApiModelProperty("店铺") + private String shopName; + @ApiModelProperty("下单时间（距今）") + private String billCreateTime; + @ApiModelProperty("付款时间（距今）") + private String payTime; + @ApiModelProperty("预计发货时间") + private String expectSendDate; + @ApiModelProperty("预计送达时间") + private String deliveryDate; + @ApiModelProperty("承诺/最晚揽收时间") + private String latestReceivingTime; + @ApiModelProperty("承诺/最晚发货时间") + private String latestSendTime; + @ApiModelProperty("承诺/最晚送达时间") + private String latestArriveTime; + @ApiModelProperty("应推时间") + private String needPushTime; + @ApiModelProperty("业务员") + private String salesName; + @ApiModelProperty("开票名称(发票抬头)") + private String invoiceTitle; + @ApiModelProperty("达人ID") + private String talentID; + @ApiModelProperty("达人昵称") + private String buyserNickname; + @ApiModelProperty("代发店铺") + private String agentShop; + @ApiModelProperty("原始平台") + private String originalPlat; + @ApiModelProperty("原始单号") + private String originalBillNo; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewConfirmDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewConfirmDto.java new file mode 100644 index 0000000..bbbfb33 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewConfirmDto.java @@ -0,0 +1,20 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import lombok.Data; + +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/7/25 16:57 + */ +@Data +public class ReviewConfirmDto { + private String type; //0通过 1不通过 + private String remarks; //意见 + private List sids; + private String createBySid; //登录人sid + private String createByName; //登录人 +} + diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java new file mode 100644 index 0000000..41570ce --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDetailsVo.java @@ -0,0 +1,22 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import lombok.Data; + +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/7/25 14:50 + */ +@Data +public class ReviewDetailsVo { + + private String sid; + private List goods; //商品信息 + private ReviewShipper shipper = new ReviewShipper(); //收货地址 + private ReviewRemarksInfo remarksInfo = new ReviewRemarksInfo(); //备注信息 + private ReviewInvoice invoice = new ReviewInvoice(); //发票信息 + private List discounts; //优惠详情 + private List records; //操作记录 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDiscount.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDiscount.java new file mode 100644 index 0000000..29599ba --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewDiscount.java @@ -0,0 +1,31 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/25 15:34 + */ +@Data +public class ReviewDiscount { + + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品简称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码") + private String goodsSkuCode; // 商品编码 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + + @ApiModelProperty("优惠名称") + private String discountName; // 优惠名称 + @ApiModelProperty("优惠金额") + private String discountAmount; // 优惠金额 + @ApiModelProperty("平台商品名称") + private String platGoodsName; // 平台商品名称 + @ApiModelProperty("平台规格名称") + private String platOwnSpec; // 平台规格名称 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java new file mode 100644 index 0000000..a1cdf23 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewGoods.java @@ -0,0 +1,73 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/7/25 14:53 + */ +@Data +public class ReviewGoods { + + + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码") + private String goodsSkuCode; // 商品编码 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("条码") + private String barCode; // 条码 + @ApiModelProperty("销售单价") + private String price; // 销售单价 + @ApiModelProperty("折后单价") + private String discountPrice; // 折后单价 + @ApiModelProperty("数量") + private String count; // 数量 + @ApiModelProperty("应收款") + private String dueAmount; // 应收款 + @ApiModelProperty("销售金额") + private String amount; // 销售金额 + @ApiModelProperty("税率") + private String taxRate; // 库存数量 + @ApiModelProperty("税额") + private String taxAmount; // 税额 + @ApiModelProperty("参考进价") + private String referenceCost; // 参考进价 + @ApiModelProperty("商品成本") + private String cost; // 商品成本 + @ApiModelProperty("批次号") + private String batchNumber; // 批次号 + @ApiModelProperty("实际库存") + private String inventoryCount; // 库存数量 + @ApiModelProperty("可分配库存") + private String allocateCount; // 可分配库存 + @ApiModelProperty("可用库存") + private String useCount; // 可用库存 + @ApiModelProperty("在途库存") + private String wayCount; // 在途库存 + @ApiModelProperty("各仓库存") + private String wareHouseCount; // 各仓库存 + @ApiModelProperty("库存状况") + private String inventoryState; // 库存状况 + @ApiModelProperty("单号") + private String billNo; // 单号 + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("图片") + private String goodsImgUrl; // 图片 + @ApiModelProperty("预计发货时间") + private String expectSendDate; // 预计发货时间 + /** + * 图片 + */ + private List pic = new ArrayList<>(); + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewInvoice.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewInvoice.java new file mode 100644 index 0000000..905ccc6 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewInvoice.java @@ -0,0 +1,53 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/25 15:28 + */ +@Data +public class ReviewInvoice { + + @ApiModelProperty("开票形式（001纸质发票/002电子发票") + private String invoiceMediumKey; // 开票形式（001纸质发票/002电子发票 + @ApiModelProperty("开票形式（纸质发票/电子发票）") + private String invoiceMediumValue; // 开票形式（纸质发票/电子发票） + @ApiModelProperty("发票类型Key") + private String invoiceTypeKey; // 发票类型Key + @ApiModelProperty("发票类型") + private String invoiceType; // 发票类型 + @ApiModelProperty("抬头") + private String invoiceTitle; // 开票名称 + @ApiModelProperty("内容") + private String invoiceContent; // 内容 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("开户银行") + private String bankName; // 开户银行 + @ApiModelProperty("银行账户") + private String bankAccount; // 银行账户 + @ApiModelProperty("详细地址") + private String address; // 详细地址 + @ApiModelProperty("固定电话") + private String phone; // 固定电话 + @ApiModelProperty("邮箱") + private String e_mail; // 邮箱 + @ApiModelProperty("备注") + private String remarks; // 备注 + + + @ApiModelProperty("应收合计") + private String dueAmount; // 应收合计 + @ApiModelProperty("本次欠款") + private String thisDebt; // 本次欠款 + @ApiModelProperty("历史欠款") + private String historyDebt; // 历史欠款 + @ApiModelProperty("预收合计") + private String advanceBalance; // 预收款余额 + + + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRecord.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRecord.java new file mode 100644 index 0000000..316aa9e --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRecord.java @@ -0,0 +1,16 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/25 15:37 + */ +@Data +public class ReviewRecord { + private String createTime;//创建时间 + private String createByName;//账号名称 + private String remark;//操作内容 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRemarksInfo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRemarksInfo.java new file mode 100644 index 0000000..499e827 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewRemarksInfo.java @@ -0,0 +1,17 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/25 15:26 + */ +@Data +public class ReviewRemarksInfo { + + private String buyerMessage; //买家留言 + private String remarks; //线上备注 + private String remarksSys; //系统备注 + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewShipper.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewShipper.java new file mode 100644 index 0000000..df2f395 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/ReviewShipper.java @@ -0,0 +1,32 @@ +package com.yxt.oms.biz.func.smssalesbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/25 15:23 + */ +@Data +public class ReviewShipper { + + @ApiModelProperty("收货人姓名") + private String shipperName; // 收货人姓名 + @ApiModelProperty("收货人手机") + private String shipperMob; // 收货人手机 + @ApiModelProperty("收货省") + private String deliveryProvince; // 收货省 + @ApiModelProperty("收货市") + private String deliveryCity; // 收货市 + @ApiModelProperty("收货县区") + private String deliveryCounty; // 收货县区 + @ApiModelProperty("收货详细地址") + private String deliveryAddress; // 收货详细地址 + @ApiModelProperty("真实姓名") + private String name; // 真实姓名 + @ApiModelProperty("身份证号码") + private String idNo; // 身份证号码 + @ApiModelProperty("固定电话") + private String phone; // 固定电话 +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java index 2f5d8b5..1014aa0 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillService.java @@ -40,6 +40,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * Project: ss-sales(ss-sales)
@@ -107,4 +109,28 @@ public class SmsSalesBillService extends MybatisBaseService> reviewListPage(PagerQuery pq) { + return smsSalesBillFeign.reviewListPage(pq); + } + + public ResultBean reviewDetails(String sid) { + return smsSalesBillFeign.reviewDetails(sid); + } + + public ResultBean saveShipper(ReviewDetailsVo dto) { + return smsSalesBillFeign.saveShipper(dto); + } + + public ResultBean saveInvoice(ReviewDetailsVo dto) { + return smsSalesBillFeign.saveInvoice(dto); + } + + public ResultBean saveOneListData(OrderReviewVo dto) { + return smsSalesBillFeign.saveOneListData(dto); + } + + public ResultBean reviewConfirm(ReviewConfirmDto dto) { + return smsSalesBillFeign.reviewConfirm(dto); + } } diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java index 92f75bb..2c2ebed 100644 --- a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeign.java @@ -3,10 +3,7 @@ package com.yxt.oms.feign.sales.smssalesbill; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDetailsVo; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDto; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillQuery; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillVo; +import com.yxt.oms.biz.func.smssalesbill.*; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -40,5 +37,27 @@ public interface SmsSalesBillFeign { @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("销售订单审核列表") + @PostMapping("/reviewListPage") + public ResultBean> reviewListPage(@RequestBody PagerQuery pq); + @ApiOperation("销售订单审核详情") + @GetMapping("/reviewDetails") + public ResultBean reviewDetails(@RequestParam("sid") String sid); + + @ApiOperation("收货地址保存") + @PostMapping("/saveShipper") + public ResultBean saveShipper(@RequestBody ReviewDetailsVo dto); + + @ApiOperation("发票信息保存") + @PostMapping("/saveInvoice") + public ResultBean saveInvoice(@RequestBody ReviewDetailsVo dto); + + @ApiOperation("分页列表保存") + @PostMapping("/saveOneListData") + public ResultBean saveOneListData(@RequestBody OrderReviewVo dto); + + @ApiOperation("审核确认") + @PostMapping("/reviewConfirm") + public ResultBean reviewConfirm(@RequestBody ReviewConfirmDto dto); } diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java index a80a848..4f60931 100644 --- a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java +++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesbill/SmsSalesBillFeignFallback.java @@ -3,10 +3,7 @@ package com.yxt.oms.feign.sales.smssalesbill; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDetailsVo; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillDto; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillQuery; -import com.yxt.oms.biz.func.smssalesbill.SmsSalesBillVo; +import com.yxt.oms.biz.func.smssalesbill.*; import org.springframework.stereotype.Component; /** @@ -36,4 +33,34 @@ public class SmsSalesBillFeignFallback implements SmsSalesBillFeign { public ResultBean fetchDetailsBySid(String sid) { return null; } + + @Override + public ResultBean> reviewListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean reviewDetails(String sid) { + return null; + } + + @Override + public ResultBean saveShipper(ReviewDetailsVo dto) { + return null; + } + + @Override + public ResultBean saveInvoice(ReviewDetailsVo dto) { + return null; + } + + @Override + public ResultBean saveOneListData(OrderReviewVo dto) { + return null; + } + + @Override + public ResultBean reviewConfirm(ReviewConfirmDto dto) { + return null; + } } From a97059e1c7b11f6953bac996806ec2a1cd5e1049 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 25 Jul 2024 17:35:47 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java | 2 +- .../yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java | 3 +-- .../com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java | 3 +-- .../com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml | 2 +- .../com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java | 1 - .../func/purchasebilldetail/PurchaseBillDetailDetailsVo.java | 3 +-- .../oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java | 3 +-- .../com/yxt/oms/feign/portal/sysstafforg/SysStaffOrgFeign.java | 2 +- 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java index 2c9fc9c..f15ac0d 100644 --- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java @@ -26,7 +26,7 @@ public class SysStaffOrgRest { @GetMapping("/selAllByOrgSidPath") @ResponseBody @ApiOperation("根据组织全路径查询当前部门下的所有员工") - public ResultBean> selAllByOrgSidPath(String orgSidPath) { + public ResultBean> selAllByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath) { return sysStaffOrgService.selAllByOrgSidPath(orgSidPath); } } diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java index 84c3ea1..16bdd91 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java @@ -80,9 +80,8 @@ public class PurchaseBillDetailsVo implements Vo { private String purchaserSid; // 采购员sid（单选） @ApiModelProperty("采购员姓名") private String purchaserName; // 采购员姓名 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预计到货日期") - private Date deliveryDate; // 预计到货日期 + private String deliveryDate; @ApiModelProperty("仓库sid") private String wareHouseSid; @ApiModelProperty("仓库名称") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java index de0c8a0..e4ac57e 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java @@ -80,9 +80,8 @@ public class PurchaseBillDto implements Dto { private String purchaserSid; // 采购员sid（单选） @ApiModelProperty("采购员姓名") private String purchaserName; // 采购员姓名 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("预计到货日期") - private Date deliveryDate; // 预计到货日期 + private String deliveryDate; @ApiModelProperty("仓库sid") private String wareHouseSid; @ApiModelProperty("仓库名称") diff --git a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml index 57c54aa..431fffd 100644 --- a/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml +++ b/oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.xml @@ -5,7 +5,7 @@