From aaaa1ff539c9144446598b4626fe34eb2c4a3ad0 Mon Sep 17 00:00:00 2001 From: djz8236 Date: Sat, 10 Jun 2023 23:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=85=A5=E5=BA=93=E5=8D=95=E3=80=81=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AD=89=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E7=94=9F=E6=88=90id=E7=9A=84=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wh/pojo/api/InStoreHouseMainDetailVo.java | 1 + .../com/wh/pojo/api/InStoreHouseMainDto.java | 1 + .../com/wh/pojo/api/InStoreHouseMainVo.java | 1 + .../com/wh/pojo/api/InStorehouseListing.java | 7 + .../com/wh/pojo/api/InStorehouseMain.java | 5 + .../wh/pojo/api/InStorehouseMainQuery.java | 1 + .../com/wh/pojo/api/OutStorehouseListing.java | 4 + .../com/wh/pojo/api/OutStorehouseMain.java | 3 + .../main/java/com/wh/pojo/api/ProdStock.java | 5 + .../java/com/wh/pojo/api/ProdStockDto.java | 1 + .../java/com/wh/pojo/api/ProdStockQuery.java | 1 + .../java/com/wh/pojo/api/ProdStockVo.java | 1 + .../com/wh/pojo/purchasenew/Purchasenew.java | 78 ++++++++++++ .../purchasenew/PurchasenewDetailsVo.java | 76 +++++++++++ .../wh/pojo/purchasenew/PurchasenewDto.java | 81 ++++++++++++ .../wh/pojo/purchasenew/PurchasenewQuery.java | 74 +++++++++++ .../wh/pojo/purchasenew/PurchasenewVo.java | 76 +++++++++++ .../PurchasenewProduct.java | 97 ++++++++++++++ .../PurchasenewProductDetailsVo.java | 95 ++++++++++++++ .../PurchasenewProductDto.java | 95 ++++++++++++++ .../PurchasenewProductQuery.java | 93 ++++++++++++++ .../PurchasenewProductVo.java | 95 ++++++++++++++ .../purchasenew/PurchasenewController.java | 51 ++++++++ .../PurchasenewProductController.java | 54 ++++++++ .../mapper/api/prodstock/ProdStockMapper.java | 5 + .../mapper/purchasenew/PurchasenewMapper.java | 65 ++++++++++ .../PurchasenewProductMapper.java | 65 ++++++++++ .../InStorehouseListingService.java | 6 + .../instorehouse/InStorehouseMainService.java | 80 ++++++++++++ .../api/prodstock/ProdStockService.java | 4 + .../purchasenew/PurchasenewService.java | 111 ++++++++++++++++ .../PurchasenewProductService.java | 120 ++++++++++++++++++ .../src/main/resources/application.yml | 4 + .../resources/mappers/PurchasenewMapper.xml | 13 ++ .../mappers/PurchasenewProductMapper.xml | 13 ++ .../DispatchPatrolPlanRest.java | 7 +- 36 files changed, 1487 insertions(+), 2 deletions(-) create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/Purchasenew.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDto.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewVo.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductQuery.java create mode 100644 warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenewproduct/PurchasenewProductController.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenewproduct/PurchasenewProductMapper.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenew/PurchasenewService.java create mode 100644 warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenewproduct/PurchasenewProductService.java create mode 100644 warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewMapper.xml create mode 100644 warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewProductMapper.xml diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java index 3899591e..667deac0 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java @@ -16,4 +16,5 @@ public class InStoreHouseMainDetailVo implements Vo { private String state; // varchar 50 审核状态 private String approvedDate; // varchar 50 审核日期 private List list; + private String purchaseSid;//采购申请单的sid } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java index 60d7217d..8117ca34 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java @@ -24,4 +24,5 @@ public class InStoreHouseMainDto { private String approvedDate; // varchar 50 审核日期 private String approvedRemark; // varchar 50 private List list; + private String purchaseSid;//采购申请单的sid } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java index 5085d83a..f8557c67 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java @@ -18,4 +18,5 @@ public class InStoreHouseMainVo implements Vo { private String state; // varchar 50 审核状态 private String approvedDate; // varchar 50 审核日期 private String prodNum; // varchar 50 商品数量 + private String purchaseSid;//采购申请单的sid } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseListing.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseListing.java index 9b87c10c..cf38b1c5 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseListing.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseListing.java @@ -1,5 +1,7 @@ package com.wh.pojo.api; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -13,12 +15,16 @@ import javax.validation.constraints.Positive; @Accessors(chain = true) @TableName("in_storehouse_listing") public class InStorehouseListing extends BaseEntity { + /*@TableId(type = IdType.AUTO) + private Integer id;*/ private String custerSid;// varchar 64 客户Sid（企业） private String custerName ;//varchar 100 客户名称（企业） private String storeHouseSid ;//varchar 64 仓库Sid private String storeHouseName ;//varchar 100 仓库名称 @NotBlank(message = "质物名称不能为空") private String proName;// varchar 50 质物名称 + @NotBlank(message = "质物名称不能为空") + private String proSid;// varchar 50 质物名称 @NotBlank(message = "规格（型号）不能为空") private String proModel ;//varchar 50 规格（型号） private String proUnit ;//varchar 50 规格单位 @@ -32,4 +38,5 @@ public class InStorehouseListing extends BaseEntity { private String calculatedValue ;//decime 50 2 核算的价值 private String locationNumber ;//varchar 10 货位号 private String mainSid ;//varchar 50 申请单的sid + private String purchaseSid;//采购申请单的sid } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMain.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMain.java index 7eb46b49..a8cb099b 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMain.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMain.java @@ -1,5 +1,7 @@ package com.wh.pojo.api; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -9,6 +11,8 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @TableName("in_storehouse_main") public class InStorehouseMain extends BaseEntity { +// @TableId(type = IdType.AUTO) +// private Integer id; private String no; //varchar 50 编号 private String applicationDate; //date 50 制单日期 private String creatorSid; //varchar 64 制单人Sid @@ -21,4 +25,5 @@ public class InStorehouseMain extends BaseEntity { private String auditorName; // varchar 50 审核人姓名 private String approvedDate; // varchar 50 审核日期 private String approvedRemark; // varchar 50 审核备注 + private String purchaseSid;//采购申请单的sid } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java index cf8c3635..c936f4e7 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java @@ -23,4 +23,5 @@ public class InStorehouseMainQuery implements Query { private String auditorName; // varchar 50 审核人姓名 private String approvedDate; // varchar 50 审核日期 private String approvedRemark; // varchar 50 审核备注 + private String purchaseSid;//采购申请单的sid } diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java index ab6d4b16..4e23cba6 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseListing.java @@ -1,5 +1,7 @@ package com.wh.pojo.api; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -12,6 +14,8 @@ import javax.validation.constraints.Positive; @Accessors(chain = true) @TableName("out_storehouse_listing") public class OutStorehouseListing extends BaseEntity { +// @TableId(type = IdType.AUTO) +// private Integer id; private String custerSid;// varchar 64 客户Sid（企业） private String custerName ;//varchar 100 客户名称（企业） private String storeHouseSid ;//varchar 64 仓库Sid diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMain.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMain.java index cd518d80..b1196bf8 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMain.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/OutStorehouseMain.java @@ -1,5 +1,6 @@ package com.wh.pojo.api; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; @@ -11,6 +12,8 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @TableName("out_storehouse_main") public class OutStorehouseMain extends BaseEntity { +// @TableId(type = IdType.AUTO) +// private Integer id; private String no; //varchar 50 编号 private String applicationDate; //date 50 制单日期 private String creatorSid; //varchar 64 制单人Sid diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStock.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStock.java index a17a3a2a..46d079c1 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStock.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStock.java @@ -1,5 +1,7 @@ package com.wh.pojo.api; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import lombok.Data; @@ -9,7 +11,10 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @TableName("prod_stock") public class ProdStock extends BaseEntity { +// @TableId(type = IdType.AUTO) +// private Integer id; private String proName;// varchar 50 质物名称 + private String proSid;//质物sid private String proModel;// varchar 50 规格（型号） private String manufacturer;// varchar 50 生成厂家（产地） private String num;// varchar 10 数量 diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockDto.java index 04cc9ace..ac15ea32 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockDto.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockDto.java @@ -9,6 +9,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class ProdStockDto extends BaseEntity { private String proName;// varchar 50 质物名称 + private String proSid;//质物sid private String proModel;// varchar 50 规格（型号） private String manufacturer;// varchar 50 生成厂家（产地） private String num;// varchar 10 数量 diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java index 919ccc72..97ad803b 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockQuery.java @@ -7,6 +7,7 @@ import lombok.experimental.Accessors; @Data public class ProdStockQuery implements Query { private String proName;// varchar 50 质物名称 + private String proSid;//质物sid private String proModel;// varchar 50 规格（型号） private String manufacturer;// varchar 50 生成厂家（产地） private String num;// varchar 10 数量 diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockVo.java index 66b8ebb4..c6ff3965 100644 --- a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockVo.java +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/api/ProdStockVo.java @@ -6,6 +6,7 @@ import lombok.Data; @Data public class ProdStockVo implements Vo { private String proName;// varchar 50 质物名称 + private String proSid;//质物sid private String proModel;// varchar 50 规格（型号） private String manufacturer;// varchar 50 生成厂家（产地） private String num;// varchar 10 数量 diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/Purchasenew.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/Purchasenew.java new file mode 100644 index 00000000..5dbea60a --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/Purchasenew.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenew; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +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: warehouse(仓储)
+ * File: Purchasenew.java
+ * Class: com.wh..api.purchasenew.Purchasenew
+ * Description: 采购订单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单", description = "采购订单") +@TableName("purchasenew") +public class Purchasenew extends BaseEntity { + private static final long serialVersionUID = 1L; +// @TableId(type = IdType.AUTO) +// private Integer id; + @ApiModelProperty("订单日期") + private String purchaseDate; // 订单日期 + @ApiModelProperty("订单编号") + private String purchaseNo; // 订单编号 + @ApiModelProperty("采购人员") + private String purchasePerson; // 采购人员 + @ApiModelProperty("采购人员sid") + private String purchasePersonSid; // 采购人员sid + @ApiModelProperty("客户id") + private String custId; // 客户id + @ApiModelProperty("客户名称") + private String custName; // 客户名称 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商id") + private String supplierId; // 供应商id + @ApiModelProperty("仓库名称") + private String storehouseName; // 仓库名称 + @ApiModelProperty("仓库id") + private String storehouseId; // 仓库id + @ApiModelProperty("状态") + private String status; // 状态 +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java new file mode 100644 index 00000000..5d81ce90 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDetailsVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenew; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewVo.java
+ * Class: com.wh..api.purchasenew.PurchasenewVo
+ * Description: 采购订单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单 视图数据详情", description = "采购订单 视图数据详情") +public class PurchasenewDetailsVo implements Vo { + + private String sid; // sid + @ApiModelProperty("订单日期") + private String purchaseDate; // 订单日期 + @ApiModelProperty("订单编号") + private String purchaseNo; // 订单编号 + @ApiModelProperty("采购人员") + private String purchasePerson; // 采购人员 + @ApiModelProperty("采购人员sid") + private String purchasePersonSid; // 采购人员sid + @ApiModelProperty("客户id") + private String custId; // 客户id + @ApiModelProperty("客户名称") + private String custName; // 客户名称 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商id") + private String supplierId; // 供应商id + @ApiModelProperty("仓库名称") + private String storehouseName; // 仓库名称 + @ApiModelProperty("仓库id") + private String storehouseId; // 仓库id + @ApiModelProperty("状态") + private String status; // 状态 + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDto.java new file mode 100644 index 00000000..96edbcd8 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewDto.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenew; + + +import com.wh.pojo.purchasenewproduct.PurchasenewProduct; +import com.wh.pojo.purchasenewproduct.PurchasenewProductDto; +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewDto.java
+ * Class: com.wh..api.purchasenew.PurchasenewDto
+ * Description: 采购订单 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单 数据传输对象", description = "采购订单 数据传输对象") +public class PurchasenewDto implements Dto { + + private String sid; // sid + @ApiModelProperty("订单日期") + private String purchaseDate; // 订单日期 + @ApiModelProperty("订单编号") + private String purchaseNo; // 订单编号 + @ApiModelProperty("采购人员") + private String purchasePerson; // 采购人员 + @ApiModelProperty("采购人员sid") + private String purchasePersonSid; // 采购人员sid + @ApiModelProperty("客户id") + private String custId; // 客户id + @ApiModelProperty("客户名称") + private String custName; // 客户名称 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商id") + private String supplierId; // 供应商id + @ApiModelProperty("仓库名称") + private String storehouseName; // 仓库名称 + @ApiModelProperty("仓库id") + private String storehouseId; // 仓库id + @ApiModelProperty("状态") + private String status; // 状态 + @ApiModelProperty("商品列表") + private List products; + } \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java new file mode 100644 index 00000000..db12ce7b --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewQuery.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenew; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewQuery.java
+ * Class: com.wh..api.purchasenew.PurchasenewQuery
+ * Description: 采购订单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单 查询条件", description = "采购订单 查询条件") +public class PurchasenewQuery implements Query { + @ApiModelProperty("订单日期") + private String purchaseDate; // 订单日期 + @ApiModelProperty("订单编号") + private String purchaseNo; // 订单编号 + @ApiModelProperty("采购人员") + private String purchasePerson; // 采购人员 + @ApiModelProperty("采购人员sid") + private String purchasePersonSid; // 采购人员sid + @ApiModelProperty("客户id") + private String custId; // 客户id + @ApiModelProperty("客户名称") + private String custName; // 客户名称 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商id") + private String supplierId; // 供应商id + @ApiModelProperty("仓库名称") + private String storehouseName; // 仓库名称 + @ApiModelProperty("仓库id") + private String storehouseId; // 仓库id + @ApiModelProperty("状态") + private String status; // 状态 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewVo.java new file mode 100644 index 00000000..a05cc366 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenew/PurchasenewVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenew; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewVo.java
+ * Class: com.wh..api.purchasenew.PurchasenewVo
+ * Description: 采购订单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单 视图数据对象", description = "采购订单 视图数据对象") +public class PurchasenewVo implements Vo { + + private String sid; // sid + @ApiModelProperty("订单日期") + private String purchaseDate; // 订单日期 + @ApiModelProperty("订单编号") + private String purchaseNo; // 订单编号 + @ApiModelProperty("采购人员") + private String purchasePerson; // 采购人员 + @ApiModelProperty("采购人员sid") + private String purchasePersonSid; // 采购人员sid + @ApiModelProperty("客户id") + private String custId; // 客户id + @ApiModelProperty("客户名称") + private String custName; // 客户名称 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商id") + private String supplierId; // 供应商id + @ApiModelProperty("仓库名称") + private String storehouseName; // 仓库名称 + @ApiModelProperty("仓库id") + private String storehouseId; // 仓库id + @ApiModelProperty("状态") + private String status; // 状态 + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java new file mode 100644 index 00000000..2fd693f4 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProduct.java @@ -0,0 +1,97 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenewproduct; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewProduct.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProduct
+ * Description: purchasenew_product.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "purchasenew_product", description = "purchasenew_product") +@TableName("purchasenew_product") +public class PurchasenewProduct extends BaseEntity { + private static final long serialVersionUID = 1L; + @TableId(type = IdType.AUTO) + private Integer id; + @ApiModelProperty("客户Sid（企业）") + private String custerSid; // 客户Sid（企业） + @ApiModelProperty("客户名称（企业）") + private String custerName; // 客户名称（企业） + @ApiModelProperty("仓库Sid") + private String storeHouseSid; // 仓库Sid + @ApiModelProperty("仓库名称") + private String storeHouseName; // 仓库名称 + @ApiModelProperty("质物名称") + private String proName; // 质物名称 + @ApiModelProperty("规格（型号）") + private String proModel; // 规格（型号） + @ApiModelProperty("规格单位") + private String proUnit; // 规格单位 + @ApiModelProperty("生成厂家（产地）") + private String manufacturer; // 生成厂家（产地） + @ApiModelProperty("数量") + private String estimateNum; // 数量 + @ApiModelProperty("重量") + private String estimateWeight; // 重量 + @ApiModelProperty("质权人确认的单价") + private String estimateConfirmedPrice; // 质权人确认的单价 + @ApiModelProperty("核算的价值") + private String estimateCalculatedValue; // 核算的价值 + @ApiModelProperty("实际数量") + private String realityNum; // 实际数量 + @ApiModelProperty("实际重量") + private String realityWeight; // 实际重量 + @ApiModelProperty("实际质权人确认的单价") + private String realityConfirmedPrice; // 实际质权人确认的单价 + @ApiModelProperty("实际核算的价值") + private String realityCalculatedValue; // 实际核算的价值 + @ApiModelProperty("货位号") + private String locationNumber; // 货位号 + @ApiModelProperty("申请单的sid") + private String mainSid; // 申请单的sid + @ApiModelProperty("质物id") + private String proId; // 质物id + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java new file mode 100644 index 00000000..336a7ff3 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDetailsVo.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenewproduct; + + +import com.yxt.common.core.vo.Vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewProductVo.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProductVo
+ * Description: purchasenew_product 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "purchasenew_product 视图数据详情", description = "purchasenew_product 视图数据详情") +public class PurchasenewProductDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("客户Sid（企业）") + private String custerSid; // 客户Sid（企业） + @ApiModelProperty("客户名称（企业）") + private String custerName; // 客户名称（企业） + @ApiModelProperty("仓库Sid") + private String storeHouseSid; // 仓库Sid + @ApiModelProperty("仓库名称") + private String storeHouseName; // 仓库名称 + @ApiModelProperty("质物名称") + private String proName; // 质物名称 + @ApiModelProperty("规格（型号）") + private String proModel; // 规格（型号） + @ApiModelProperty("规格单位") + private String proUnit; // 规格单位 + @ApiModelProperty("生成厂家（产地）") + private String manufacturer; // 生成厂家（产地） + @ApiModelProperty("数量") + private String estimateNum; // 数量 + @ApiModelProperty("重量") + private String estimateWeight; // 重量 + @ApiModelProperty("质权人确认的单价") + private String estimateConfirmedPrice; // 质权人确认的单价 + @ApiModelProperty("核算的价值") + private String estimateCalculatedValue; // 核算的价值 + @ApiModelProperty("实际数量") + private String realityNum; // 实际数量 + @ApiModelProperty("实际重量") + private String realityWeight; // 实际重量 + @ApiModelProperty("实际质权人确认的单价") + private String realityConfirmedPrice; // 实际质权人确认的单价 + @ApiModelProperty("实际核算的价值") + private String realityCalculatedValue; // 实际核算的价值 + @ApiModelProperty("货位号") + private String locationNumber; // 货位号 + @ApiModelProperty("申请单的sid") + private String mainSid; // 申请单的sid + @ApiModelProperty("质物id") + private String proId; // 质物id + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java new file mode 100644 index 00000000..e3cbe984 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductDto.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenewproduct; + + +import com.yxt.common.core.dto.Dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewProductDto.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProductDto
+ * Description: purchasenew_product 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "purchasenew_product 数据传输对象", description = "purchasenew_product 数据传输对象") +public class PurchasenewProductDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("客户Sid（企业）") + private String custerSid; // 客户Sid（企业） + @ApiModelProperty("客户名称（企业）") + private String custerName; // 客户名称（企业） + @ApiModelProperty("仓库Sid") + private String storeHouseSid; // 仓库Sid + @ApiModelProperty("仓库名称") + private String storeHouseName; // 仓库名称 + @ApiModelProperty("质物名称") + private String proName; // 质物名称 + @ApiModelProperty("规格（型号）") + private String proModel; // 规格（型号） + @ApiModelProperty("规格单位") + private String proUnit; // 规格单位 + @ApiModelProperty("生成厂家（产地）") + private String manufacturer; // 生成厂家（产地） + @ApiModelProperty("数量") + private String estimateNum; // 数量 + @ApiModelProperty("重量") + private String estimateWeight; // 重量 + @ApiModelProperty("质权人确认的单价") + private String estimateConfirmedPrice; // 质权人确认的单价 + @ApiModelProperty("核算的价值") + private String estimateCalculatedValue; // 核算的价值 + @ApiModelProperty("实际数量") + private String realityNum; // 实际数量 + @ApiModelProperty("实际重量") + private String realityWeight; // 实际重量 + @ApiModelProperty("实际质权人确认的单价") + private String realityConfirmedPrice; // 实际质权人确认的单价 + @ApiModelProperty("实际核算的价值") + private String realityCalculatedValue; // 实际核算的价值 + @ApiModelProperty("货位号") + private String locationNumber; // 货位号 + @ApiModelProperty("申请单的sid") + private String mainSid; // 申请单的sid + @ApiModelProperty("质物id") + private String proId; // 质物id + +} \ No newline at end of file diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductQuery.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductQuery.java new file mode 100644 index 00000000..5eea23f9 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductQuery.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenewproduct; + + +import com.yxt.common.core.query.Query; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewProductQuery.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProductQuery
+ * Description: purchasenew_product 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "purchasenew_product 查询条件", description = "purchasenew_product 查询条件") +public class PurchasenewProductQuery implements Query { + + @ApiModelProperty("客户Sid（企业）") + private String custerSid; // 客户Sid（企业） + @ApiModelProperty("客户名称（企业）") + private String custerName; // 客户名称（企业） + @ApiModelProperty("仓库Sid") + private String storeHouseSid; // 仓库Sid + @ApiModelProperty("仓库名称") + private String storeHouseName; // 仓库名称 + @ApiModelProperty("质物名称") + private String proName; // 质物名称 + @ApiModelProperty("规格（型号）") + private String proModel; // 规格（型号） + @ApiModelProperty("规格单位") + private String proUnit; // 规格单位 + @ApiModelProperty("生成厂家（产地）") + private String manufacturer; // 生成厂家（产地） + @ApiModelProperty("数量") + private String estimateNum; // 数量 + @ApiModelProperty("重量") + private String estimateWeight; // 重量 + @ApiModelProperty("质权人确认的单价") + private String estimateConfirmedPrice; // 质权人确认的单价 + @ApiModelProperty("核算的价值") + private String estimateCalculatedValue; // 核算的价值 + @ApiModelProperty("实际数量") + private String realityNum; // 实际数量 + @ApiModelProperty("实际重量") + private String realityWeight; // 实际重量 + @ApiModelProperty("实际质权人确认的单价") + private String realityConfirmedPrice; // 实际质权人确认的单价 + @ApiModelProperty("实际核算的价值") + private String realityCalculatedValue; // 实际核算的价值 + @ApiModelProperty("货位号") + private String locationNumber; // 货位号 + @ApiModelProperty("申请单的sid") + private String mainSid; // 申请单的sid + @ApiModelProperty("质物id") + private String proId; // 质物id + +} diff --git a/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java new file mode 100644 index 00000000..e062d085 --- /dev/null +++ b/warehousing-system/project/wh-common/src/main/java/com/wh/pojo/purchasenewproduct/PurchasenewProductVo.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.pojo.purchasenewproduct; + + +import com.yxt.common.core.vo.Vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewProductVo.java
+ * Class: com.wh..api.purchasenewproduct.PurchasenewProductVo
+ * Description: purchasenew_product 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "purchasenew_product 视图数据对象", description = "purchasenew_product 视图数据对象") +public class PurchasenewProductVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("客户Sid（企业）") + private String custerSid; // 客户Sid（企业） + @ApiModelProperty("客户名称（企业）") + private String custerName; // 客户名称（企业） + @ApiModelProperty("仓库Sid") + private String storeHouseSid; // 仓库Sid + @ApiModelProperty("仓库名称") + private String storeHouseName; // 仓库名称 + @ApiModelProperty("质物名称") + private String proName; // 质物名称 + @ApiModelProperty("规格（型号）") + private String proModel; // 规格（型号） + @ApiModelProperty("规格单位") + private String proUnit; // 规格单位 + @ApiModelProperty("生成厂家（产地）") + private String manufacturer; // 生成厂家（产地） + @ApiModelProperty("数量") + private String estimateNum; // 数量 + @ApiModelProperty("重量") + private String estimateWeight; // 重量 + @ApiModelProperty("质权人确认的单价") + private String estimateConfirmedPrice; // 质权人确认的单价 + @ApiModelProperty("核算的价值") + private String estimateCalculatedValue; // 核算的价值 + @ApiModelProperty("实际数量") + private String realityNum; // 实际数量 + @ApiModelProperty("实际重量") + private String realityWeight; // 实际重量 + @ApiModelProperty("实际质权人确认的单价") + private String realityConfirmedPrice; // 实际质权人确认的单价 + @ApiModelProperty("实际核算的价值") + private String realityCalculatedValue; // 实际核算的价值 + @ApiModelProperty("货位号") + private String locationNumber; // 货位号 + @ApiModelProperty("申请单的sid") + private String mainSid; // 申请单的sid + @ApiModelProperty("质物id") + private String proId; // 质物id + +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java new file mode 100644 index 00000000..82b6ffcf --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java @@ -0,0 +1,51 @@ +package com.wh.controller.purchasenew; + +import com.wh.pojo.purchasenew.PurchasenewDetailsVo; +import com.wh.pojo.purchasenew.PurchasenewDto; +import com.wh.pojo.purchasenew.PurchasenewQuery; +import com.wh.pojo.purchasenew.PurchasenewVo; +import com.wh.service.purchasenew.PurchasenewService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@CrossOrigin +@RequestMapping("/purchasenew") +public class PurchasenewController { + @Autowired + private PurchasenewService purchasenewService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchasenewService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchasenewDto dto){ + return purchasenewService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + purchasenewService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + PurchasenewDetailsVo vo = purchasenewService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenewproduct/PurchasenewProductController.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenewproduct/PurchasenewProductController.java new file mode 100644 index 00000000..8325a396 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/controller/purchasenewproduct/PurchasenewProductController.java @@ -0,0 +1,54 @@ +package com.wh.controller.purchasenewproduct; + +import com.wh.pojo.purchasenewproduct.PurchasenewProductDetailsVo; +import com.wh.pojo.purchasenewproduct.PurchasenewProductDto; +import com.wh.pojo.purchasenewproduct.PurchasenewProductQuery; +import com.wh.pojo.purchasenewproduct.PurchasenewProductVo; +import com.wh.service.purchasenewproduct.PurchasenewProductService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@CrossOrigin +@RequestMapping("/purchasenewproduct/") +public class PurchasenewProductController { + + @Autowired + private PurchasenewProductService purchasenewProductService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchasenewProductService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchasenewProductDto dto){ + ResultBean rb = ResultBean.fireFail(); + purchasenewProductService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + purchasenewProductService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + PurchasenewProductDetailsVo vo = purchasenewProductService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java index 1d21b4a6..8714fd2c 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/api/prodstock/ProdStockMapper.java @@ -3,7 +3,12 @@ package com.wh.mapper.api.prodstock; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wh.pojo.api.InStorehouseMain; import com.wh.pojo.api.ProdStock; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; public interface ProdStockMapper extends BaseMapper { + @Update("update prod_stock set num=num-#{num} where pro_sid=#{proSid} and custer_sid=#{custerSid}") + void reduceNumByProdSidAndCustSid(@Param("proSid") String proSid, @Param("custerSid")String custerSid, + @Param("num")String num); } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java new file mode 100644 index 00000000..79bfa30d --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenew/PurchasenewMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.mapper.purchasenew; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.wh.pojo.purchasenew.Purchasenew; +import com.wh.pojo.purchasenew.PurchasenewVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewMapper.java
+ * Class: com.wh..biz.purchasenew.PurchasenewMapper
+ * Description: 采购订单.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchasenewMapper extends BaseMapper { + + //@Update("update purchasenew set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from purchasenew") + List selectListVo(); +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenewproduct/PurchasenewProductMapper.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenewproduct/PurchasenewProductMapper.java new file mode 100644 index 00000000..b21dc23e --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/mapper/purchasenewproduct/PurchasenewProductMapper.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.mapper.purchasenewproduct; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.wh.pojo.purchasenewproduct.PurchasenewProduct; +import com.wh.pojo.purchasenewproduct.PurchasenewProductVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewProductMapper.java
+ * Class: com.wh..biz.purchasenewproduct.PurchasenewProductMapper
+ * Description: purchasenew_product.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchasenewProductMapper extends BaseMapper { + + //@Update("update purchasenew_product set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from purchasenew_product") + List selectListVo(); +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseListingService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseListingService.java index 5f54391e..c1e5f34e 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseListingService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseListingService.java @@ -39,4 +39,10 @@ public class InStorehouseListingService extends MybatisBaseService params=new HashMap<>(); + params.put("main_sid",sid); + baseMapper.deleteByMap(params); + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java index 1378f327..18f1d5b7 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/instorehouse/InStorehouseMainService.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.wh.mapper.api.instorehouse.InStorehouseMainMapper; import com.wh.pojo.api.*; +import com.wh.pojo.purchasenew.PurchasenewDto; +import com.wh.pojo.purchasenewproduct.PurchasenewProductDto; import com.wh.service.api.prodstock.ProdStockService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -19,7 +21,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Positive; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; + @Slf4j @Service public class InStorehouseMainService extends MybatisBaseService { @@ -186,4 +194,76 @@ public class InStorehouseMainService extends MybatisBaseService r = ResultBean.fireFail(); + Map params=new HashMap<>(); + params.put("purchase_sid",purchaseSid); + List inStorehouseMains = baseMapper.selectByMap(params); + if(inStorehouseMains!=null&&inStorehouseMains.size()>0){ + InStorehouseMain inStorehouseMain = inStorehouseMains.get(0); + dto.setSid(inStorehouseMain.getSid()); + deleteByMainSid(inStorehouseMain.getSid()); + deleteBySid(inStorehouseMain.getSid()); + } + InStoreHouseMainDto inStoreHouseMainDto=new InStoreHouseMainDto(); + inStoreHouseMainDto.setNo("RK"+dto.getPurchaseNo()); //varchar 50 编号 + inStoreHouseMainDto.setApplicationDate(dto.getPurchaseDate()); //date 50 制单日期 + inStoreHouseMainDto.setCreatorSid(dto.getPurchasePersonSid()); //varchar 64 制单人Sid + inStoreHouseMainDto.setCreatorName(dto.getPurchasePerson()); /// varchar 50 制单人姓名 + inStoreHouseMainDto.setCusterSid(dto.getCustId()); //varchar 64 客户Sid（企业） + inStoreHouseMainDto.setCusterName(dto.getCustName()); // varchar 100 客户名称（企业） + inStoreHouseMainDto.setStoreHouseSid(dto.getStorehouseId()); // varchar 64 仓库Sid + inStoreHouseMainDto.setStoreHouseName(dto.getStorehouseName()); // varchar 100 仓库名称 + List list=new ArrayList<>(); + List products = dto.getProducts(); + products.forEach(p->{ + InStorehouseListing ppd=new InStorehouseListing(); + ppd.setCusterSid(p.getCusterSid());// varchar 64 客户Sid（企业） + ppd.setCusterName(p.getCusterName()) ;//varchar 100 客户名称（企业） + ppd.setStoreHouseSid(p.getStoreHouseSid()) ;//varchar 64 仓库Sid + ppd.setStoreHouseName(p.getStoreHouseName()) ;//varchar 100 仓库名称 + ppd.setProName(p.getProName());// varchar 50 质物名称 + ppd.setProSid(p.getProId());// varchar 50 质物名称 + ppd.setProModel(p.getProModel()) ;//varchar 50 规格（型号） + ppd.setProUnit(p.getProUnit()) ;//varchar 50 规格单位 + ppd.setManufacturer(p.getManufacturer());// varchar 50 生成厂家（产地） + ppd.setNum(p.getEstimateNum()) ;//varchar 10 数量 + ppd.setWeight(p.getEstimateWeight()) ;//varchar 50 重量 + ppd.setConfirmedPrice(p.getEstimateConfirmedPrice());// decime 50 2 质权人确认的单价 + ppd.setCalculatedValue(p.getEstimateCalculatedValue()) ;//decime 50 2 核算的价值 + ppd.setLocationNumber(p.getLocationNumber()) ;//varchar 10 货位号 + ppd.setPurchaseSid(purchaseSid);//采购申请单的sid + list.add(ppd); + }); + inStoreHouseMainDto.setList(list); + inStoreHouseMainDto.setPurchaseSid(purchaseSid);//采购申请单的sid + addInStorehouse(inStoreHouseMainDto); + return r.success(); + } + + /** + * 根据入库单的sid删除商品信息 减少库存数量 + * @param sid + * @return + */ + @Transactional + public ResultBean deleteByMainSid(String sid){ + ResultBean r = ResultBean.fireFail(); + List inStorehouseListings = inStorehouseListingService.selectInStorehouseListingsByMainSid(sid); + inStorehouseListings.forEach(i->{ + prodStockService.reduceNumByProdSidAndCustSid(i.getProSid(), i.getCusterSid(),i.getNum()); + }); + inStorehouseListingService.deleteByMainSid(sid); + Map params=new HashMap<>(); + params.put("sid",sid); + baseMapper.deleteByMap(params); + return r.success(); + } } diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java index 10ef39ad..6cf4de8b 100644 --- a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/api/prodstock/ProdStockService.java @@ -53,4 +53,8 @@ public class ProdStockService extends MybatisBaseService { + @Autowired + private PurchasenewProductService purchasenewProductService; + @Autowired + private InStorehouseMainService inStorehouseMainService; + private QueryWrapper createQueryWrapper(PurchasenewQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + PurchasenewQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + @Transactional + public ResultBean saveOrUpdateDto(PurchasenewDto dto){ + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List products = dto.getProducts(); + if(products.size()==0){ + return rb.setMsg("商品列表不能为空"); + } + if (StringUtils.isBlank(dtoSid)) { + return this.insertByDto(dto); + } + return this.updateByDto(dto); + } + + public ResultBean insertByDto(PurchasenewDto dto){ + + ResultBean rb = ResultBean.fireFail(); + Purchasenew entity = new Purchasenew(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + /* dto.setSid(entity.getSid());*/ + addPurchasenewProduct(dto, rb, entity); + return inStorehouseMainService.saveOrUpdateByPurchaseSid(dto,entity.getSid()); + + } + + public ResultBean updateByDto(PurchasenewDto dto){ + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return rb.setMsg("主键信息不能为空"); + } + Purchasenew entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + //dto.setSid(entity.getSid()); + purchasenewProductService.deleteByPurchaseSid(dtoSid); + addPurchasenewProduct(dto, rb, entity); + return inStorehouseMainService.saveOrUpdateByPurchaseSid(dto,entity.getSid()); + } + + private ResultBean addPurchasenewProduct(PurchasenewDto dto, ResultBean rb, Purchasenew entity) { + List l =new ArrayList<>(); + List products = dto.getProducts(); + products.forEach(p->{ + PurchasenewProduct pp=new PurchasenewProduct(); + BeanUtil.copyProperties(p,pp,"id","sid"); + pp.setMainSid(entity.getSid()); + l.add(pp); + }); + boolean b = purchasenewProductService.saveBatch(l); + if (b) + return rb.success(); + return rb; + } + + public PurchasenewDetailsVo fetchDetailsVoBySid(String sid){ + Purchasenew entity = fetchBySid(sid); + PurchasenewDetailsVo vo = new PurchasenewDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} diff --git a/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenewproduct/PurchasenewProductService.java b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenewproduct/PurchasenewProductService.java new file mode 100644 index 00000000..d7e7209d --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/java/com/wh/service/purchasenewproduct/PurchasenewProductService.java @@ -0,0 +1,120 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.wh.service.purchasenewproduct; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.wh.mapper.purchasenewproduct.PurchasenewProductMapper; +import com.wh.pojo.purchasenewproduct.*; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.utils.PagerUtil; + +import org.springframework.stereotype.Service; + +/** + * Project: warehouse(仓储)
+ * File: PurchasenewProductService.java
+ * Class: com.wh..biz.purchasenewproduct.PurchasenewProductService
+ * Description: purchasenew_product 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-06-10 18:09:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PurchasenewProductService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(PurchasenewProductQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + PurchasenewProductQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(PurchasenewProductDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(PurchasenewProductDto dto){ + PurchasenewProduct entity = new PurchasenewProduct(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(PurchasenewProductDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + PurchasenewProduct entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public PurchasenewProductDetailsVo fetchDetailsVoBySid(String sid){ + PurchasenewProduct entity = fetchBySid(sid); + PurchasenewProductDetailsVo vo = new PurchasenewProductDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + /** + * 根据采购订单的sid删除采购订单的商品信息 + * @param dtoSid + */ + public ResultBean deleteByPurchaseSid(String dtoSid) { + ResultBean rb = ResultBean.fireFail(); + PurchasenewProductQuery query=new PurchasenewProductQuery(); + query.setMainSid(dtoSid); + QueryWrapper qw = createQueryWrapper(query); + int delete = baseMapper.delete(qw); + if (delete>0) + return rb.success(); + return rb; + + } +} \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/resources/application.yml b/warehousing-system/project/wh-manage/src/main/resources/application.yml index c65a98bf..d026260b 100644 --- a/warehousing-system/project/wh-manage/src/main/resources/application.yml +++ b/warehousing-system/project/wh-manage/src/main/resources/application.yml @@ -7,6 +7,7 @@ spring: url: jdbc:mysql://127.0.0.1:3306/warehouse2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&allowMultiQueries=true username: root password: 1LAiGz$t1*Iw + #password: root #mybatis-plush配置 @@ -15,6 +16,9 @@ mybatis-plus: mapper-locations: classpath:/mappers/*.xml configuration: map-underscore-to-camel-case: true + global-config: + db-config: + id-type: auto logging: level: diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewMapper.xml new file mode 100644 index 00000000..78c4effe --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewProductMapper.xml b/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewProductMapper.xml new file mode 100644 index 00000000..6f4dcc54 --- /dev/null +++ b/warehousing-system/project/wh-manage/src/main/resources/mappers/PurchasenewProductMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanRest.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanRest.java index a9411c27..04100e12 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanRest.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanRest.java @@ -85,8 +85,11 @@ public class DispatchPatrolPlanRest implements DispatchPatrolPlanFeign { @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); - dispatchPatrolPlanService.delBySids(sids); - return rb.success(); + int i=dispatchPatrolPlanService.delBySids(sids); + if (i>0) + return rb.success(); + else + return rb; } @Override