huanglizhi 11 hónapja
szülő
commit
408186a626
100 módosított fájl, 90 hozzáadás és 4598 törlés
  1. BIN
      module-erp/libs/amazon-sp-api-1.0.0-SNAPSHOT.jar
  2. 79 2
      module-erp/pom.xml
  3. 0 64
      module-erp/src/main/java/com/hys/app/controller/erp/EnterpriseController.java
  4. 0 108
      module-erp/src/main/java/com/hys/app/controller/erp/basic/LogisticsCompanyManagerController.java
  5. 0 96
      module-erp/src/main/java/com/hys/app/controller/erp/goods/BrandManagerController.java
  6. 0 224
      module-erp/src/main/java/com/hys/app/controller/erp/goods/CategoryManagerController.java
  7. 0 64
      module-erp/src/main/java/com/hys/app/controller/erp/goods/GoodsLabelController.java
  8. 0 44
      module-erp/src/main/java/com/hys/app/controller/erp/goods/GoodsLabelRelationController.java
  9. 0 91
      module-erp/src/main/java/com/hys/app/controller/erp/goods/ParameterGroupManagerController.java
  10. 0 87
      module-erp/src/main/java/com/hys/app/controller/erp/goods/ParametersManagerController.java
  11. 0 78
      module-erp/src/main/java/com/hys/app/controller/erp/goods/ShipTemplateManagerController.java
  12. 0 52
      module-erp/src/main/java/com/hys/app/controller/erp/goods/SpecValuesManagerController.java
  13. 0 149
      module-erp/src/main/java/com/hys/app/controller/erp/goods/SpecificationManagerController.java
  14. 0 104
      module-erp/src/main/java/com/hys/app/controller/erp/purchase/ProcurementContractManagerController.java
  15. 0 94
      module-erp/src/main/java/com/hys/app/controller/erp/purchase/ProcurementPlanManagerController.java
  16. 0 82
      module-erp/src/main/java/com/hys/app/controller/erp/purchase/SupplierManagerController.java
  17. 0 35
      module-erp/src/main/java/com/hys/app/controller/erp/purchase/SupplierReturnItemManagerController.java
  18. 0 105
      module-erp/src/main/java/com/hys/app/controller/erp/purchase/SupplierReturnManagerController.java
  19. 0 66
      module-erp/src/main/java/com/hys/app/controller/erp/purchase/SupplierSettlementManagerController.java
  20. 0 44
      module-erp/src/main/java/com/hys/app/controller/erp/sale/OrderPaymentController.java
  21. 0 75
      module-erp/src/main/java/com/hys/app/controller/erp/sale/SaleChannelController.java
  22. 1 1
      module-erp/src/main/java/com/hys/app/controller/erp/use/CustomerController.java
  23. 0 101
      module-erp/src/main/java/com/hys/app/controller/erp/use/GoodsManagerController.java
  24. 0 79
      module-erp/src/main/java/com/hys/app/controller/erp/use/GoodsSnController.java
  25. 0 36
      module-erp/src/main/java/com/hys/app/controller/erp/use/OrderReturnItemManagerController.java
  26. 0 73
      module-erp/src/main/java/com/hys/app/controller/erp/use/OrderReturnManagerController.java
  27. 1 11
      module-erp/src/main/java/com/hys/app/controller/erp/use/PayController.java
  28. 0 81
      module-erp/src/main/java/com/hys/app/controller/erp/use/PayTypeController.java
  29. 3 6
      module-erp/src/main/java/com/hys/app/controller/erp/use/ProductManagerController.java
  30. 0 5
      module-erp/src/main/java/com/hys/app/controller/erp/use/ProductStockManagerController.java
  31. 0 85
      module-erp/src/main/java/com/hys/app/controller/erp/use/ScanCodeController.java
  32. 0 6
      module-erp/src/main/java/com/hys/app/controller/erp/use/StockTransferManagerController.java
  33. 0 2
      module-erp/src/main/java/com/hys/app/controller/erp/use/WarehouseEntryProductManagerController.java
  34. 0 10
      module-erp/src/main/java/com/hys/app/controller/erp/use/WarehouseOutManagerController.java
  35. 0 69
      module-erp/src/main/java/com/hys/app/controller/erp/use/task/OrderReturnTask.java
  36. 0 120
      module-erp/src/main/java/com/hys/app/controller/erp/warehouse/ChangeFormManagerController.java
  37. 0 113
      module-erp/src/main/java/com/hys/app/controller/erp/warehouse/LendFormManagerController.java
  38. 0 43
      module-erp/src/main/java/com/hys/app/controller/erp/warehouse/StockBatchFlowController.java
  39. 0 55
      module-erp/src/main/java/com/hys/app/controller/erp/warehouse/StockStatisticsManagerController.java
  40. 0 37
      module-erp/src/main/java/com/hys/app/controller/erp/warehouse/StockTransferProductManagerController.java
  41. 0 45
      module-erp/src/main/java/com/hys/app/controller/erp/warehouse/WarehouseEntryBatchManagerController.java
  42. 0 32
      module-erp/src/main/java/com/hys/app/converter/erp/EnterpriseConverter.java
  43. 0 41
      module-erp/src/main/java/com/hys/app/converter/erp/GoodsConverter.java
  44. 0 32
      module-erp/src/main/java/com/hys/app/converter/erp/GoodsLabelConverter.java
  45. 0 32
      module-erp/src/main/java/com/hys/app/converter/erp/GoodsLabelRelationConverter.java
  46. 0 46
      module-erp/src/main/java/com/hys/app/converter/erp/GoodsSnConverter.java
  47. 0 7
      module-erp/src/main/java/com/hys/app/converter/erp/OrderItemConverter.java
  48. 0 50
      module-erp/src/main/java/com/hys/app/converter/erp/OrderPaymentConverter.java
  49. 0 120
      module-erp/src/main/java/com/hys/app/converter/erp/OrderReturnItemConverter.java
  50. 0 34
      module-erp/src/main/java/com/hys/app/converter/erp/ProcurementContractProductConverter.java
  51. 0 65
      module-erp/src/main/java/com/hys/app/converter/erp/ProductConverter.java
  52. 0 49
      module-erp/src/main/java/com/hys/app/converter/erp/SaleChannelConverter.java
  53. 0 32
      module-erp/src/main/java/com/hys/app/converter/erp/StockBatchFlowConverter.java
  54. 0 34
      module-erp/src/main/java/com/hys/app/converter/erp/StockTransferConverter.java
  55. 5 7
      module-erp/src/main/java/com/hys/app/converter/erp/StockTransferProductConverter.java
  56. 0 30
      module-erp/src/main/java/com/hys/app/converter/erp/SupplierConverter.java
  57. 0 79
      module-erp/src/main/java/com/hys/app/converter/erp/SupplierReturnConverter.java
  58. 0 61
      module-erp/src/main/java/com/hys/app/converter/erp/SupplierReturnItemConverter.java
  59. 0 40
      module-erp/src/main/java/com/hys/app/converter/erp/SupplierSettlementConverter.java
  60. 0 15
      module-erp/src/main/java/com/hys/app/converter/erp/UserMenuConverter.java
  61. 0 88
      module-erp/src/main/java/com/hys/app/converter/erp/WarehouseEntryBatchConverter.java
  62. 0 85
      module-erp/src/main/java/com/hys/app/converter/erp/WarehouseEntryConverter.java
  63. 0 5
      module-erp/src/main/java/com/hys/app/converter/erp/WarehouseOutItemConverter.java
  64. 1 8
      module-erp/src/main/java/com/hys/app/framework/datapermission/DataPermissionTableCustomizer.java
  65. 0 12
      module-erp/src/main/java/com/hys/app/mapper/erp/AreaStockMapper.java
  66. 0 39
      module-erp/src/main/java/com/hys/app/mapper/erp/ChangeFormMapper.java
  67. 0 3
      module-erp/src/main/java/com/hys/app/mapper/erp/CustomerMapper.java
  68. 0 41
      module-erp/src/main/java/com/hys/app/mapper/erp/EnterpriseMapper.java
  69. 0 28
      module-erp/src/main/java/com/hys/app/mapper/erp/GoodsLabelMapper.java
  70. 0 34
      module-erp/src/main/java/com/hys/app/mapper/erp/GoodsLabelRelationMapper.java
  71. 0 15
      module-erp/src/main/java/com/hys/app/mapper/erp/LendFormMapper.java
  72. 0 29
      module-erp/src/main/java/com/hys/app/mapper/erp/OrderPaymentMapper.java
  73. 0 15
      module-erp/src/main/java/com/hys/app/mapper/erp/ProcurementContractMapper.java
  74. 0 15
      module-erp/src/main/java/com/hys/app/mapper/erp/ProcurementPlanMapper.java
  75. 0 15
      module-erp/src/main/java/com/hys/app/mapper/erp/ProcurementPlanProductMapper.java
  76. 0 42
      module-erp/src/main/java/com/hys/app/mapper/erp/StockBatchFlowMapper.java
  77. 0 38
      module-erp/src/main/java/com/hys/app/mapper/erp/StockStatisticsMapper.java
  78. 0 18
      module-erp/src/main/java/com/hys/app/mapper/erp/StockTransferMapper.java
  79. 0 48
      module-erp/src/main/java/com/hys/app/mapper/erp/SupplierMapper.java
  80. 0 33
      module-erp/src/main/java/com/hys/app/mapper/erp/SupplierReturnItemMapper.java
  81. 0 60
      module-erp/src/main/java/com/hys/app/mapper/erp/SupplierReturnMapper.java
  82. 0 28
      module-erp/src/main/java/com/hys/app/mapper/erp/SupplierSettlementMapper.java
  83. 0 44
      module-erp/src/main/java/com/hys/app/mapper/erp/WarehouseEntryBatchMapper.java
  84. 0 39
      module-erp/src/main/java/com/hys/app/mapper/goods/BrandMapper.java
  85. 0 17
      module-erp/src/main/java/com/hys/app/mapper/goods/CategoryBrandMapper.java
  86. 0 19
      module-erp/src/main/java/com/hys/app/mapper/goods/CategoryMapper.java
  87. 0 17
      module-erp/src/main/java/com/hys/app/mapper/goods/CategorySpecMapper.java
  88. 0 17
      module-erp/src/main/java/com/hys/app/mapper/goods/GoodsGalleryMapper.java
  89. 0 31
      module-erp/src/main/java/com/hys/app/mapper/goods/GoodsMapper.java
  90. 0 38
      module-erp/src/main/java/com/hys/app/mapper/goods/GoodsParamsMapper.java
  91. 0 50
      module-erp/src/main/java/com/hys/app/mapper/goods/GoodsSnMapper.java
  92. 0 18
      module-erp/src/main/java/com/hys/app/mapper/goods/LogisticsCompanyMapper.java
  93. 0 17
      module-erp/src/main/java/com/hys/app/mapper/goods/ParameterGroupMapper.java
  94. 0 29
      module-erp/src/main/java/com/hys/app/mapper/goods/ParametersMapper.java
  95. 0 21
      module-erp/src/main/java/com/hys/app/mapper/goods/PayTypeMapper.java
  96. 0 16
      module-erp/src/main/java/com/hys/app/mapper/goods/ProductGroupItemMapper.java
  97. 0 15
      module-erp/src/main/java/com/hys/app/mapper/goods/ProductGroupMapper.java
  98. 0 19
      module-erp/src/main/java/com/hys/app/mapper/goods/ShipTemplateChildMapper.java
  99. 0 27
      module-erp/src/main/java/com/hys/app/mapper/goods/ShipTemplateMapper.java
  100. 0 17
      module-erp/src/main/java/com/hys/app/mapper/goods/SpecValuesMapper.java

BIN
module-erp/libs/amazon-sp-api-1.0.0-SNAPSHOT.jar


+ 79 - 2
module-erp/pom.xml

@@ -13,9 +13,17 @@
 
     <repositories>
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/davidmoten/amazon-sp-api</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
+
+<!--        <repository>-->
+<!--            <id>jitpack.io</id>-->
+<!--            <url>https://jitpack.io</url>-->
+<!--        </repository>-->
     </repositories>
 
     <dependencies>
@@ -89,6 +97,75 @@
             <artifactId>weixin-java-mp</artifactId>
             <version>4.3.0</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>software.amazon.awssdk</groupId>-->
+<!--            <artifactId>sdk-core</artifactId>-->
+<!--            <version>2.17.89</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>software.amazon.awssdk</groupId>-->
+<!--            <artifactId>mws</artifactId>-->
+<!--            <version>2.17.89</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.amazonservices.mws.orders</groupId>-->
+<!--            <artifactId>mws-orders-api</artifactId>-->
+<!--            <version>2013-09-01</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.amazonaws</groupId>-->
+<!--            <artifactId>aws-java-sdk</artifactId>-->
+<!--            <version>1.11.1000</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.amazonservices.mws.orders</groupId>-->
+<!--            <artifactId>mws-orders-api</artifactId>-->
+<!--            <version>2013-09-01</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.amazonservices.mws.products</groupId>-->
+<!--            <artifactId>mws-products-api</artifactId>-->
+<!--            <version>2011-10-01</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.amazonservices.mws.inventory</groupId>-->
+<!--            <artifactId>mws-inventory-api</artifactId>-->
+<!--            <version>2010-10-01</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>org.apache.httpcomponents</groupId>-->
+<!--            <artifactId>httpclient</artifactId>-->
+<!--            <version>4.5.13</version>-->
+<!--        </dependency>-->
+<!--        &lt;!&ndash; Jackson for JSON processing &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.fasterxml.jackson.core</groupId>-->
+<!--            <artifactId>jackson-databind</artifactId>-->
+<!--            <version>2.12.3</version>-->
+<!--        </dependency>-->
+<!--        &lt;!&ndash; AWS SDK for signing requests &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>software.amazon.awssdk</groupId>-->
+<!--            <artifactId>auth</artifactId>-->
+<!--            <version>2.16.77</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>io.github.davidmoten</groupId>-->
+<!--            <artifactId>amazon-sp-api</artifactId>-->
+<!--            <version>2.1.60</version>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.amazon</groupId>
+            <artifactId>sp-api</artifactId>
+            <version>1.0.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/amazon-sp-api-1.0.0-SNAPSHOT.jar</systemPath>
+        </dependency>
+
     </dependencies>
 
 

+ 0 - 64
module-erp/src/main/java/com/hys/app/controller/erp/EnterpriseController.java

@@ -1,64 +0,0 @@
-package com.hys.app.controller.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.EnterpriseDTO;
-import com.hys.app.model.erp.dto.EnterpriseQueryParams;
-import com.hys.app.model.erp.vo.EnterpriseVO;
-import com.hys.app.service.erp.EnterpriseManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 企业 API
- *
- * @author 张崧
- * 2024-03-25 15:44:10
- */
-@RestController
-@RequestMapping("/admin/erp/enterprise")
-@Api(tags = "企业API")
-@Validated
-public class EnterpriseController {
-
-    @Autowired
-    private EnterpriseManager enterpriseManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<EnterpriseVO> list(EnterpriseQueryParams queryParams) {
-        return enterpriseManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    public void add(@RequestBody @Valid EnterpriseDTO enterpriseDTO) {
-        enterpriseManager.add(enterpriseDTO);
-    }
-
-    @ApiOperation(value = "修改")
-    @PutMapping("/{id}")
-    public void edit(@PathVariable String id, @RequestBody @Valid EnterpriseDTO enterpriseDTO) {
-        enterpriseDTO.setId(id);
-        enterpriseManager.edit(enterpriseDTO);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public EnterpriseVO getDetail(@PathVariable Long id) {
-        return enterpriseManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public void delete(@PathVariable List<Long> ids) {
-        enterpriseManager.delete(ids);
-    }
-
-}
-

+ 0 - 108
module-erp/src/main/java/com/hys/app/controller/erp/basic/LogisticsCompanyManagerController.java

@@ -1,108 +0,0 @@
-package com.hys.app.controller.erp.basic;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.system.dos.LogisticsCompanyDO;
-import com.hys.app.model.system.dto.FormItem;
-import com.hys.app.service.system.LogisticsCompanyManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * 物流公司控制器
- *
- * @author zjp
- * @version v7.0.0
- * @since v7.0.0
- * 2018-03-29 15:10:38
- */
-@RestController
-@RequestMapping("/admin/systems/logi-companies")
-@Api(description = "物流公司相关API")
-@Validated
-public class LogisticsCompanyManagerController {
-
-    @Autowired
-    private LogisticsCompanyManager logisticsCompanyManager;
-
-    @ApiOperation(value = "查询物流公司列表", response = LogisticsCompanyDO.class)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "page_no", value = "页码", required = true, dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "page_size", value = "每页显示数量", required = true, dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "name", value = "物流公司名称", dataType = "String", paramType = "query")
-    })
-    @GetMapping
-    public WebPage list(@ApiIgnore @NotNull(message = "页码不能为空") Long pageNo, @ApiIgnore @NotNull(message = "每页数量不能为空") Long pageSize, @ApiIgnore String name) {
-
-        return this.logisticsCompanyManager.list(pageNo, pageSize, name);
-    }
-
-
-    @ApiOperation(value = "添加物流公司", response = LogisticsCompanyDO.class)
-    @PostMapping
-    public LogisticsCompanyDO add(@Valid LogisticsCompanyDO logi,@RequestBody @Valid List<FormItem> formItems) {
-
-        logi.setForm(formItems);
-        this.logisticsCompanyManager.add(logi);
-
-        return logi;
-    }
-
-    @PutMapping(value = "/{id}")
-    @ApiOperation(value = "修改物流公司", response = LogisticsCompanyDO.class)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "int", paramType = "path")
-    })
-    public LogisticsCompanyDO edit(@Valid LogisticsCompanyDO logi, @PathVariable("id") Long id,@RequestBody @Valid List<FormItem> formItems) {
-
-        logi.setForm(formItems);
-        this.logisticsCompanyManager.edit(logi, id);
-
-        return logi;
-    }
-
-
-    @DeleteMapping(value = "/{id}")
-    @ApiOperation(value = "删除物流公司")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "要删除的物流公司主键", required = true, dataType = "int", paramType = "path")
-    })
-    public String delete(@PathVariable("id") Long id) {
-        this.logisticsCompanyManager.delete(id);
-
-        return "";
-    }
-
-
-    @GetMapping(value = "/{id}")
-    @ApiOperation(value = "查询一个物流公司")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "要查询的物流公司主键", required = true, dataType = "int", paramType = "path")
-    })
-    public LogisticsCompanyDO get(@PathVariable("id") Long id) {
-        LogisticsCompanyDO logi = this.logisticsCompanyManager.getModel(id);
-        return logi;
-    }
-
-    @PostMapping(value = "/{id}")
-    @ApiOperation(value = "开启或禁用物流公司")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "物流公司主键ID", required = true, dataType = "int", paramType = "path"),
-            @ApiImplicitParam(name = "disabled", value = "状态 OPEN:开启,CLOSE:禁用", required = true, dataType = "String", paramType = "path", allowableValues = "OPEN,CLOSE")
-    })
-    public String openClose(@PathVariable("id") Long id, @ApiIgnore String disabled) {
-        this.logisticsCompanyManager.openCloseLogi(id, disabled);
-
-        return "";
-    }
-
-}

+ 0 - 96
module-erp/src/main/java/com/hys/app/controller/erp/goods/BrandManagerController.java

@@ -1,96 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.goods.dos.BrandDO;
-import com.hys.app.service.goods.BrandManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-/**
- * 品牌控制器
- *
- * @author fk
- * @version v2.0
- * @since v7.0.0 2018-03-16 16:32:46
- */
-@RestController
-@RequestMapping("/admin/goods/brands")
-@Api(description = "品牌相关API")
-public class BrandManagerController {
-    @Autowired
-    private BrandManager brandManager;
-
-    @ApiOperation(value = "查询品牌列表", response = BrandDO.class)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "page_no", value = "页码", required = true, dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "page_size", value = "每页显示数量", required = true, dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "name", value = "品牌名称", dataType = "string", paramType = "query")})
-    @GetMapping
-    public WebPage list(@ApiIgnore @NotEmpty(message = "页码不能为空") Long pageNo,
-                        @ApiIgnore @NotEmpty(message = "每页数量不能为空") Long pageSize,
-                        String name) {
-
-        return this.brandManager.list(pageNo, pageSize,name);
-    }
-
-    @ApiOperation(value = "添加品牌", response = BrandDO.class)
-    @PostMapping
-    public BrandDO add(@Valid BrandDO brand) {
-
-        this.brandManager.add(brand);
-
-        return brand;
-    }
-
-    @PutMapping(value = "/{id}")
-    @ApiOperation(value = "修改品牌", response = BrandDO.class)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "int", paramType = "path")})
-    public BrandDO edit(@Valid BrandDO brand, @PathVariable String id) {
-
-        this.brandManager.edit(brand, id);
-
-        return brand;
-    }
-
-    @DeleteMapping(value = "/{ids}")
-    @ApiOperation(value = "删除品牌")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要删除的品牌主键集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)})
-    public String delete(@PathVariable Long[] ids) {
-
-        this.brandManager.delete(ids);
-
-        return "";
-    }
-
-    @GetMapping(value = "/{id}")
-    @ApiOperation(value = "查询一个品牌")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "要查询的品牌主键", required = true, dataType = "int", paramType = "path")})
-    public BrandDO get(@PathVariable String id) {
-
-        BrandDO brand = this.brandManager.getModel(id);
-
-        return brand;
-    }
-
-    @GetMapping(value = "/all")
-    @ApiOperation(value = "查询所有品牌")
-    public List<BrandDO> listAll() {
-
-        List<BrandDO> brands = this.brandManager.getAllBrands();
-
-        return brands;
-    }
-
-}

+ 0 - 224
module-erp/src/main/java/com/hys/app/controller/erp/goods/CategoryManagerController.java

@@ -1,224 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.framework.exception.ServiceException;
-import com.hys.app.model.goods.dos.BrandDO;
-import com.hys.app.model.goods.dos.CategoryBrandDO;
-import com.hys.app.model.goods.dos.CategoryDO;
-import com.hys.app.model.goods.dos.CategorySpecDO;
-import com.hys.app.model.goods.vo.CategoryVO;
-import com.hys.app.model.goods.vo.GoodsParamsGroupVO;
-import com.hys.app.model.goods.vo.ParameterGroupVO;
-import com.hys.app.model.goods.vo.SelectVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.GoodsManager;
-import com.hys.app.service.goods.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 商品分类控制器
- *
- * @author fk
- * @version v2.0
- * @since v7.0.0 2018-03-15 17:22:06
- */
-@RestController
-@RequestMapping("/admin/goods/categories")
-@Api(description = "商品分类相关API")
-@Validated
-public class CategoryManagerController {
-
-    @Autowired
-    private CategoryManager categoryManager;
-
-    @Autowired
-    private BrandManager brandManager;
-
-    @Autowired
-    private SpecificationManager specificationManager;
-
-    @Autowired
-    private ParameterGroupManager parameterGroupManager;
-
-    @Autowired
-    private GoodsParamsManager goodsParamsManager;
-
-    @Autowired
-    private GoodsManager goodsManager;
-
-    @ApiOperation(value = "查询某分类下的子分类列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "parent_id", value = "父id,顶级为0", required = true, dataType = "String", paramType = "path"),
-            @ApiImplicitParam(name = "format", value = "类型,如果值是plugin则查询插件使用的格式数据", required = false, dataType = "string", paramType = "query"),})
-    @GetMapping(value = "/{parent_id}/children")
-    public List list(@ApiIgnore @PathVariable("parent_id") Long parentId, @ApiIgnore String format) {
-
-        List list = this.categoryManager.list(parentId, format, null);
-
-        return list;
-    }
-
-    @ApiOperation(value = "查询某分类下的全部子分类列表")
-    @ApiImplicitParam(name = "parent_id", value = "父id,顶级为0", required = true, dataType = "int", paramType = "path")
-    @GetMapping(value = "/{parent_id}/all-children")
-    public List list(@ApiIgnore @PathVariable("parent_id") Long parentId) {
-
-        List list = this.categoryManager.listAllChildren(parentId);
-
-        return list;
-    }
-
-    @ApiOperation(value = "添加商品分类", response = CategoryDO.class)
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "添加名称为[${category.name}]的商品分类信息")
-    public CategoryDO add(@Valid CategoryDO category) {
-
-        this.categoryManager.add(category);
-
-        return category;
-    }
-
-    @PutMapping(value = "/{id}")
-    @ApiOperation(value = "修改商品分类", response = CategoryDO.class)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "String", paramType = "path")})
-    @Log(client = LogClient.admin, detail = "编辑ID为[${id}]的商品分类信息")
-    public CategoryDO edit(@Valid CategoryDO category, @ApiIgnore @PathVariable Long id) {
-
-        this.categoryManager.edit(category, id);
-
-        return category;
-    }
-
-    @DeleteMapping(value = "/{id}")
-    @ApiOperation(value = "删除商品分类")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "要删除的商品分类主键", required = true, dataType = "int", paramType = "path")})
-    @Log(client = LogClient.admin, detail = "删除ID为[${id}]的商品分类信息")
-    public String delete(@PathVariable Long id) {
-        if(goodsManager.countByCategoryId(id) > 0){
-            throw new ServiceException("此类别下存在商品不能删除");
-        }
-
-        this.categoryManager.delete(id);
-
-        return "";
-    }
-
-    @GetMapping(value = "/{id}")
-    @ApiOperation(value = "查询一个商品分类")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "要查询的商品分类主键", required = true, dataType = "Long", paramType = "path")})
-    public CategoryDO get(@PathVariable Long id) {
-
-        CategoryDO category = this.categoryManager.getModel(id);
-
-        return category;
-    }
-
-    @ApiOperation(value = "查询分类品牌", notes = "查询某个分类绑定的品牌,包括未选中的品牌")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "category_id", value = "分类id", required = true, dataType = "Long", paramType = "path"),})
-    @GetMapping(value = "/{category_id}/brands")
-    public List<SelectVO> getCatBrands(@PathVariable("category_id") Long categoryId) {
-
-        List<SelectVO> brands = brandManager.getCatBrand(categoryId);
-
-        return brands;
-    }
-
-    @ApiOperation(value = "管理员操作分类绑定品牌", notes = "管理员操作分类绑定品牌使用")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "category_id", value = "分类id", required = true, paramType = "path", dataType = "String"),
-            @ApiImplicitParam(name = "choose_brands", value = "品牌id数组", required = true, paramType = "query", dataType = "String", allowMultiple = true)})
-    @PutMapping(value = "/{category_id}/brands")
-    @Log(client = LogClient.admin, detail = "为ID为[${categoryId}]的商品分类绑定品牌信息")
-    public List<CategoryBrandDO> saveBrand(@PathVariable("category_id") Long categoryId, @ApiIgnore @RequestParam(value = "choose_brands", required = false) String[] chooseBrands) {
-        return this.categoryManager.saveBrand(categoryId, chooseBrands);
-    }
-
-    @ApiOperation(value = "查询分类规格", notes = "查询所有规格,包括分类绑定的规格,selected为true")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "category_id", value = "分类id", required = true, dataType = "Long", paramType = "path"),})
-    @GetMapping(value = "/specs/{category_id}")
-    public List<SelectVO> getCatSpecs(@PathVariable("category_id") Long categoryId) {
-
-        List<SelectVO> brands = specificationManager.getCatSpecification(categoryId);
-
-        return brands;
-    }
-
-    @ApiOperation(value = "管理员操作分类绑定规格", notes = "管理员操作分类绑定规格使用")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "category_id", value = "分类id", required = true, paramType = "path", dataType = "Long"),
-            @ApiImplicitParam(name = "choose_specs", value = "规格id数组", required = true, paramType = "query", dataType = "Long", allowMultiple = true),})
-    @PutMapping(value = "/specs/{category_id}")
-    @Log(client = LogClient.admin, detail = "为ID为[${categoryId}]的商品分类绑定规格信息")
-    public List<CategorySpecDO> saveSpec(@PathVariable("category_id") Long categoryId, @ApiIgnore @RequestParam(value = "choose_specs", required = false) Long[] chooseSpecs) {
-
-        return this.categoryManager.saveSpec(categoryId, chooseSpecs);
-    }
-
-    @ApiOperation(value = "查询分类参数", notes = "查询分类绑定的参数,包括参数组和参数")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "category_id", value = "分类id", required = true, dataType = "int", paramType = "path"),})
-    @GetMapping(value = "/{category_id}/param")
-    public List<ParameterGroupVO> getCatParam(@PathVariable("category_id") Long categoryId) {
-
-        return parameterGroupManager.getParamsByCategory(categoryId);
-    }
-
-    @ApiOperation(value = "修改商品,获取所选分类关联的品牌信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "category_id", value = "分类id", required = true, dataType = "int", paramType = "path"),
-    })
-    @GetMapping(value = "/{categoryId}/select-brands")
-    public List<BrandDO> queryBrands(@PathVariable("categoryId") Long categoryId) {
-
-        List<BrandDO> list = this.brandManager.getBrandsByCategory(categoryId);
-
-        return list;
-    }
-
-    @ApiOperation(value = "编辑商品,获取所选分类关联的参数信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "category_id", value = "分类id", required = true, dataType = "String", paramType = "path"),
-            @ApiImplicitParam(name = "goods_id", value = "商品id", required = true, dataType = "String", paramType = "path"),
-    })
-    @GetMapping(value = "/{category_id}/{goods_id}/params")
-    public List<GoodsParamsGroupVO> queryParams(@PathVariable("category_id") Long categoryId, @PathVariable("goods_id") Long goodsId) {
-
-        List<GoodsParamsGroupVO> list = this.goodsParamsManager.queryGoodsParams(categoryId, goodsId);
-
-        return list;
-    }
-
-    @ApiOperation(value = "发布商品,获取所选分类关联的参数信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "category_id", value = "分类id", required = true, dataType = "int", paramType = "path")
-    })
-    @GetMapping(value = "/{category_id}/params")
-    public List<GoodsParamsGroupVO> queryParams(@PathVariable("category_id") Long categoryId) {
-
-        List<GoodsParamsGroupVO> list = this.goodsParamsManager.queryGoodsParams(categoryId);
-
-        return list;
-    }
-
-    @ApiOperation(value = "商家分类")
-    @GetMapping(value = "/seller/children")
-    public List<CategoryVO> listSeller() {
-        List<CategoryVO> list = this.categoryManager.listAllSellerChildren();
-        return list;
-    }
-}

+ 0 - 64
module-erp/src/main/java/com/hys/app/controller/erp/goods/GoodsLabelController.java

@@ -1,64 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.GoodsLabelDTO;
-import com.hys.app.model.erp.dto.GoodsLabelQueryParams;
-import com.hys.app.model.erp.vo.GoodsLabelVO;
-import com.hys.app.service.erp.GoodsLabelManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 商品标签 API
- *
- * @author 张崧
- * 2024-03-20 16:23:19
- */
-@RestController
-@RequestMapping("/admin/erp/goodsLabel")
-@Api(tags = "商品标签API")
-@Validated
-public class GoodsLabelController {
-
-    @Autowired
-    private GoodsLabelManager goodsLabelManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<GoodsLabelVO> list(GoodsLabelQueryParams queryParams) {
-        return goodsLabelManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    public void add(@RequestBody @Valid GoodsLabelDTO goodsLabelDTO) {
-        goodsLabelManager.add(goodsLabelDTO);
-    }
-
-    @ApiOperation(value = "修改")
-    @PutMapping("/{id}")
-    public void edit(@PathVariable String id, @RequestBody @Valid GoodsLabelDTO goodsLabelDTO) {
-        goodsLabelDTO.setId(id);
-        goodsLabelManager.edit(goodsLabelDTO);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public GoodsLabelVO getDetail(@PathVariable Long id) {
-        return goodsLabelManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    public void delete(@PathVariable List<Long> ids) {
-        goodsLabelManager.delete(ids);
-    }
-
-}
-

+ 0 - 44
module-erp/src/main/java/com/hys/app/controller/erp/goods/GoodsLabelRelationController.java

@@ -1,44 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.GoodsLabelRelationDTO;
-import com.hys.app.model.erp.dto.GoodsLabelRelationQueryParams;
-import com.hys.app.model.erp.vo.GoodsLabelRelationVO;
-import com.hys.app.service.erp.GoodsLabelRelationManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * 商品标签-商品关联表 API
- *
- * @author 张崧
- * 2024-03-20 16:29:17
- */
-@RestController
-@RequestMapping("/admin/erp/goodsLabelRelation")
-@Api(tags = "商品标签-商品关联表API")
-@Validated
-public class GoodsLabelRelationController {
-
-    @Autowired
-    private GoodsLabelRelationManager goodsLabelRelationManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<GoodsLabelRelationVO> list(GoodsLabelRelationQueryParams queryParams) {
-        return goodsLabelRelationManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "关联商品")
-    @PostMapping("/relationGoods")
-    public void relationGoods(@RequestBody @Valid GoodsLabelRelationDTO goodsLabelRelationDTO) {
-        goodsLabelRelationManager.relationGoods(goodsLabelRelationDTO);
-    }
-
-}
-

+ 0 - 91
module-erp/src/main/java/com/hys/app/controller/erp/goods/ParameterGroupManagerController.java

@@ -1,91 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.model.goods.dos.ParameterGroupDO;
-import com.hys.app.model.support.validator.annotation.SortType;
-import com.hys.app.service.goods.ParameterGroupManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-
-/**
- * 参数组控制器
- *
- * @author fk
- * @version v2.0
- * @since v7.0.0 2018-03-20 16:14:17
- */
-@RestController
-@RequestMapping("/admin/goods/parameter-groups")
-@Api(description = "参数组相关API")
-@Validated
-public class ParameterGroupManagerController {
-
-	@Autowired
-	private ParameterGroupManager parameterGroupManager;
-
-	@ApiOperation(value = "添加参数组", response = ParameterGroupDO.class)
-	@PostMapping
-	public ParameterGroupDO add(@Valid ParameterGroupDO parameterGroup) {
-
-		this.parameterGroupManager.add(parameterGroup);
-
-		return parameterGroup;
-	}
-
-	@PutMapping(value = "/{id}")
-	@ApiOperation(value = "修改参数组", response = ParameterGroupDO.class)
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "int", paramType = "path"),
-			@ApiImplicitParam(name = "group_name", value = "参数组名称", required = true, dataType = "string", paramType = "query")
-	})
-	public ParameterGroupDO edit(@NotEmpty(message = "参数组名称不能为空") String groupName, @PathVariable Long id) {
-
-		ParameterGroupDO parameterGroup = this.parameterGroupManager.edit(groupName, id);
-
-		return parameterGroup;
-	}
-
-	@DeleteMapping(value = "/{id}")
-	@ApiOperation(value = "删除参数组")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "要删除的参数组主键", required = true, dataType = "int", paramType = "path") })
-	public String delete(@PathVariable Long id) {
-
-		this.parameterGroupManager.delete(id);
-
-		return "";
-	}
-
-	@GetMapping(value = "/{id}")
-	@ApiOperation(value = "查询一个参数组")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "要查询的参数组主键", required = true, dataType = "int", paramType = "path") })
-	public ParameterGroupDO get(@PathVariable Long id) {
-
-		ParameterGroupDO parameterGroup = this.parameterGroupManager.getModel(id);
-
-		return parameterGroup;
-	}
-
-	@ApiOperation(value = "参数组上移或者下移", notes = "分类绑定参数时,上移下移参数组时使用")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "group_id", value = "参数组id", required = true, paramType = "path", dataType = "int"),
-			@ApiImplicitParam(name = "sort_type", value = "排序类型,上移 up,下移down", required = true, paramType = "query", dataType = "String"), })
-	@PutMapping(value = "/{group_id}/sort")
-	public String groupSort(@PathVariable("group_id") Long groupId,
-			@ApiIgnore @SortType String sortType) {
-
-		this.parameterGroupManager.groupSort(groupId, sortType);
-
-		return null;
-	}
-
-}

+ 0 - 87
module-erp/src/main/java/com/hys/app/controller/erp/goods/ParametersManagerController.java

@@ -1,87 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.model.goods.dos.ParametersDO;
-import com.hys.app.model.support.validator.annotation.SortType;
-import com.hys.app.service.goods.ParametersManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-
-/**
- * 参数控制器
- *
- * @author fk
- * @version v2.0
- * @since v7.0.0 2018-03-20 16:14:31
- */
-@RestController
-@RequestMapping("/admin/goods/parameters")
-@Api(description = "参数相关API")
-@Validated
-public class ParametersManagerController {
-
-	@Autowired
-	private ParametersManager parametersManager;
-
-	@ApiOperation(value = "添加参数", response = ParametersDO.class)
-	@PostMapping
-	public ParametersDO add(@Valid ParametersDO parameters) {
-
-		this.parametersManager.add(parameters);
-
-		return parameters;
-	}
-
-	@PutMapping(value = "/{id}")
-	@ApiOperation(value = "修改参数", response = ParametersDO.class)
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "int", paramType = "path") })
-	public ParametersDO edit(@Valid ParametersDO parameters, @PathVariable Long id) {
-
-		this.parametersManager.edit(parameters, id);
-
-		return parameters;
-	}
-
-	@DeleteMapping(value = "/{id}")
-	@ApiOperation(value = "删除参数")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "要删除的参数主键", required = true, dataType = "int", paramType = "path") })
-	public String delete(@PathVariable Long id) {
-
-		this.parametersManager.delete(id);
-
-		return "";
-	}
-
-	@GetMapping(value = "/{id}")
-	@ApiOperation(value = "查询一个参数")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "要查询的参数主键", required = true, dataType = "int", paramType = "path") })
-	public ParametersDO get(@PathVariable Long id) {
-
-		ParametersDO parameters = this.parametersManager.getModel(id);
-
-		return parameters;
-	}
-
-	@ApiOperation(value = "参数上移或者下移", notes = "分类绑定参数时,上移下移参数组时使用")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "sort_type", value = "排序类型,上移 up,下移down", required = true, paramType = "query", dataType = "String"),
-			@ApiImplicitParam(name = "param_id", value = "参数主键", required = true, paramType = "path", dataType = "String"), })
-	@PutMapping(value = "/{param_id}/sort")
-	public String paramSort(@PathVariable("param_id") Long paramId, @ApiIgnore @SortType String sortType) {
-
-		this.parametersManager.paramSort(paramId, sortType);
-
-		return null;
-	}
-
-}

+ 0 - 78
module-erp/src/main/java/com/hys/app/controller/erp/goods/ShipTemplateManagerController.java

@@ -1,78 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.model.system.dos.ShipTemplateDO;
-import com.hys.app.model.system.vo.ShipTemplateSellerVO;
-import com.hys.app.model.system.vo.ShipTemplateVO;
-import com.hys.app.service.system.ShipTemplateManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 运费模板相关API
- * @author duanmingyu
- * @since 7.2.2_rc
- * @version 1.0
- * 2021-08-03
- */
-@Api(description = "运费模板API")
-@RestController
-@RequestMapping("/admin/trade/ship-templates")
-@Validated
-public class ShipTemplateManagerController {
-
-    @Autowired
-    private ShipTemplateManager shipTemplateManager;
-
-
-    @ApiOperation(value = "查询运费模版列表数据集合", response = ShipTemplateVO.class)
-    @GetMapping
-    public List<ShipTemplateSellerVO> list() {
-        return this.shipTemplateManager.getStoreTemplate();
-    }
-
-    @ApiOperation(value = "添加运费模版", response = ShipTemplateDO.class)
-    @PostMapping
-    public ShipTemplateDO add(@Valid @RequestBody ShipTemplateSellerVO shipTemplate) {
-
-        return this.shipTemplateManager.save(shipTemplate);
-    }
-
-    @PutMapping(value = "/{template_id}")
-    @ApiOperation(value = "修改运费模版", response = ShipTemplateDO.class)
-    @ApiImplicitParam(name = "template_id", value = "模版id", required = true, dataType = "int", paramType = "path")
-    public ShipTemplateDO edit(@Valid @RequestBody ShipTemplateSellerVO shipTemplate, @ApiIgnore @PathVariable("template_id") Long templateId) {
-        shipTemplate.setId(templateId);
-        return this.shipTemplateManager.edit(shipTemplate);
-    }
-
-
-    @DeleteMapping(value = "/{template_id}")
-    @ApiOperation(value = "删除运费模版")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "template_id", value = "要删除的运费模版主键", required = true, dataType = "int", paramType = "path")
-    })
-    public void delete(@ApiIgnore @PathVariable("template_id") Long templateId) {
-        this.shipTemplateManager.delete(templateId);
-    }
-
-    @GetMapping(value = "/{template_id}")
-    @ApiOperation(value = "查询一个运费模版")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "template_id", value = "要查询的运费模版主键", required = true, dataType = "int", paramType = "path")
-    })
-    public ShipTemplateSellerVO get(@ApiIgnore @PathVariable("template_id") Long templateId) {
-
-        ShipTemplateSellerVO shipTemplate = this.shipTemplateManager.getFromDB(templateId);
-
-        return shipTemplate;
-    }
-}

+ 0 - 52
module-erp/src/main/java/com/hys/app/controller/erp/goods/SpecValuesManagerController.java

@@ -1,52 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.model.goods.dos.SpecValuesDO;
-import com.hys.app.model.goods.enums.Permission;
-import com.hys.app.service.goods.SpecValuesManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * 规格值控制器
- *
- * @author fk
- * @version v2.0
- * @since v7.0.0 2018-03-20 10:23:53
- */
-@RestController
-@RequestMapping("/admin/goods/specs/values/{spec_id}")
-@Api(description = "规格值相关API")
-@Validated
-public class SpecValuesManagerController {
-
-    @Autowired
-    private SpecValuesManager specValuesManager;
-
-    @ApiOperation(value = "查询规格值列表", response = SpecValuesDO.class)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "spec_id", value = "规格id", required = true, dataType = "int", paramType = "path"),})
-    @GetMapping
-    public List<SpecValuesDO> list(@PathVariable("spec_id") Long specId) {
-        return this.specValuesManager.listBySpecId(specId, Permission.ADMIN);
-    }
-
-    @ApiOperation(value = "添加某规格的规格值")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "spec_id", value = "规格id", required = true, dataType = "int", paramType = "path"),
-            @ApiImplicitParam(name = "value_list", value = "规格值集合", required = false, dataType = "string", paramType = "query", allowMultiple = true),})
-    @PostMapping
-    public List<SpecValuesDO> saveSpecValue(@PathVariable("spec_id") Long specId, @NotNull(message = "至少添加一个规格值") @ApiIgnore @RequestParam(value = "value_list", required = false) String[] valueList) {
-
-        return this.specValuesManager.saveSpecValue(specId, valueList);
-    }
-
-}

+ 0 - 149
module-erp/src/main/java/com/hys/app/controller/erp/goods/SpecificationManagerController.java

@@ -1,149 +0,0 @@
-package com.hys.app.controller.erp.goods;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.exception.ServiceException;
-import com.hys.app.model.errorcode.GoodsErrorCode;
-import com.hys.app.model.goods.dos.SpecValuesDO;
-import com.hys.app.model.goods.dos.SpecificationDO;
-import com.hys.app.model.goods.vo.SpecificationVO;
-import com.hys.app.service.goods.SpecValuesManager;
-import com.hys.app.service.goods.SpecificationManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.hibernate.validator.constraints.Length;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-/**
- * 规格项控制器
- *
- * @author fk
- * @version v2.0
- * @since v7.0.0 2018-03-20 09:31:27
- */
-@RestController
-@RequestMapping("/admin/goods/specs")
-@Api(description = "规格项相关API")
-public class SpecificationManagerController {
-
-	@Autowired
-	private SpecificationManager specificationManager;
-
-	@Autowired
-	private SpecValuesManager specValuesManager;
-
-	@ApiOperation(value = "查询规格项列表", response = SpecificationDO.class)
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "page_no", value = "页码", required = true, dataType = "int", paramType = "query"),
-			@ApiImplicitParam(name = "page_size", value = "每页显示数量", required = true, dataType = "int", paramType = "query"),
-			@ApiImplicitParam(name = "keyword", value = "规格名称", dataType = "string", paramType = "query")
-			})
-	@GetMapping
-	public WebPage list(@ApiIgnore @NotEmpty(message = "页码不能为空") Long pageNo,
-                        @ApiIgnore @NotEmpty(message = "每页数量不能为空") Long pageSize, String keyword) {
-
-		return this.specificationManager.list(pageNo, pageSize, keyword);
-	}
-
-	@ApiOperation(value = "添加规格项", response = SpecificationDO.class)
-	@PostMapping
-	public SpecificationDO add(@Valid SpecificationDO specification) {
-		// 平台的规格
-		specification.setSellerId(0L);
-		this.specificationManager.add(specification);
-
-		return specification;
-	}
-
-	@PutMapping(value = "/{id}")
-	@ApiOperation(value = "修改规格项", response = SpecificationDO.class)
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "int", paramType = "path") })
-	public SpecificationDO edit(@Valid SpecificationDO specification, @PathVariable Long id) {
-
-		this.specificationManager.edit(specification, id);
-
-		return specification;
-	}
-
-	@DeleteMapping(value = "/{ids}")
-	@ApiOperation(value = "删除规格项")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "ids", value = "要删除的规格项主键", required = true, dataType = "int", paramType = "path",allowMultiple=true) })
-	public String delete(@PathVariable Long[] ids) {
-
-		this.specificationManager.delete(ids);
-
-		return "";
-	}
-
-	@GetMapping(value = "/{id}")
-	@ApiOperation(value = "查询一个规格项")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "id", value = "要查询的规格项主键", required = true, dataType = "int", paramType = "path") })
-	public SpecificationDO get(@PathVariable Long id) {
-
-		SpecificationDO specification = this.specificationManager.getModel(id);
-
-		return specification;
-	}
-
-	@ApiOperation(value = "根据分类id查询规格信息(包括规格值)", notes = "根据分类id查询规格")
-	@ApiImplicitParam(name = "category_id", value = "分类id", required = true, paramType = "path", dataType = "int")
-	@GetMapping("/categories/{category_id}")
-	public List<SpecificationVO> queryAdminSpec(@PathVariable("category_id") Long categoryId) {
-
-		return this.specificationManager.queryAdminSpec(categoryId);
-	}
-
-	@ApiOperation(value = "平台自定义某分类的规格项", response = SpecificationDO.class)
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "category_id", value = "分类id", required = true, paramType = "path", dataType = "int"),
-			@ApiImplicitParam(name = "spec_name", value = "规格项名称", required = true, paramType = "query", dataType = "string")})
-	@PostMapping("/categories/{category_id}")
-	public SpecificationDO addAdminSpec(@PathVariable("category_id") Long categoryId,
-							   @ApiIgnore @NotEmpty(message = "规格名称不能为空") @Length(max = 50, message = "规格名称不能超过50个字符") String specName) {
-		// 商家的规格
-		SpecificationDO specification = this.specificationManager.addSellerSpec(categoryId, specName);
-
-		return specification;
-	}
-
-	@ApiOperation(value = "查询平台自定义的所有规格项", notes = "根据分类id查询规格")
-	@GetMapping("/getAllCategories")
-	public List<SpecificationVO> getAllCategories() {
-		return specificationManager.getAllCategories();
-	}
-
-
-
-	@ApiOperation(value = "平台自定义某规格的规格值")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "spec_id", value = "规格id", required = true, paramType = "path", dataType = "int"),
-			@ApiImplicitParam(name = "value_name", value = "规格值", required = true, paramType = "query", dataType = "string")})
-	@PostMapping("/categories/values/{spec_id}")
-	public SpecValuesDO addValue(@PathVariable("spec_id") Long specId,
-								 @ApiIgnore @NotEmpty(message = "规格值名称不能为空") @Length(max = 50,message = "规格值名称不能超过50个字符") String valueName) {
-		SpecificationDO spec = specificationManager.getModel(specId);
-		if (spec == null) {
-			throw new ServiceException(GoodsErrorCode.E306.code(), "无权操作");
-		}
-		if (specificationManager.flagSellerSpec(0L, specId, valueName)) {
-			throw new ServiceException(GoodsErrorCode.E306.code(), "该规格值已存在 !");
-		}
-		SpecValuesDO value = new SpecValuesDO(specId, valueName, 0L);
-
-		value.setSpecName(spec.getSpecName());
-
-		this.specValuesManager.add(value);
-
-		return value;
-	}
-}

+ 0 - 104
module-erp/src/main/java/com/hys/app/controller/erp/purchase/ProcurementContractManagerController.java

@@ -1,104 +0,0 @@
-package com.hys.app.controller.erp.purchase;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.ProcurementContract;
-import com.hys.app.model.erp.dto.ProcurementContractDTO;
-import com.hys.app.model.erp.dto.ProcurementContractQueryParam;
-import com.hys.app.model.erp.vo.ProcurementContractVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.ProcurementContractManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 采购合同相关API
- * @author dmy
- * 2023-12-05
- */
-@Api(description = "采购合同相关API")
-@RestController
-@RequestMapping("/admin/procurement/contract")
-@Validated
-public class ProcurementContractManagerController {
-
-    @Autowired
-    private ProcurementContractManager procurementContractManager;
-
-    @ApiOperation(value = "查询采购合同分页列表数据")
-    @GetMapping
-    public WebPage list(ProcurementContractQueryParam params) {
-        return procurementContractManager.list(params);
-    }
-
-    @ApiOperation(value = "新增采购合同")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "新增一个合同信息")
-    public void add(@RequestBody @Valid ProcurementContractDTO procurementContractDTO) {
-        this.procurementContractManager.add(procurementContractDTO);
-    }
-
-    @ApiOperation(value = "修改采购合同")
-    @PostMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "修改id为[${id}]的合同信息")
-    public void edit(@PathVariable String id, @RequestBody @Valid ProcurementContractDTO procurementContractDTO) {
-        this.procurementContractManager.edit(id, procurementContractDTO);
-    }
-
-    @ApiOperation(value = "批量删除合同")
-    @DeleteMapping("/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要删除的合同ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "删除ID为[${ids}]的合同信息")
-    public void delete(@PathVariable List<String> ids) {
-        this.procurementContractManager.delete(ids);
-    }
-
-    @ApiOperation(value = "查询合同详情信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "合同ID", required = true, dataType = "int", paramType = "path")
-    })
-    @GetMapping("/{id}")
-    public ProcurementContractVO getDetail(@PathVariable String id) {
-        return procurementContractManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "获取所有合同信息集合")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "status", value = "合同状态 NEW:未执行,EXECUTING:执行中,CLOSED:已关闭", dataType = "String", paramType = "query", allowableValues = "NEW,EXECUTING,CLOSED")
-    })
-    @GetMapping("/list-all")
-    public List<ProcurementContract> listAll(@ApiIgnore String status) {
-        return procurementContractManager.listAll(status);
-    }
-
-    @ApiOperation(value = "批量执行合同")
-    @PostMapping("/execute/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要执行的合同ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "执行ID为[${ids}]的合同信息")
-    public void execute(@PathVariable List<Long> ids) {
-        this.procurementContractManager.execute(ids);
-    }
-
-    @ApiOperation(value = "批量关闭合同")
-    @PostMapping("/close/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要关闭的合同ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "关闭ID为[${ids}]的合同信息")
-    public void close(@PathVariable List<Long> ids) {
-        this.procurementContractManager.close(ids);
-    }
-}

+ 0 - 94
module-erp/src/main/java/com/hys/app/controller/erp/purchase/ProcurementPlanManagerController.java

@@ -1,94 +0,0 @@
-package com.hys.app.controller.erp.purchase;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.ProcurementPlan;
-import com.hys.app.model.erp.dos.ProcurementPlanProduct;
-import com.hys.app.model.erp.dto.ProcurementPlanDTO;
-import com.hys.app.model.erp.dto.ProcurementPlanQueryParam;
-import com.hys.app.model.erp.vo.ProcurementPlanVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.ProcurementPlanManager;
-import com.hys.app.service.erp.ProcurementPlanProductManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 采购计划相关API
- * @author dmy
- * 2023-12-05
- */
-@Api(description = "采购计划相关API")
-@RestController
-@RequestMapping("/admin/procurement/plan")
-@Validated
-public class ProcurementPlanManagerController {
-
-    @Autowired
-    private ProcurementPlanManager procurementPlanManager;
-
-    @Autowired
-    private ProcurementPlanProductManager procurementPlanProductManager;
-
-    @ApiOperation(value = "查询采购计划分页列表数据")
-    @GetMapping
-    public WebPage list(ProcurementPlanQueryParam params) {
-        return procurementPlanManager.list(params);
-    }
-
-    @ApiOperation(value = "新增采购计划")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "新增采购计划")
-    public void add(@RequestBody @Valid ProcurementPlanDTO procurementPlanDTO) {
-        this.procurementPlanManager.add(procurementPlanDTO);
-    }
-
-    @ApiOperation(value = "修改采购计划")
-    @PostMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "修改id为[${id}]的采购计划")
-    public void edit(@PathVariable Long id, @RequestBody @Valid ProcurementPlanDTO procurementPlanDTO) {
-        this.procurementPlanManager.edit(id, procurementPlanDTO);
-    }
-
-    @ApiOperation(value = "批量删除采购计划")
-    @DeleteMapping("/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要删除的采购计划ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "删除ID为[${ids}]的采购计划")
-    public void delete(@PathVariable List<Long> ids) {
-        this.procurementPlanManager.delete(ids);
-    }
-
-    @ApiOperation(value = "查询采购计划详情信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "采购计划ID", required = true, dataType = "int", paramType = "path")
-    })
-    @GetMapping("/{id}")
-    public ProcurementPlanVO getDetail(@PathVariable Long id) {
-        return procurementPlanManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "获取所有采购计划信息集合")
-    @GetMapping("/list-all")
-    public List<ProcurementPlan> listAll() {
-        return procurementPlanManager.listAll();
-    }
-
-    @ApiOperation(value = "根据采购计划ID查询采购计划商品信息集合")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "采购计划ID", required = true, dataType = "int", paramType = "path")
-    })
-    @GetMapping("/product/{id}")
-    public List<ProcurementPlanProduct> listProductById(@PathVariable Long id) {
-        return procurementPlanProductManager.list(id);
-    }
-}

+ 0 - 82
module-erp/src/main/java/com/hys/app/controller/erp/purchase/SupplierManagerController.java

@@ -1,82 +0,0 @@
-package com.hys.app.controller.erp.purchase;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.SupplierDTO;
-import com.hys.app.model.erp.dto.SupplierQueryParams;
-import com.hys.app.model.erp.vo.SupplierVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.SupplierManager;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 供应商相关API
- *
- * @author 张崧
- * 2023-11-29 14:20:18
- */
-@RestController
-@RequestMapping("/admin/erp/supplier")
-@Api(tags = "供应商相关API")
-@Validated
-public class SupplierManagerController {
-
-    @Autowired
-    private SupplierManager supplierManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<SupplierVO> list(SupplierQueryParams queryParams) {
-        return supplierManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "所有正常状态的供应商")
-    @GetMapping("/list-all")
-    public List<SupplierVO> normalStatusList() {
-        return supplierManager.normalStatusList();
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "添加名称为[${supplierDTO.customName}]的供应商")
-    public void add(@RequestBody @Valid SupplierDTO supplierDTO) {
-        supplierManager.add(supplierDTO);
-    }
-
-    @ApiOperation(value = "修改")
-    @PutMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "修改ID为[${id}]的供应商信息")
-    public void edit(@PathVariable Long id, @RequestBody @Valid SupplierDTO supplierDTO) {
-        supplierDTO.setId(id);
-        supplierManager.edit(supplierDTO);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public SupplierVO getDetail(@PathVariable Long id) {
-        return supplierManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "删除ID为[${id}]的供应商信息")
-    public void delete(@PathVariable Long id) {
-        supplierManager.delete(id);
-    }
-
-    @ApiOperation(value = "禁用/恢复")
-    @PutMapping("/{id}/update-disable")
-    @Log(client = LogClient.admin, detail = "${disable ? '恢复' : '禁用'}ID为[${id}]的供应商信息")
-    public void updateDisable(@PathVariable Long id, @RequestParam("disable") Boolean disable) {
-        supplierManager.updateDisable(id, disable);
-    }
-
-}
-

+ 0 - 35
module-erp/src/main/java/com/hys/app/controller/erp/purchase/SupplierReturnItemManagerController.java

@@ -1,35 +0,0 @@
-package com.hys.app.controller.erp.purchase;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.SupplierReturnItemQueryParams;
-import com.hys.app.model.erp.vo.SupplierReturnItemVO;
-import com.hys.app.service.erp.SupplierReturnItemManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 供应商退货项API
- *
- * @author 张崧
- * @since 2023-12-14 11:12:46
- */
-@RestController
-@RequestMapping("/admin/erp/supplierReturnItem")
-@Api(tags = "供应商退货项API")
-@Validated
-public class SupplierReturnItemManagerController {
-
-    @Autowired
-    private SupplierReturnItemManager supplierReturnItemManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<SupplierReturnItemVO> list(SupplierReturnItemQueryParams queryParams) {
-        return supplierReturnItemManager.list(queryParams);
-    }
-
-}
-

+ 0 - 105
module-erp/src/main/java/com/hys/app/controller/erp/purchase/SupplierReturnManagerController.java

@@ -1,105 +0,0 @@
-package com.hys.app.controller.erp.purchase;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.SupplierReturnQueryParams;
-import com.hys.app.model.erp.dto.SupplierReturnStatisticsParam;
-import com.hys.app.model.erp.enums.SupplierReturnStatusEnum;
-import com.hys.app.model.erp.vo.SupplierReturnVO;
-import com.hys.app.model.erp.dto.SupplierReturnDTO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.SupplierReturnManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-/**
- * 供应商退货API
- *
- * @author 张崧
- * @since 2023-12-14 11:12:46
- */
-@RestController
-@RequestMapping("/admin/erp/supplierReturn")
-@Api(tags = "供应商退货API")
-@Validated
-public class SupplierReturnManagerController {
-
-    @Autowired
-    private SupplierReturnManager supplierReturnManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<SupplierReturnVO> list(SupplierReturnQueryParams queryParams) {
-        return supplierReturnManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "创建供应商退货单")
-    public void add(@RequestBody @Valid SupplierReturnDTO supplierReturnDTO) {
-        supplierReturnManager.add(supplierReturnDTO);
-    }
-
-    @ApiOperation(value = "修改")
-    @PutMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "修改ID为[${id}]的供应商退货单")
-    public void edit(@PathVariable Long id, @RequestBody @Valid SupplierReturnDTO supplierReturnDTO) {
-        supplierReturnDTO.setId(id);
-        supplierReturnManager.edit(supplierReturnDTO);
-    }
-
-    @ApiOperation(value = "提交")
-    @PostMapping("/{id}/submit")
-    @Log(client = LogClient.admin, detail = "提交ID为[${id}]的供应商退货单")
-    public void submit(@PathVariable Long id) {
-        supplierReturnManager.submit(id);
-    }
-
-    @ApiOperation(value = "撤销提交")
-    @PostMapping("/{id}/withdraw")
-    @Log(client = LogClient.admin, detail = "撤销提交ID为[${id}]的供应商退货单")
-    public void withdraw(@PathVariable Long id) {
-        supplierReturnManager.withdraw(id);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public SupplierReturnVO getDetail(@PathVariable Long id) {
-        return supplierReturnManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{ids}")
-    @Log(client = LogClient.admin, detail = "删除ID为[${ids}]的供应商退货单")
-    public void delete(@PathVariable List<Long> ids) {
-        supplierReturnManager.delete(ids);
-    }
-
-    @ApiOperation(value = "审核")
-    @PostMapping("/{ids}/audit")
-    @Log(client = LogClient.admin, detail = "审核ID为[${ids}]的供应商退货单")
-    public void audit(@PathVariable List<Long> ids, @NotNull SupplierReturnStatusEnum status, String remark) {
-        supplierReturnManager.audit(ids, status, remark);
-    }
-
-    @ApiOperation(value = "查询供应商退货统计分页列表数据")
-    @GetMapping("/statistics")
-    public WebPage statistics(SupplierReturnStatisticsParam params) {
-        return supplierReturnManager.statistics(params);
-    }
-
-    @ApiOperation(value = "导出供应商退货统计列表")
-    @GetMapping("/export")
-    public void export(HttpServletResponse response, SupplierReturnStatisticsParam params) {
-        this.supplierReturnManager.export(response, params);
-    }
-}
-

+ 0 - 66
module-erp/src/main/java/com/hys/app/controller/erp/purchase/SupplierSettlementManagerController.java

@@ -1,66 +0,0 @@
-package com.hys.app.controller.erp.purchase;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.SupplierSettlementQueryParams;
-import com.hys.app.model.erp.vo.SupplierSettlementVO;
-import com.hys.app.model.erp.dto.SupplierSettlementDTO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.SupplierSettlementManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * 供应商结算单API
- *
- * @author 张崧
- * @since 2023-12-15 14:09:09
- */
-@RestController
-@RequestMapping("/admin/erp/supplierSettlement")
-@Api(tags = "供应商结算单API")
-@Validated
-public class SupplierSettlementManagerController {
-
-    @Autowired
-    private SupplierSettlementManager supplierSettlementManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<SupplierSettlementVO> list(SupplierSettlementQueryParams queryParams) {
-        return supplierSettlementManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "创建供应商结算单")
-    public void add(@RequestBody @Valid SupplierSettlementDTO supplierSettlementDTO) {
-        supplierSettlementManager.add(supplierSettlementDTO);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public SupplierSettlementVO getDetail(@PathVariable Long id) {
-        return supplierSettlementManager.getDetail(id);
-    }
-
-//    @ApiOperation(value = "删除")
-//    @DeleteMapping("/{ids}")
-//    public void delete(@PathVariable List<Long> ids) {
-//        supplierSettlementManager.delete(ids);
-//    }
-
-    @ApiOperation(value = "取消结算单")
-    @DeleteMapping("/{id}/cancel")
-    @Log(client = LogClient.admin, detail = "取消id为[${id}]的供应商结算单")
-    public void cancel(@PathVariable Long id) {
-        supplierSettlementManager.cancel(id);
-    }
-
-}
-

+ 0 - 44
module-erp/src/main/java/com/hys/app/controller/erp/sale/OrderPaymentController.java

@@ -1,44 +0,0 @@
-package com.hys.app.controller.erp.sale;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.OrderPaymentQueryParams;
-import com.hys.app.model.erp.vo.OrderPaymentVO;
-import com.hys.app.service.erp.OrderPaymentManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 订单支付明细 API
- *
- * @author 张崧
- * 2024-01-24 17:00:32
- */
-@RestController
-@RequestMapping("/admin/erp/orderPayment")
-@Api(tags = "订单支付明细API")
-@Validated
-public class OrderPaymentController {
-
-    @Autowired
-    private OrderPaymentManager orderPaymentManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<OrderPaymentVO> list(OrderPaymentQueryParams queryParams) {
-        return orderPaymentManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public OrderPaymentVO getDetail(@PathVariable Long id) {
-        return orderPaymentManager.getDetail(id);
-    }
-
-}
-

+ 0 - 75
module-erp/src/main/java/com/hys/app/controller/erp/sale/SaleChannelController.java

@@ -1,75 +0,0 @@
-package com.hys.app.controller.erp.sale;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.SaleChannelDO;
-import com.hys.app.model.erp.dto.OrderDTO;
-import com.hys.app.model.erp.dto.OrderQueryParams;
-import com.hys.app.model.erp.dto.SaleChannelQueryParams;
-import com.hys.app.model.erp.vo.OrderVO;
-import com.hys.app.model.erp.vo.SaleChannelV0;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.OrderManager;
-import com.hys.app.service.erp.SaleChannelManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * 订单 API
- *
- * @author 张崧
- * 2024-01-24 15:58:31
- */
-@RestController
-@RequestMapping("/admin/sale/channel")
-@Api(tags = "销售渠道相关api")
-@Validated
-public class SaleChannelController {
-
-    @Autowired
-    private SaleChannelManager saleChannelManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<SaleChannelV0> list(SaleChannelQueryParams queryParams) {
-        return saleChannelManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "创建渠道")
-    public void add(@RequestBody @Valid SaleChannelDO request) {
-        saleChannelManager.add(request);
-    }
-
-    @ApiOperation(value = "修改")
-    @PutMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "修改id为[${id}]的订单")
-    public void edit(@PathVariable Long id, @RequestBody @Valid SaleChannelDO request) {
-        request.setId(id);
-        saleChannelManager.edit(request);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public SaleChannelV0 getDetail(@PathVariable Long id) {
-        return saleChannelManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "删除id为[${id}]的订单")
-    public void delete(@PathVariable Long id) {
-        saleChannelManager.delete(id);
-    }
-
-
-}
-

+ 1 - 1
module-erp/src/main/java/com/hys/app/controller/erp/sale/CustomerController.java → module-erp/src/main/java/com/hys/app/controller/erp/use/CustomerController.java

@@ -1,4 +1,4 @@
-package com.hys.app.controller.erp.sale;
+package com.hys.app.controller.erp.use;
 
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.model.erp.dto.CustomerDTO;

+ 0 - 101
module-erp/src/main/java/com/hys/app/controller/erp/use/GoodsManagerController.java

@@ -1,101 +0,0 @@
-package com.hys.app.controller.erp.use;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.context.user.AdminUserContext;
-import com.hys.app.framework.database.BaseQueryParam;
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.mapper.goods.GoodsMapper;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.WarehouseOutDO;
-import com.hys.app.model.erp.dto.GoodsDTO;
-import com.hys.app.model.erp.dto.GoodsQueryParams;
-import com.hys.app.model.erp.dto.GoodsSortDto;
-import com.hys.app.model.erp.dto.GoodsUpdateDTO;
-import com.hys.app.model.erp.vo.GoodsVO;
-import com.hys.app.model.erp.vo.ProductStockVO;
-import com.hys.app.model.erp.vo.ProductVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.GoodsManager;
-import com.hys.app.util.ValidateUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 商品档案API
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-@RestController
-@RequestMapping("/admin/erp/goods")
-@Api(tags = "商品档案API")
-@Validated
-public class GoodsManagerController {
-
-    @Autowired
-    private GoodsManager goodsManager;
-    @Autowired
-    private GoodsMapper goodsMapper;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<GoodsVO> list(GoodsQueryParams queryParams) {
-        return goodsManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "新增名称为[${goodsDTO.name}]的商品")
-    public void add(@RequestBody @Valid GoodsDTO goodsDTO) {
-        AdminUserContext.hasCompany();
-        goodsManager.add(goodsDTO);
-    }
-
-    @ApiOperation(value = "更新上下架")
-    @PostMapping("/update")
-    @Log(client = LogClient.admin, detail = "修改名称为[${goodsDTO.name}]的商品上下架状态")
-    public void status(@RequestBody @Valid GoodsUpdateDTO request) {
-        AdminUserContext.hasCompany();
-        GoodsDO goodsDO = ValidateUtil.getOne(goodsMapper, GoodsDO::getId, request.getId(), "商品");
-        goodsDO.setMarketEnable(!request.getMarketEnable());
-        goodsManager.updateById(goodsDO);
-    }
-
-    @ApiOperation(value = "修改")
-    @PutMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "新增名称为[${goodsDTO.name}]的商品")
-    public void edit(@PathVariable Long id, @RequestBody @Valid GoodsDTO goodsDTO) {
-        AdminUserContext.hasCompany();
-        goodsManager.edit(goodsDTO,id);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public GoodsVO getDetail(@PathVariable Long id) {
-        return goodsManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "删除")
-    @DeleteMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "删除id为[${id}]的商品")
-    public void delete(@PathVariable Long id) {
-        AdminUserContext.hasCompany();
-        goodsManager.delete(id);
-    }
-
-
-    @ApiOperation(value = "新增入库获取所有的sku信息")
-    @GetMapping("/getSkuByWarehouse/{wareHouseId}")
-    @Log(client = LogClient.admin, detail = "新增入库获取所有的sku信息")
-    public Page<ProductStockVO> getSkuByWarehouse(@PathVariable Long wareHouseId, BaseQueryParam queryParam) {
-        return goodsManager.getSkuByWarehouse( wareHouseId, queryParam);
-    }
-}
-

+ 0 - 79
module-erp/src/main/java/com/hys/app/controller/erp/use/GoodsSnController.java

@@ -1,79 +0,0 @@
-package com.hys.app.controller.erp.use;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.ProductDO;
-import com.hys.app.model.erp.dto.GoodsSnDTO;
-import com.hys.app.model.erp.dto.GoodsSnQueryParams;
-import com.hys.app.model.erp.vo.GoodsSnVO;
-import com.hys.app.model.erp.vo.ProductVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.GoodsSnManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * 商品序列号相关api
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-@RestController
-@RequestMapping("/admin/erp/goods/sn")
-@Api(tags = "商品序列号相关api")
-@Validated
-public class GoodsSnController {
-
-    @Autowired
-    private GoodsSnManager goodsSnManager;
-
-    @ApiOperation(value = "获取所有有sn的sku")
-    @GetMapping("/getSnProduct")
-    public Page<ProductVO> getSnProduct(GoodsSnQueryParams queryParams) {
-        return goodsSnManager.getSnProduct(queryParams);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping("/createSnCode")
-    @Log(client = LogClient.admin, detail = "新增序列号")
-    public void createSnCode(@RequestBody @Valid GoodsSnDTO goodsDTO) {
-        goodsSnManager.createSnCode(goodsDTO);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping("/updateSnCode/{id}/{snCode}")
-    @Log(client = LogClient.admin, detail = "新增序列号")
-    public void updateSnCode(@PathVariable Long id, @PathVariable String snCode) {
-        goodsSnManager.updateSnCode(id,snCode);
-    }
-
-
-    @ApiOperation(value = "获取详情")
-    @GetMapping("/getDetail/{id}")
-    public GoodsSnVO getDetail(@PathVariable Long id) {
-        return goodsSnManager.getDetail(id);
-    }
-
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<GoodsSnVO> list(GoodsSnQueryParams queryParams) {
-        return goodsSnManager.list(queryParams);
-    }
-
-
-    @ApiOperation(value = "删除序列号")
-    @PostMapping("/removeById/{snId}")
-    @Log(client = LogClient.admin, detail = "删除序列号")
-    public void removeById(@PathVariable Long snId) {
-        goodsSnManager.removeById(snId);
-    }
-}
-

+ 0 - 36
module-erp/src/main/java/com/hys/app/controller/erp/use/OrderReturnItemManagerController.java

@@ -1,36 +0,0 @@
-package com.hys.app.controller.erp.use;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.OrderReturnItemQueryParams;
-import com.hys.app.model.erp.vo.OrderReturnItemVO;
-import com.hys.app.service.erp.OrderReturnItemManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 订单退货项API
- *
- * @author 张崧
- * @since 2023-12-14 15:42:07
- */
-@RestController
-@RequestMapping("/admin/erp/orderReturnItem")
-@Api(tags = "订单退货项API")
-@Validated
-public class OrderReturnItemManagerController {
-
-    @Autowired
-    private OrderReturnItemManager orderReturnItemManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<OrderReturnItemVO> list(OrderReturnItemQueryParams queryParams) {
-        return orderReturnItemManager.list(queryParams);
-    }
-}
-

+ 0 - 73
module-erp/src/main/java/com/hys/app/controller/erp/use/OrderReturnManagerController.java

@@ -1,73 +0,0 @@
-package com.hys.app.controller.erp.use;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.OrderReturnDTO;
-import com.hys.app.model.erp.dto.OrderReturnQueryParams;
-import com.hys.app.model.erp.dto.OrderReturnStatisticsQueryParam;
-import com.hys.app.model.erp.vo.OrderReturnVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.OrderReturnManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-/**
- * 订单退货API
- *
- * @author 张崧
- * @since 2023-12-14 15:42:07
- */
-@RestController
-@RequestMapping("/admin/erp/orderReturn")
-@Api(tags = "订单退货API")
-@Validated
-public class OrderReturnManagerController {
-
-    @Autowired
-    private OrderReturnManager orderReturnManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<OrderReturnVO> list(OrderReturnQueryParams queryParams) {
-        return orderReturnManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "创建订单退货单")
-    public void add(@RequestBody @Valid OrderReturnDTO orderReturnDTO) {
-        orderReturnManager.add(orderReturnDTO);
-    }
-
-    @ApiOperation(value = "关闭订单/完成订单")
-    @PostMapping("/cancel/{edit}/{id}")
-    @Log(client = LogClient.admin, detail = "关闭ID为[${id}]的订单退货单")
-    public void withdraw(@PathVariable String edit,@PathVariable Long id) {
-        orderReturnManager.cancel(edit,id);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public OrderReturnVO getDetail(@PathVariable Long id) {
-        return orderReturnManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "查询订单退货统计分页列表数据")
-    @GetMapping("/statistics")
-    public WebPage statistics(OrderReturnStatisticsQueryParam params) {
-        return orderReturnManager.statistics(params);
-    }
-
-    @ApiOperation(value = "导出订单退货统计列表数据")
-    @GetMapping("/export")
-    public void export(HttpServletResponse response, OrderReturnStatisticsQueryParam params) {
-        this.orderReturnManager.export(response, params);
-    }
-}
-

+ 1 - 11
module-erp/src/main/java/com/hys/app/controller/erp/use/PayController.java

@@ -67,14 +67,12 @@ import java.util.stream.Collectors;
 @Validated
 @AllArgsConstructor
 public class PayController extends HttpServlet {
-    private OrderManager orderManager;
+//    private OrderManager orderManager;
     private AliPayService aliPayService;
     private WxPayServiceMy wxPayServiceMy;
-    private OrderCustomerFeeManager orderCustomerFeeManager;
     private CompanyErpManager companyManager;
     private AdminUserMapper adminUserMapper;
     private RoleMapper roleMapper;
-    private KuangShiConfig kuangShiConfig;
 
     private static final Logger log = LoggerFactory.getLogger(ScriptUtil.class);
 
@@ -186,14 +184,6 @@ public class PayController extends HttpServlet {
             // 解析支付通知结果
             WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
             // 处理订单逻辑
-            if ("SUCCESS".equals(notifyResult.getResultCode().toUpperCase())) {
-                // 支付成功
-                OrderDO aDo = orderManager.getById(notifyResult.getOutTradeNo());
-                aDo.setHasPayReturn(true);
-                orderManager.updateById(aDo);
-                // 返回成功响应给微信服务器
-                return "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
-            }
         } catch (WxPayException e) {
             // 处理解析异常,记录日志
             e.printStackTrace();

+ 0 - 81
module-erp/src/main/java/com/hys/app/controller/erp/use/PayTypeController.java

@@ -1,81 +0,0 @@
-package com.hys.app.controller.erp.use;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.database.BaseQueryParam;
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.PayTypeDO;
-import com.hys.app.model.erp.dto.GoodsDTO;
-import com.hys.app.model.erp.dto.GoodsQueryParams;
-import com.hys.app.model.erp.dto.GoodsSortDto;
-import com.hys.app.model.erp.dto.GoodsUpdateDTO;
-import com.hys.app.model.erp.vo.GoodsVO;
-import com.hys.app.model.erp.vo.ProductStockVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.GoodsManager;
-import com.hys.app.service.erp.PayTypeManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 商品档案API
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-@RestController
-@RequestMapping("/admin/erp/payType")
-@Api(tags = "支付方式")
-@Validated
-public class PayTypeController {
-
-    @Autowired
-    private PayTypeManager payTypeManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public List<PayTypeDO> list() {
-        return payTypeManager.list();
-    }
-
-    @ApiOperation(value = "添加")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "新增支付方式")
-    public void add(@RequestBody @Valid PayTypeDO payTypeDO) {
-        payTypeManager.save(payTypeDO);
-    }
-
-    @ApiOperation(value = "修改")
-    @PostMapping("/update/{id}")
-    @Log(client = LogClient.admin, detail = "修改id为[${id}]的支付方式")
-    public void update(@RequestBody @Valid PayTypeDO payTypeDO,@PathVariable Long id) {
-        PayTypeDO byId = payTypeManager.getById(id);
-        BeanUtil.copyProperties(payTypeDO,byId);
-        payTypeManager.updateById(byId);
-    }
-
-    @ApiOperation(value = "删除")
-    @PostMapping("/delete/{id}")
-    @Log(client = LogClient.admin, detail = "删除")
-    public void delete(@PathVariable Long id) {
-        PayTypeDO byId = payTypeManager.getById(id);
-        byId.setDeleted(false);
-        payTypeManager.updateById(byId);
-    }
-
-    @ApiOperation(value = "详情")
-    @GetMapping("/{id}")
-    public PayTypeDO getById(@PathVariable Long id) {
-        return payTypeManager.getById(id);
-    }
-
-}
-

+ 3 - 6
module-erp/src/main/java/com/hys/app/controller/erp/use/ProductManagerController.java

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hys.app.framework.context.user.AdminUserContext;
-import com.hys.app.framework.database.BaseQueryParam;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.model.erp.dos.ProductDO;
-import com.hys.app.model.erp.dos.ProductGroupDO;
-import com.hys.app.model.erp.dto.*;
-import com.hys.app.model.erp.vo.ProductStockVO;
+import com.hys.app.model.erp.dto.ProductDTO;
+import com.hys.app.model.erp.dto.ProductGroupQueryParams;
+import com.hys.app.model.erp.dto.ProductQueryParams;
 import com.hys.app.model.erp.vo.ProductVO;
-import com.hys.app.model.erp.vo.TransitVO;
 import com.hys.app.model.support.LogClient;
 import com.hys.app.model.support.validator.annotation.Log;
 import com.hys.app.service.erp.ProductManager;
@@ -23,7 +21,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 产品相关API

+ 0 - 5
module-erp/src/main/java/com/hys/app/controller/erp/use/ProductStockManagerController.java

@@ -1,10 +1,7 @@
 package com.hys.app.controller.erp.use;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hys.app.framework.context.user.AdminUserContext;
 import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.ProductStockDO;
-import com.hys.app.model.erp.dto.GoodsSnDTO;
 import com.hys.app.model.erp.dto.ProductStockDeleteReq;
 import com.hys.app.model.erp.dto.ProductStockQueryParams;
 import com.hys.app.model.erp.vo.*;
@@ -19,9 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 商品库存相关API

+ 0 - 85
module-erp/src/main/java/com/hys/app/controller/erp/use/ScanCodeController.java

@@ -1,85 +0,0 @@
-package com.hys.app.controller.erp.use;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.GoodsSnDO;
-import com.hys.app.model.erp.dto.EnterpriseDTO;
-import com.hys.app.model.erp.dto.EnterpriseQueryParams;
-import com.hys.app.model.erp.vo.*;
-import com.hys.app.service.erp.EnterpriseManager;
-import com.hys.app.service.erp.ScanCodeManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.elasticsearch.common.collect.HppcMaps;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 企业 API
- *
- * @author 张崧
- * 2024-03-25 15:44:10
- */
-@RestController
-@RequestMapping("/admin/erp/scancode")
-@Api(tags = "扫条形码")
-@Validated
-public class ScanCodeController {
-
-    @Autowired
-    private ScanCodeManager scanCodeManager;
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    @ApiOperation(value = "扫描订单")
-    @GetMapping("/{orderCode}")
-    public Map<String, Object> getListByScan(@PathVariable(value = "orderCode") String orderCode) {
-        return scanCodeManager.getListByScan(orderCode);
-    }
-
-    @ApiOperation(value = "扫描sku")
-    @GetMapping("getProduct/{warehouseId}/{productCode}")
-    public ProductStockVO getProduct(@PathVariable(value = "productCode") String productCode, @PathVariable(value = "warehouseId") Long warehouseId) {
-        return scanCodeManager.getProduct( productCode, warehouseId);
-    }
-
-    @ApiOperation(value = "扫描序列号")
-    @GetMapping("getsnCode/{type}/{sku}/{snCode}")
-    public GoodsSnVO getSnCode(@PathVariable(value = "sku") String sku, @PathVariable(value = "snCode") String snCode, @PathVariable(value = "type") String type) {
-        return scanCodeManager.getSnCode( sku, snCode, type);
-    }
-
-    @ApiOperation(value = "序列号缓存")
-    @PostMapping("skuRedis")
-    public Object skuRedis(@RequestBody SkuRedisDO skuRedisDO) {
-        if (skuRedisDO.getType() != null && skuRedisDO.getType().equals("enter")){
-            return redisTemplate.opsForHash().entries(skuRedisDO.getSendOrderId());
-        }
-        Object o = redisTemplate.opsForHash().get(skuRedisDO.getSendOrderId(), skuRedisDO.getItemId());
-        List<GoodsSnDO> val =(List<GoodsSnDO>) o;
-        if (CollUtil.isEmpty(val)){
-            List<Object> list = new ArrayList<>();
-            list.add(skuRedisDO.getSku());
-            redisTemplate.opsForHash().put(skuRedisDO.getSendOrderId(),skuRedisDO.getItemId(),list);
-        }else {
-            val.add(skuRedisDO.getSku());
-            redisTemplate.opsForHash().put(skuRedisDO.getSendOrderId(),skuRedisDO.getItemId(),val);
-        }
-        // 设置Hash键的过期时间
-        redisTemplate.expire(skuRedisDO.getSendOrderId(), 5, TimeUnit.DAYS);
-
-        Map entries = redisTemplate.opsForHash().entries(skuRedisDO.getSendOrderId());
-        return entries;
-    }
-
-}
-

+ 0 - 6
module-erp/src/main/java/com/hys/app/controller/erp/use/StockTransferManagerController.java

@@ -81,12 +81,6 @@ public class StockTransferManagerController {
         stockTransferManager.withdraw(id);
     }
 
-    @ApiOperation(value = "查询库存调拨统计分页列表数据")
-    @GetMapping("/statistics")
-    public WebPage statistics(StockTransferStatisticsParam params) {
-        return stockTransferManager.statistics(params);
-    }
-
     @ApiOperation(value = "导出库存调拨统计列表")
     @GetMapping("/export")
     public void export(HttpServletResponse response, StockTransferStatisticsParam params) {

+ 0 - 2
module-erp/src/main/java/com/hys/app/controller/erp/use/WarehouseEntryProductManagerController.java

@@ -1,10 +1,8 @@
 package com.hys.app.controller.erp.use;
 
 import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.WareQueryGoodParams;
 import com.hys.app.model.erp.dto.WarehouseEntryProductQueryParams;
 import com.hys.app.model.erp.dto.WarehouseInQueryParams;
-import com.hys.app.model.erp.vo.GoodsVO;
 import com.hys.app.model.erp.vo.WarehouseEntryItemV1;
 import com.hys.app.model.erp.vo.WarehouseEntryProductVO;
 import com.hys.app.service.erp.WarehouseEntryProductManager;

+ 0 - 10
module-erp/src/main/java/com/hys/app/controller/erp/use/WarehouseOutManagerController.java

@@ -1,21 +1,16 @@
 package com.hys.app.controller.erp.use;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hys.app.framework.context.user.AdminUserContext;
 import com.hys.app.framework.database.BaseQueryParam;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.model.erp.dos.LockedStockDetailDO;
 import com.hys.app.model.erp.dto.*;
-import com.hys.app.model.erp.enums.WarehouseOutStatusEnum;
-import com.hys.app.model.erp.vo.GoodsVO;
 import com.hys.app.model.erp.vo.ProductStockVO;
-import com.hys.app.model.erp.vo.ProductVO;
 import com.hys.app.model.erp.vo.WarehouseOutVO;
 import com.hys.app.model.support.LogClient;
 import com.hys.app.model.support.validator.annotation.Log;
 import com.hys.app.service.erp.WarehouseOutManager;
-import com.hys.app.service.kuaidiniao.entity.PreOrderModel;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,11 +19,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 出库单相关API

+ 0 - 69
module-erp/src/main/java/com/hys/app/controller/erp/use/task/OrderReturnTask.java

@@ -1,69 +0,0 @@
-package com.hys.app.controller.erp.use.task;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.hys.app.mapper.erp.OrderReturnMapper;
-import com.hys.app.model.erp.dos.OrderDO;
-import com.hys.app.model.erp.dos.OrderReturnDO;
-import com.hys.app.model.erp.dos.OrderReturnItemDO;
-import com.hys.app.model.erp.enums.ReturnOrderStatusEnum;
-import com.hys.app.model.erp.enums.SaleOrderStatusEnum;
-import com.hys.app.service.erp.OrderManager;
-import com.hys.app.service.erp.OrderReturnItemManager;
-import com.hys.app.service.erp.OrderReturnManager;
-import lombok.AllArgsConstructor;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Component
-@AllArgsConstructor
-public class OrderReturnTask {
-
-    private OrderReturnMapper orderReturnMapper;
-    private OrderReturnManager orderReturnManager;
-    private OrderReturnItemManager orderReturnItemManager;
-    private OrderManager orderManager;
-
-    @Scheduled(cron = "0 0 1 * * ?")
-    @Transactional(rollbackFor = Exception.class)
-    public void executeTask() {
-        //找到所有15天未关闭的售后订单
-        List<OrderReturnDO> list = getOrderReturnDOS();
-        if (orderReturnManager.updateBatchById(list)) {
-            //找到所有售后单的订单
-            List<Long> collect = list.stream().map(OrderReturnDO::getOrderId).collect(Collectors.toList());
-            //如果这个订单下面的所有售后订单都做完了,把订单的状态从售后中改成售后完成
-            for (Long id : collect) {
-                List<OrderReturnDO> orderReturnDOS = orderReturnMapper.selectList(new LambdaQueryWrapper<OrderReturnDO>()
-                        .eq(OrderReturnDO::getOrderId, id)
-                        .eq(OrderReturnDO::getStatus, ReturnOrderStatusEnum.SALE_AFTER_ING));
-                if (CollUtil.isEmpty(orderReturnDOS)) {
-                    OrderDO aDo = orderManager.getById(id);
-                    if (SaleOrderStatusEnum.SALE_AFTER_ING.equals(aDo.getStatus())) {
-                        aDo.setStatus(SaleOrderStatusEnum.SALE_AFTER_END);
-                        orderManager.updateById(aDo);
-                    }
-                }
-            }
-        }
-    }
-
-    @NotNull
-    private List<OrderReturnDO> getOrderReturnDOS() {
-        List<OrderReturnDO> list = orderReturnMapper.getAllNotClosedReturn();
-        list.forEach(item -> {
-            //如果这个退货单没有退货明细就更改退货单的状态
-            List<OrderReturnItemDO> itemDOS = orderReturnItemManager.list(new LambdaQueryWrapper<OrderReturnItemDO>()
-                    .eq(OrderReturnItemDO::getOrderReturnId,item.getId()));
-            if (CollUtil.isEmpty(itemDOS)){
-                item.setStatus(ReturnOrderStatusEnum.SALE_AFTER_CANCEL);
-            }
-        });
-        return list;
-    }
-}

+ 0 - 120
module-erp/src/main/java/com/hys/app/controller/erp/warehouse/ChangeFormManagerController.java

@@ -1,120 +0,0 @@
-package com.hys.app.controller.erp.warehouse;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.ChangeFormDTO;
-import com.hys.app.model.erp.dto.ChangeFormQueryParam;
-import com.hys.app.model.erp.dto.ChangeFormStatisticsQueryParam;
-import com.hys.app.model.erp.vo.ChangeFormVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.ChangeFormManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 换货单相关API
- * @author dmy
- * 2023-12-05
- */
-@Api(description = "换货单相关API")
-@RestController
-@RequestMapping("/admin/change/form")
-@Validated
-public class ChangeFormManagerController {
-
-    @Autowired
-    private ChangeFormManager changeFormManager;
-
-    @ApiOperation(value = "查询换货单分页列表数据")
-    @GetMapping
-    public WebPage list(ChangeFormQueryParam params) {
-        return changeFormManager.list(params);
-    }
-
-    @ApiOperation(value = "新增换货单")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "新增换货单")
-    public void add(@RequestBody @Valid ChangeFormDTO changeFormDTO) {
-        this.changeFormManager.add(changeFormDTO);
-    }
-
-    @ApiOperation(value = "修改换货单")
-    @PostMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "修改id为[${id}]的换货单")
-    public void edit(@PathVariable Long id, @RequestBody @Valid ChangeFormDTO changeFormDTO) {
-        this.changeFormManager.edit(id, changeFormDTO);
-    }
-
-    @ApiOperation(value = "批量删除换货单")
-    @DeleteMapping("/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要删除的换货单ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "删除ID为[${ids}]的换货单")
-    public void delete(@PathVariable List<Long> ids) {
-        this.changeFormManager.delete(ids);
-    }
-
-    @ApiOperation(value = "查询换货单详细信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "换货单ID", required = true, dataType = "int", paramType = "path")
-    })
-    @GetMapping("/{id}")
-    public ChangeFormVO getDetail(@PathVariable Long id) {
-        return changeFormManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "审核换货单")
-    @PostMapping("/audit/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要审核的换货单ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true),
-            @ApiImplicitParam(name = "status", value = "审核状态 PASS:审核通过,REJECT:审核驳回", required = true, dataType = "String", paramType = "query", allowableValues = "PASS,REJECT"),
-            @ApiImplicitParam(name = "reject_reason", value = "驳回原因", dataType = "String", paramType = "query")
-    })
-    @Log(client = LogClient.admin, detail = "审核ID为[${ids}]的换货单")
-    public void audit(@PathVariable List<Long> ids, @ApiIgnore String status, @ApiIgnore String rejectReason) {
-        this.changeFormManager.audit(ids, status, rejectReason);
-    }
-
-    @ApiOperation(value = "提交换货单")
-    @PostMapping("/submit/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要提交的换货单ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "将ID为[${ids}]的换货单提交审核")
-    public void submit(@PathVariable List<Long> ids) {
-        this.changeFormManager.submit(ids);
-    }
-
-    @ApiOperation(value = "撤销换货单")
-    @PostMapping("/cancel/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要撤销的换货单ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "将ID为[${ids}]的换货单撤销提交审核")
-    public void cancel(@PathVariable List<Long> ids) {
-        this.changeFormManager.cancel(ids);
-    }
-
-    @ApiOperation(value = "查询商品换货单商品统计分页列表数据")
-    @GetMapping("/statistics")
-    public WebPage statistics(ChangeFormStatisticsQueryParam params) {
-        return changeFormManager.statistics(params);
-    }
-
-    @ApiOperation(value = "导出商品换货单商品列表")
-    @GetMapping("/export")
-    public void export(HttpServletResponse response, ChangeFormStatisticsQueryParam params) {
-        this.changeFormManager.export(response, params);
-    }
-}

+ 0 - 113
module-erp/src/main/java/com/hys/app/controller/erp/warehouse/LendFormManagerController.java

@@ -1,113 +0,0 @@
-package com.hys.app.controller.erp.warehouse;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.LendFormDTO;
-import com.hys.app.model.erp.dto.LendFormQueryParam;
-import com.hys.app.model.erp.dto.LendFormReturnDTO;
-import com.hys.app.model.erp.dto.ProductLendNumDTO;
-import com.hys.app.model.erp.vo.LendFormVO;
-import com.hys.app.model.support.LogClient;
-import com.hys.app.model.support.validator.annotation.Log;
-import com.hys.app.service.erp.LendFormManager;
-import com.hys.app.service.erp.LendFormProductManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 商品借出相关API
- * @author dmy
- * 2023-12-05
- */
-@Api(description = "商品借出相关API")
-@RestController
-@RequestMapping("/admin/lend/form")
-@Validated
-public class LendFormManagerController {
-
-    @Autowired
-    private LendFormManager lendFormManager;
-
-    @Autowired
-    private LendFormProductManager lendFormProductManager;
-
-    @ApiOperation(value = "查询商品借出单分页列表数据")
-    @GetMapping
-    public WebPage list(LendFormQueryParam params) {
-        return lendFormManager.list(params);
-    }
-
-    @ApiOperation(value = "新增商品借出单")
-    @PostMapping
-    @Log(client = LogClient.admin, detail = "新增商品借出单")
-    public void add(@RequestBody @Valid LendFormDTO lendFormDTO) {
-        this.lendFormManager.add(lendFormDTO);
-    }
-
-    @ApiOperation(value = "修改商品借出单")
-    @PostMapping("/{id}")
-    @Log(client = LogClient.admin, detail = "修改id为[${id}]的商品借出单")
-    public void edit(@PathVariable Long id, @RequestBody @Valid LendFormDTO lendFormDTO) {
-        this.lendFormManager.edit(id, lendFormDTO);
-    }
-
-    @ApiOperation(value = "批量删除商品借出单")
-    @DeleteMapping("/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要删除的商品借出单ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "删除ID为[${ids}]的商品借出单")
-    public void delete(@PathVariable List<Long> ids) {
-        this.lendFormManager.delete(ids);
-    }
-
-    @ApiOperation(value = "查询商品借出单信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "商品借出单ID", required = true, dataType = "int", paramType = "path")
-    })
-    @GetMapping("/{id}")
-    public LendFormVO getDetail(@PathVariable Long id) {
-        return lendFormManager.getDetail(id);
-    }
-
-    @ApiOperation(value = "批量确认商品借出单")
-    @PostMapping("/confirm/{ids}")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "要确认的商品借出单ID集合", required = true, dataType = "int", paramType = "path", allowMultiple = true)
-    })
-    @Log(client = LogClient.admin, detail = "批量确认ID为[${ids}]的商品借出单")
-    public void confirm(@PathVariable List<Long> ids) {
-        this.lendFormManager.confirm(ids);
-    }
-
-    @ApiOperation(value = "商品借出单产品归还")
-    @PostMapping("/return/{id}")
-    @Log(client = LogClient.admin, detail = "id为[${id}]的商品借出单")
-    public void returnProduct(@PathVariable Long id, @RequestBody @Valid LendFormReturnDTO lendFormReturnDTO) {
-        this.lendFormManager.returnProduct(id, lendFormReturnDTO);
-    }
-
-    @ApiOperation(value = "查询待归还的借出单商品分页列表数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "page_no", value = "分页数", required = true, dataType = "int", paramType = "query"),
-            @ApiImplicitParam(name = "page_size", value = "每页数量", required = true, dataType = "int", paramType = "query")
-    })
-    @GetMapping("/list-wait-return")
-    public WebPage listWaitReturnProductPage(@ApiIgnore Long pageNo, @ApiIgnore Long pageSize) {
-        return lendFormProductManager.listWaitReturnProductPage(pageNo, pageSize);
-    }
-
-    @ApiOperation(value = "查询产品借出数量信息")
-    @PostMapping("/list-product-lend-num")
-    public List<ProductLendNumDTO> listProductLendNum(@RequestBody @Valid List<ProductLendNumDTO> lendList) {
-        return lendFormProductManager.listProductLendNum(lendList);
-    }
-}

+ 0 - 43
module-erp/src/main/java/com/hys/app/controller/erp/warehouse/StockBatchFlowController.java

@@ -1,43 +0,0 @@
-package com.hys.app.controller.erp.warehouse;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.StockBatchFlowQueryParams;
-import com.hys.app.model.erp.vo.StockBatchFlowVO;
-import com.hys.app.service.erp.StockBatchFlowManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 库存批次流水 API
- *
- * @author 张崧
- * 2024-01-16 11:39:01
- */
-@RestController
-@RequestMapping("/admin/erp/stockBatchFlow")
-@Api(tags = "库存批次流水API")
-@Validated
-public class StockBatchFlowController {
-
-    @Autowired
-    private StockBatchFlowManager stockBatchFlowManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<StockBatchFlowVO> list(StockBatchFlowQueryParams queryParams) {
-        return stockBatchFlowManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "查询")
-    @GetMapping("/{id}")
-    public StockBatchFlowVO getDetail(@PathVariable Long id) {
-        return stockBatchFlowManager.getDetail(id);
-    }
-}
-

+ 0 - 55
module-erp/src/main/java/com/hys/app/controller/erp/warehouse/StockStatisticsManagerController.java

@@ -1,55 +0,0 @@
-package com.hys.app.controller.erp.warehouse;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.StockStatisticsQueryParam;
-import com.hys.app.service.erp.StockStatisticsManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 库存统计相关API
- *
- * @author dmy
- * 2023-12-05
- */
-@Api(description = "库存统计相关API")
-@RestController
-@RequestMapping("/admin/stock/statistics")
-@Validated
-public class StockStatisticsManagerController {
-
-    @Autowired
-    private StockStatisticsManager stockStatisticsManager;
-
-    @ApiOperation(value = "查询库存统计分页列表数据")
-    @GetMapping
-    public WebPage list(StockStatisticsQueryParam params) {
-        return stockStatisticsManager.listStock(params);
-    }
-
-    @ApiOperation(value = "查询库存成本统计分页列表数据")
-    @GetMapping("/cost")
-    public WebPage listCost(StockStatisticsQueryParam params) {
-        params.setGroupByWarehouseEntry(true);
-        return stockStatisticsManager.listStock(params);
-    }
-
-    @ApiOperation(value = "导出库存统计列表数据")
-    @GetMapping("/export")
-    public void export(HttpServletResponse response, StockStatisticsQueryParam params) {
-        this.stockStatisticsManager.export(response, params);
-    }
-
-    @ApiOperation(value = "导出库存成本统计列表数据")
-    @GetMapping("/export-cost")
-    public void exportCost(HttpServletResponse response, StockStatisticsQueryParam params) {
-        this.stockStatisticsManager.exportCost(response, params);
-    }
-}

+ 0 - 37
module-erp/src/main/java/com/hys/app/controller/erp/warehouse/StockTransferProductManagerController.java

@@ -1,37 +0,0 @@
-package com.hys.app.controller.erp.warehouse;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.StockTransferProductQueryParams;
-import com.hys.app.model.erp.vo.StockTransferProductVO;
-import com.hys.app.service.erp.StockTransferProductManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 调拨单商品明细API
- *
- * @author 张崧
- * @since 2023-12-12 16:34:15
- */
-@RestController
-@RequestMapping("/admin/erp/stockTransferProduct")
-@Api(tags = "调拨单商品明细API")
-@Validated
-public class StockTransferProductManagerController {
-
-    @Autowired
-    private StockTransferProductManager stockTransferProductManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<StockTransferProductVO> list(StockTransferProductQueryParams queryParams) {
-        return stockTransferProductManager.list(queryParams);
-    }
-
-}
-

+ 0 - 45
module-erp/src/main/java/com/hys/app/controller/erp/warehouse/WarehouseEntryBatchManagerController.java

@@ -1,45 +0,0 @@
-package com.hys.app.controller.erp.warehouse;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.WarehouseEntryBatchQueryParams;
-import com.hys.app.model.erp.vo.WarehouseEntryBatchVO;
-import com.hys.app.service.erp.WarehouseEntryBatchManager;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 入库批次相关API
- *
- * @author 张崧
- * @since 2023-12-08 11:49:52
- */
-@RestController
-@RequestMapping("/admin/erp/warehouseEntryBatch")
-@Api(tags = "入库批次相关API")
-@Validated
-public class WarehouseEntryBatchManagerController {
-
-    @Autowired
-    private WarehouseEntryBatchManager warehouseEntryBatchManager;
-
-    @ApiOperation(value = "分页列表")
-    @GetMapping
-    public WebPage<WarehouseEntryBatchVO> list(WarehouseEntryBatchQueryParams queryParams) {
-        return warehouseEntryBatchManager.list(queryParams);
-    }
-
-    @ApiOperation(value = "查询所有批次")
-    @GetMapping("/list-all")
-    public List<WarehouseEntryBatchVO> listAll(WarehouseEntryBatchQueryParams queryParams) {
-        return warehouseEntryBatchManager.listAll(queryParams);
-    }
-
-}
-

+ 0 - 32
module-erp/src/main/java/com/hys/app/converter/erp/EnterpriseConverter.java

@@ -1,32 +0,0 @@
-package com.hys.app.converter.erp;
-
-import org.mapstruct.Mapper;
-import com.hys.app.model.erp.dos.EnterpriseDO;
-import com.hys.app.model.erp.vo.EnterpriseVO;
-import com.hys.app.model.erp.dto.EnterpriseDTO;
-import com.hys.app.model.erp.vo.EnterpriseExcelVO;
-import org.mapstruct.MappingConstants;
-import com.hys.app.framework.database.WebPage;
-import java.util.List;
-
-/**
- * 企业 Converter
- *
- * @author 张崧
- * 2024-03-25 15:44:10
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface EnterpriseConverter {
-    
-    EnterpriseDO convert(EnterpriseDTO enterpriseDTO);
-    
-    EnterpriseVO convert(EnterpriseDO enterpriseDO);
-    
-    List<EnterpriseVO> convertList(List<EnterpriseDO> list);
-    
-    List<EnterpriseExcelVO> convertExcel(List<EnterpriseVO> list);
-    
-    WebPage<EnterpriseVO> convertPage(WebPage<EnterpriseDO> webPage);
-    
-}
-

+ 0 - 41
module-erp/src/main/java/com/hys/app/converter/erp/GoodsConverter.java

@@ -1,41 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.base.CharacterConstant;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.GoodsLabelDO;
-import com.hys.app.model.erp.dos.GoodsLabelRelationDO;
-import com.hys.app.model.erp.dto.GoodsDTO;
-import com.hys.app.model.erp.dto.ProductDTO;
-import com.hys.app.model.erp.vo.GoodsVO;
-import com.hys.app.model.erp.vo.ProductVO;
-import com.hys.app.model.goods.dos.BrandDO;
-import com.hys.app.model.goods.dos.GoodsGalleryDO;
-import com.hys.app.model.goods.vo.GoodsParamsGroupVO;
-import com.hys.app.service.base.SensitiveFilter;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.hys.app.framework.util.CollectionUtils.convertMap;
-
-/**
- * 商品 Convert
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface GoodsConverter {
-    WebPage<GoodsVO> convert(WebPage<GoodsDO> webPage);
-
-
-
-
-}
-

+ 0 - 32
module-erp/src/main/java/com/hys/app/converter/erp/GoodsLabelConverter.java

@@ -1,32 +0,0 @@
-package com.hys.app.converter.erp;
-
-import org.mapstruct.Mapper;
-import com.hys.app.model.erp.dos.GoodsLabelDO;
-import com.hys.app.model.erp.vo.GoodsLabelVO;
-import com.hys.app.model.erp.dto.GoodsLabelDTO;
-import com.hys.app.model.erp.vo.GoodsLabelExcelVO;
-import org.mapstruct.MappingConstants;
-import com.hys.app.framework.database.WebPage;
-import java.util.List;
-
-/**
- * 商品标签 Converter
- *
- * @author 张崧
- * 2024-03-20 16:23:19
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface GoodsLabelConverter {
-    
-    GoodsLabelDO convert(GoodsLabelDTO goodsLabelDTO);
-    
-    GoodsLabelVO convert(GoodsLabelDO goodsLabelDO);
-    
-    List<GoodsLabelVO> convertList(List<GoodsLabelDO> list);
-    
-    List<GoodsLabelExcelVO> convertExcel(List<GoodsLabelVO> list);
-    
-    WebPage<GoodsLabelVO> convertPage(WebPage<GoodsLabelDO> webPage);
-    
-}
-

+ 0 - 32
module-erp/src/main/java/com/hys/app/converter/erp/GoodsLabelRelationConverter.java

@@ -1,32 +0,0 @@
-package com.hys.app.converter.erp;
-
-import org.mapstruct.Mapper;
-import com.hys.app.model.erp.dos.GoodsLabelRelationDO;
-import com.hys.app.model.erp.vo.GoodsLabelRelationVO;
-import com.hys.app.model.erp.dto.GoodsLabelRelationDTO;
-import com.hys.app.model.erp.vo.GoodsLabelRelationExcelVO;
-import org.mapstruct.MappingConstants;
-import com.hys.app.framework.database.WebPage;
-import java.util.List;
-
-/**
- * 商品标签-商品关联表 Converter
- *
- * @author 张崧
- * 2024-03-20 16:29:17
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface GoodsLabelRelationConverter {
-    
-    GoodsLabelRelationDO convert(GoodsLabelRelationDTO goodsLabelRelationDTO);
-    
-    GoodsLabelRelationVO convert(GoodsLabelRelationDO goodsLabelRelationDO);
-    
-    List<GoodsLabelRelationVO> convertList(List<GoodsLabelRelationDO> list);
-    
-    List<GoodsLabelRelationExcelVO> convertExcel(List<GoodsLabelRelationVO> list);
-    
-    WebPage<GoodsLabelRelationVO> convertPage(WebPage<GoodsLabelRelationDO> webPage);
-    
-}
-

+ 0 - 46
module-erp/src/main/java/com/hys/app/converter/erp/GoodsSnConverter.java

@@ -1,46 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.base.CharacterConstant;
-import com.hys.app.model.erp.dos.*;
-import com.hys.app.model.erp.dto.GoodsDTO;
-import com.hys.app.model.erp.dto.GoodsSnDTO;
-import com.hys.app.model.erp.dto.ProductDTO;
-import com.hys.app.model.erp.vo.GoodsSnVO;
-import com.hys.app.model.erp.vo.GoodsVO;
-import com.hys.app.model.erp.vo.ProductVO;
-import com.hys.app.model.goods.dos.BrandDO;
-import com.hys.app.model.goods.dos.GoodsGalleryDO;
-import com.hys.app.model.goods.vo.GoodsParamsGroupVO;
-import com.hys.app.service.base.SensitiveFilter;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.hys.app.framework.util.CollectionUtils.convertMap;
-
-/**
- * 商品 Convert
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface GoodsSnConverter {
-
-    GoodsSnDO convert(GoodsSnDTO goodsSnDTO);
-
-    GoodsSnVO convert(GoodsSnDO goodsSnDO);
-
-    List<GoodsSnVO> convert(List<GoodsSnDO> list);
-
-    WebPage<GoodsSnVO> convert(WebPage<GoodsSnDO> webPage);
-
-}
-

+ 0 - 7
module-erp/src/main/java/com/hys/app/converter/erp/OrderItemConverter.java

@@ -1,23 +1,16 @@
 package com.hys.app.converter.erp;
 
 import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.OrderDO;
 import com.hys.app.model.erp.dos.OrderItemDO;
-import com.hys.app.model.erp.dos.ProductDO;
-import com.hys.app.model.erp.dos.WarehouseEntryBatchDO;
-import com.hys.app.model.erp.dto.OrderDTO;
 import com.hys.app.model.erp.dto.OrderItemDTO;
 import com.hys.app.model.erp.dto.StockUpdateDTO;
-import com.hys.app.model.erp.enums.OrderTypeEnum;
 import com.hys.app.model.erp.enums.StockOperateEnum;
 import com.hys.app.model.erp.vo.OrderItemExcelVO;
 import com.hys.app.model.erp.vo.OrderItemVO;
-import com.hys.app.model.goods.dos.CategoryDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingConstants;
 
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

+ 0 - 50
module-erp/src/main/java/com/hys/app/converter/erp/OrderPaymentConverter.java

@@ -1,50 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.model.erp.dos.CollectingAccountDO;
-import org.mapstruct.Mapper;
-import com.hys.app.model.erp.dos.OrderPaymentDO;
-import com.hys.app.model.erp.vo.OrderPaymentVO;
-import com.hys.app.model.erp.dto.OrderPaymentDTO;
-import com.hys.app.model.erp.vo.OrderPaymentExcelVO;
-import org.mapstruct.MappingConstants;
-import com.hys.app.framework.database.WebPage;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 订单支付明细 Converter
- *
- * @author 张崧
- * 2024-01-24 17:00:32
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface OrderPaymentConverter {
-    
-    OrderPaymentDO convert(OrderPaymentDTO orderPaymentDTO);
-    
-    OrderPaymentVO convert(OrderPaymentDO orderPaymentDO);
-    
-    List<OrderPaymentVO> convertList(List<OrderPaymentDO> list);
-    
-    List<OrderPaymentExcelVO> convertExcel(List<OrderPaymentVO> list);
-    
-    WebPage<OrderPaymentVO> convertPage(WebPage<OrderPaymentDO> webPage);
-
-    default List<OrderPaymentDO> convert(Long orderId, List<OrderPaymentDTO> paymentList, Map<String, CollectingAccountDO> collectingAccountMap){
-        return paymentList.stream().map(orderPaymentDTO -> {
-            CollectingAccountDO collectingAccountDO = collectingAccountMap.get(orderPaymentDTO.getCollectingAccountId());
-            OrderPaymentDO orderPaymentDO = new OrderPaymentDO();
-
-            orderPaymentDO.setOrderId(orderId);
-            orderPaymentDO.setCollectingAccountId(orderPaymentDTO.getCollectingAccountId());
-            orderPaymentDO.setCollectingAccountName(collectingAccountDO.getName());
-            orderPaymentDO.setCollectingAccountSn(collectingAccountDO.getSn());
-            orderPaymentDO.setPrice(orderPaymentDTO.getPrice());
-            orderPaymentDO.setRemark(orderPaymentDTO.getRemark());
-
-            return orderPaymentDO;
-        }).collect(Collectors.toList());
-    }
-}
-

+ 0 - 120
module-erp/src/main/java/com/hys/app/converter/erp/OrderReturnItemConverter.java

@@ -1,120 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.util.DateUtil;
-import com.hys.app.model.erp.dos.*;
-import com.hys.app.model.erp.dto.OrderReturnDTO;
-import com.hys.app.model.erp.dto.OrderReturnItemDTO;
-import com.hys.app.model.erp.enums.NoBusinessTypeEnum;
-import com.hys.app.model.erp.enums.OrderTypeEnum;
-import com.hys.app.model.erp.vo.OrderReturnItemVO;
-import com.hys.app.service.erp.NoGenerateManager;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 订单退货项 Convert
- *
- * @author 张崧
- * @since 2023-12-14 15:42:07
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface OrderReturnItemConverter {
-    OrderReturnItemDO convert(OrderReturnItemDTO orderReturnItemDTO);
-
-    OrderReturnItemVO convert(OrderReturnItemDO orderReturnItemDO);
-
-    List<OrderReturnItemVO> convert(List<OrderReturnItemDO> list);
-
-    WebPage<OrderReturnItemVO> convert(WebPage<OrderReturnItemDO> webPage);
-
-    default OrderReturnItemDO convert(OrderReturnItemDTO orderReturnItemDTO, OrderItemDO orderItemDO, WarehouseEntryBatchDO batchDO, Long orderReturnId) {
-        OrderReturnItemDO orderReturnItemDO = new OrderReturnItemDO();
-
-        orderReturnItemDO.setOrderReturnId(orderReturnId);
-        orderReturnItemDO.setWarehouseEntryId(batchDO.getWarehouseEntryId());
-        orderReturnItemDO.setWarehouseEntrySn(batchDO.getWarehouseEntrySn());
-        orderReturnItemDO.setWarehouseEntryItemId(batchDO.getWarehouseEntryItemId());
-        orderReturnItemDO.setWarehouseEntryBatchId(orderItemDO.getBatchId());
-        orderReturnItemDO.setWarehouseEntryBatchSn(orderItemDO.getBatchSn());
-        orderReturnItemDO.setOrderItemId(orderItemDO.getId());
-        orderReturnItemDO.setGoodsId(orderItemDO.getGoodsId());
-        orderReturnItemDO.setProductId(orderItemDO.getProductId());
-        orderReturnItemDO.setProductSn(orderItemDO.getProductSn());
-        orderReturnItemDO.setProductName(orderItemDO.getProductName());
-        orderReturnItemDO.setProductSpecification(orderItemDO.getProductSpecification());
-        orderReturnItemDO.setProductUnit(orderItemDO.getProductUnit());
-        orderReturnItemDO.setCategoryId(orderItemDO.getCategoryId());
-        orderReturnItemDO.setCategoryName(orderItemDO.getCategoryName());
-        orderReturnItemDO.setProductPrice(orderItemDO.getPrice());
-        orderReturnItemDO.setProductCostPrice(batchDO.getProductCostPrice());
-        orderReturnItemDO.setTaxRate(orderItemDO.getTaxRate());
-        orderReturnItemDO.setOrderNum(orderItemDO.getNum());
-        orderReturnItemDO.setReturnNum(orderReturnItemDTO.getReturnNum());
-
-        return orderReturnItemDO;
-    }
-
-    default OrderReturnItemDO convert(WarehouseOutItemDO warehouseOutItemDO, OrderReturnItemDTO orderReturnItemDTO, Long orderReturnId) {
-        OrderReturnItemDO orderReturnItemDO = new OrderReturnItemDO();
-
-        orderReturnItemDO.setOrderReturnId(orderReturnId);
-        orderReturnItemDO.setWarehouseEntryId(warehouseOutItemDO.getWarehouseEntryId());
-        orderReturnItemDO.setWarehouseEntrySn(warehouseOutItemDO.getWarehouseEntrySn());
-        orderReturnItemDO.setWarehouseEntryItemId(warehouseOutItemDO.getWarehouseEntryItemId());
-        orderReturnItemDO.setWarehouseEntryBatchId(warehouseOutItemDO.getWarehouseEntryBatchId());
-        orderReturnItemDO.setWarehouseEntryBatchSn(warehouseOutItemDO.getWarehouseEntryBatchSn());
-        orderReturnItemDO.setWarehouseOutItemId(warehouseOutItemDO.getId());
-        orderReturnItemDO.setGoodsId(warehouseOutItemDO.getGoodsId());
-        orderReturnItemDO.setProductId(warehouseOutItemDO.getProductId());
-        orderReturnItemDO.setProductSn(warehouseOutItemDO.getProductSn());
-        orderReturnItemDO.setProductName(warehouseOutItemDO.getProductName());
-        orderReturnItemDO.setProductSpecification(warehouseOutItemDO.getProductSpecification());
-        orderReturnItemDO.setProductUnit(warehouseOutItemDO.getProductUnit());
-        orderReturnItemDO.setProductBarcode(warehouseOutItemDO.getProductBarcode());
-        orderReturnItemDO.setCategoryId(warehouseOutItemDO.getCategoryId());
-        orderReturnItemDO.setCategoryName(warehouseOutItemDO.getCategoryName());
-        orderReturnItemDO.setProductPrice(warehouseOutItemDO.getProductPrice());
-        orderReturnItemDO.setProductCostPrice(warehouseOutItemDO.getProductCostPrice());
-        orderReturnItemDO.setTaxRate(warehouseOutItemDO.getTaxRate());
-        orderReturnItemDO.setOrderNum(warehouseOutItemDO.getOutNum());
-        orderReturnItemDO.setReturnNum(orderReturnItemDTO.getReturnNum());
-
-        return orderReturnItemDO;
-    }
-
-    default List<WarehouseEntryBatchDO> combination(List<OrderReturnItemDO> returnItemList, OrderReturnDO orderReturnDO, NoGenerateManager noGenerateManager) {
-        long dateline = DateUtil.getDateline();
-
-        return returnItemList.stream().map(orderReturnItemDO -> {
-            WarehouseEntryBatchDO batchDO = new WarehouseEntryBatchDO();
-
-            batchDO.setWarehouseEntryId(orderReturnItemDO.getWarehouseEntryId());
-            batchDO.setWarehouseEntrySn(orderReturnItemDO.getWarehouseEntrySn());
-            batchDO.setWarehouseEntryItemId(orderReturnItemDO.getWarehouseEntryItemId());
-            batchDO.setSn(noGenerateManager.generate(NoBusinessTypeEnum.WarehouseEntryBatch, orderReturnDO.getDeptId()));
-            batchDO.setWarehouseId(orderReturnDO.getWarehouseId());
-            batchDO.setGoodsId(orderReturnItemDO.getGoodsId());
-            batchDO.setProductId(orderReturnItemDO.getProductId());
-            batchDO.setProductSn(orderReturnItemDO.getProductSn());
-            batchDO.setProductName(orderReturnItemDO.getProductName());
-            batchDO.setProductSpecification(orderReturnItemDO.getProductSpecification());
-            batchDO.setProductUnit(orderReturnItemDO.getProductUnit());
-            batchDO.setProductBarcode(orderReturnItemDO.getProductBarcode());
-            batchDO.setCategoryId(orderReturnItemDO.getCategoryId());
-            batchDO.setCategoryName(orderReturnItemDO.getCategoryName());
-            batchDO.setEntryNum(orderReturnItemDO.getReturnNum());
-            batchDO.setEntryPrice(orderReturnItemDO.getProductPrice());
-            batchDO.setProductCostPrice(orderReturnItemDO.getProductCostPrice());
-            batchDO.setTaxRate(orderReturnItemDO.getTaxRate());
-            batchDO.setRemainNum(orderReturnItemDO.getReturnNum());
-            batchDO.setEntryTime(dateline);
-
-            return batchDO;
-        }).collect(Collectors.toList());
-    }
-}
-

+ 0 - 34
module-erp/src/main/java/com/hys/app/converter/erp/ProcurementContractProductConverter.java

@@ -1,34 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.framework.util.CurrencyUtil;
-import com.hys.app.model.erp.dos.ProcurementContractProduct;
-import com.hys.app.model.erp.dos.ProductDO;
-import com.hys.app.model.erp.dto.WarehouseEntryProductDTO;
-import com.hys.app.model.goods.dos.CategoryDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
-
-import java.util.Map;
-
-/**
- * @Author chushuai
- * @Date 2024/3/15 15:17
- * @Version 1.0
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface ProcurementContractProductConverter {
-
-    default ProcurementContractProduct convert(ProductDO productDO, Map<Long, CategoryDO> categoryMap, Map<String, WarehouseEntryProductDTO> warehouseEntryProductDTOMap){
-        ProcurementContractProduct procurementContractProduct = new ProcurementContractProduct();
-        procurementContractProduct.setProductId(productDO.getId());
-//        procurementContractProduct.setProductSn(productDO.getSn());
-        procurementContractProduct.setProductName(productDO.getName());
-//        procurementContractProduct.setCategoryName(categoryMap.get(productDO.getCategoryId()).getName());
-//        procurementContractProduct.setCategoryId(productDO.getCategoryId());
-//        procurementContractProduct.setGoodsId(productDO.getGoodsId());
-        procurementContractProduct.setUnit(productDO.getUnit());
-        WarehouseEntryProductDTO warehouseEntryProductDTO = warehouseEntryProductDTOMap.get(productDO.getId());
-        procurementContractProduct.setStockNum(warehouseEntryProductDTO.getNum());
-        return procurementContractProduct;
-    }
-}

+ 0 - 65
module-erp/src/main/java/com/hys/app/converter/erp/ProductConverter.java

@@ -1,65 +0,0 @@
-package com.hys.app.converter.erp;
-
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.ProductDO;
-import com.hys.app.model.erp.dto.ProductDTO;
-import com.hys.app.model.erp.dto.ProductSpec;
-import com.hys.app.model.erp.vo.ProductVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 产品 Convert
- *
- * @author 张崧
- * 2023-11-30 16:06:44
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface ProductConverter {
-
-    ProductDO convert(ProductDTO productDTO);
-
-    ProductVO convert(ProductDO productDO);
-
-    List<ProductVO> convert(List<ProductDO> webPage);
-
-    List<ProductDO> convertList(List<ProductDTO> list);
-
-    WebPage<ProductVO> convert(WebPage<ProductDO> webPage);
-
-    Page<ProductVO> convert(Page<ProductDO> webPage);
-
-    default WebPage<ProductVO> combination(WebPage<ProductDO> webPage, Map<Long, String> categoryNameMap, Map<Long, Integer> stockNumMap) {
-        WebPage<ProductVO> page = convert(webPage);
-
-        // 填充分类名称
-        for (ProductVO productVO : page.getData()) {
-            productVO.setStockNum(stockNumMap.get(productVO.getId()));
-        }
-
-        return page;
-    }
-
-    default List<ProductDO> convertList(List<ProductDTO> productDTOList, GoodsDO goodsDO) {
-        List<ProductDO> productList = convertList(productDTOList);
-//        productList.forEach(productDO -> productDO.setPropertiesFromGoods(goodsDO));
-        return productList;
-    }
-
-    default String formatSpecification(List<ProductSpec> specList) {
-        if (CollUtil.isEmpty(specList)) {
-            return "/";
-        }
-        return specList.stream().map(ProductSpec::getSpecValue).collect(Collectors.joining(","));
-    }
-}
-

+ 0 - 49
module-erp/src/main/java/com/hys/app/converter/erp/SaleChannelConverter.java

@@ -1,49 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.base.CharacterConstant;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.GoodsLabelDO;
-import com.hys.app.model.erp.dos.GoodsLabelRelationDO;
-import com.hys.app.model.erp.dos.SaleChannelDO;
-import com.hys.app.model.erp.dto.GoodsDTO;
-import com.hys.app.model.erp.dto.ProductDTO;
-import com.hys.app.model.erp.dto.SaleChannelDTO;
-import com.hys.app.model.erp.vo.GoodsVO;
-import com.hys.app.model.erp.vo.ProductVO;
-import com.hys.app.model.erp.vo.SaleChannelV0;
-import com.hys.app.model.goods.dos.BrandDO;
-import com.hys.app.model.goods.dos.GoodsGalleryDO;
-import com.hys.app.model.goods.vo.GoodsParamsGroupVO;
-import com.hys.app.service.base.SensitiveFilter;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.hys.app.framework.util.CollectionUtils.convertMap;
-
-/**
- * 商品 Convert
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface SaleChannelConverter {
-
-    SaleChannelDO convert(SaleChannelDTO saleChannelDTO);
-
-    SaleChannelV0 convert(SaleChannelDO saleChannelDO);
-
-
-
-    List<SaleChannelV0> convert(List<SaleChannelDO> list);
-
-    WebPage<SaleChannelV0> convert(WebPage<SaleChannelDO> webPage);
-
-}
-

+ 0 - 32
module-erp/src/main/java/com/hys/app/converter/erp/StockBatchFlowConverter.java

@@ -1,32 +0,0 @@
-package com.hys.app.converter.erp;
-
-import org.mapstruct.Mapper;
-import com.hys.app.model.erp.dos.StockBatchFlowDO;
-import com.hys.app.model.erp.vo.StockBatchFlowVO;
-import com.hys.app.model.erp.dto.StockBatchFlowDTO;
-import com.hys.app.model.erp.vo.StockBatchFlowExcelVO;
-import org.mapstruct.MappingConstants;
-import com.hys.app.framework.database.WebPage;
-import java.util.List;
-
-/**
- * 库存批次流水 Converter
- *
- * @author 张崧
- * 2024-01-16 11:39:01
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface StockBatchFlowConverter {
-    
-    StockBatchFlowDO convert(StockBatchFlowDTO stockBatchFlowDTO);
-    
-    StockBatchFlowVO convert(StockBatchFlowDO stockBatchFlowDO);
-    
-    List<StockBatchFlowVO> convertList(List<StockBatchFlowDO> list);
-    
-    List<StockBatchFlowExcelVO> convertExcel(List<StockBatchFlowDO> list);
-    
-    WebPage<StockBatchFlowVO> convertPage(WebPage<StockBatchFlowDO> webPage);
-    
-}
-

+ 0 - 34
module-erp/src/main/java/com/hys/app/converter/erp/StockTransferConverter.java

@@ -4,17 +4,13 @@ import com.hys.app.framework.database.WebPage;
 import com.hys.app.framework.util.DateUtil;
 import com.hys.app.model.erp.dos.StockTransferDO;
 import com.hys.app.model.erp.dos.StockTransferProductDO;
-import com.hys.app.model.erp.dos.WarehouseEntryBatchDO;
 import com.hys.app.model.erp.dto.StockTransferDTO;
 import com.hys.app.model.erp.dto.StockUpdateDTO;
 import com.hys.app.model.erp.enums.NoBusinessTypeEnum;
 import com.hys.app.model.erp.enums.StockOperateEnum;
-import com.hys.app.model.erp.vo.StockTransferAllowable;
 import com.hys.app.model.erp.vo.StockTransferVO;
-import com.hys.app.model.system.dto.DataPermissionDTO;
 import com.hys.app.service.erp.NoGenerateManager;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
 
 import java.util.List;
@@ -37,36 +33,6 @@ public interface StockTransferConverter {
 
     WebPage<StockTransferVO> convert(WebPage<StockTransferDO> webPage);
 
-    default List<WarehouseEntryBatchDO> combination(StockTransferDO stockTransferDO, List<StockTransferProductDO> transferProductList, NoGenerateManager noGenerateManager) {
-        long dateline = DateUtil.getDateline();
-        return transferProductList.stream().map(stockTransferProductDO -> {
-            WarehouseEntryBatchDO batchDO = new WarehouseEntryBatchDO();
-
-            batchDO.setWarehouseEntryId(stockTransferProductDO.getWarehouseEntryId());
-            batchDO.setWarehouseEntrySn(stockTransferProductDO.getWarehouseEntrySn());
-            batchDO.setWarehouseEntryItemId(stockTransferProductDO.getWarehouseEntryItemId());
-            batchDO.setSn(noGenerateManager.generate(NoBusinessTypeEnum.WarehouseEntryBatch, stockTransferDO.getInDeptId()));
-            batchDO.setWarehouseId(stockTransferDO.getInWarehouseId());
-            batchDO.setGoodsId(stockTransferProductDO.getGoodsId());
-            batchDO.setProductId(stockTransferProductDO.getProductId());
-            batchDO.setProductSn(stockTransferProductDO.getProductSn());
-            batchDO.setProductName(stockTransferProductDO.getProductName());
-            batchDO.setProductSpecification(stockTransferProductDO.getProductSpecification());
-            batchDO.setProductUnit(stockTransferProductDO.getProductUnit());
-            batchDO.setProductBarcode(stockTransferProductDO.getProductBarcode());
-            batchDO.setCategoryId(stockTransferProductDO.getCategoryId());
-            batchDO.setCategoryName(stockTransferProductDO.getCategoryName());
-            batchDO.setEntryNum(stockTransferProductDO.getNum());
-            batchDO.setRemainNum(stockTransferProductDO.getNum());
-            batchDO.setEntryPrice(stockTransferProductDO.getProductPrice());
-            batchDO.setProductCostPrice(stockTransferProductDO.getProductCostPrice());
-            batchDO.setTaxRate(stockTransferProductDO.getTaxRate());
-            batchDO.setEntryTime(dateline);
-
-            return batchDO;
-        }).collect(Collectors.toList());
-    }
-
     default List<StockUpdateDTO> convertStockUpdateList(List<StockTransferProductDO> transferProductList) {
         return transferProductList.stream().map(transferProductDO -> {
             StockUpdateDTO stockUpdateDTO = new StockUpdateDTO();

+ 5 - 7
module-erp/src/main/java/com/hys/app/converter/erp/StockTransferProductConverter.java

@@ -1,15 +1,13 @@
 package com.hys.app.converter.erp;
 
-import com.hys.app.model.erp.dos.WarehouseEntryBatchDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
+import com.hys.app.framework.database.WebPage;
 import com.hys.app.model.erp.dos.StockTransferProductDO;
-import com.hys.app.model.erp.vo.StockTransferProductVO;
 import com.hys.app.model.erp.dto.StockTransferProductDTO;
-import com.hys.app.framework.database.WebPage;
+import com.hys.app.model.erp.vo.StockTransferProductVO;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 调拨单商品明细 Convert

+ 0 - 30
module-erp/src/main/java/com/hys/app/converter/erp/SupplierConverter.java

@@ -1,30 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.SupplierDO;
-import com.hys.app.model.erp.dto.SupplierDTO;
-import com.hys.app.model.erp.vo.SupplierVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
-
-import java.util.List;
-
-/**
- * 供应商 Convert
- *
- * @author 张崧
- * 2023-11-29 14:20:18
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface SupplierConverter {
-
-    SupplierDO convert(SupplierDTO supplierDTO);
-
-    SupplierVO convert(SupplierDO supplierDO);
-
-    List<SupplierVO> convert(List<SupplierDO> list);
-
-    WebPage<SupplierVO> convert(WebPage<SupplierDO> webPage);
-
-}
-

+ 0 - 79
module-erp/src/main/java/com/hys/app/converter/erp/SupplierReturnConverter.java

@@ -1,79 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.model.erp.dos.SupplierReturnItemDO;
-import com.hys.app.model.erp.dos.WarehouseEntryDO;
-import com.hys.app.model.erp.dto.StockUpdateDTO;
-import com.hys.app.model.erp.enums.StockOperateEnum;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
-import com.hys.app.model.erp.dos.SupplierReturnDO;
-import com.hys.app.model.erp.vo.SupplierReturnVO;
-import com.hys.app.model.erp.dto.SupplierReturnDTO;
-import com.hys.app.framework.database.WebPage;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 供应商退货 Convert
- *
- * @author 张崧
- * @since 2023-12-14 11:12:46
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface SupplierReturnConverter {
-
-    SupplierReturnDO convert(SupplierReturnDTO supplierReturnDTO);
-
-    @Mapping(target = "allowable", expression = "java(new com.hys.app.model.erp.vo.SupplierReturnAllowable(supplierReturnDO))")
-    SupplierReturnVO convert(SupplierReturnDO supplierReturnDO);
-    
-    List<SupplierReturnVO> convert(List<SupplierReturnDO> list);
-    
-    WebPage<SupplierReturnVO> convert(WebPage<SupplierReturnDO> webPage);
-
-    default WebPage<SupplierReturnVO> combination(WebPage<SupplierReturnDO> webPage, Map<Long, String> deptNameMap, Map<Long, String> warehouseNameMap, Map<Long, String> supplierNameMap){
-        WebPage<SupplierReturnVO> page = convert(webPage);
-
-        for (SupplierReturnVO supplierReturnVO : page.getData()) {
-            supplierReturnVO.setDeptName(deptNameMap.get(supplierReturnVO.getDeptId()));
-            supplierReturnVO.setWarehouseName(warehouseNameMap.get(supplierReturnVO.getWarehouseId()));
-            supplierReturnVO.setSupplierName(supplierNameMap.get(supplierReturnVO.getSupplierId()));
-        }
-
-        return page;
-    }
-
-    default SupplierReturnDO combination(SupplierReturnDTO supplierReturnDTO){
-        SupplierReturnDO supplierReturnDO = convert(supplierReturnDTO);
-
-        WarehouseEntryDO warehouseEntryDO = supplierReturnDTO.getWarehouseEntryDO();
-        supplierReturnDO.setWarehouseEntrySn(warehouseEntryDO.getSn());
-        supplierReturnDO.setWarehouseId(warehouseEntryDO.getWarehouseId());
-        supplierReturnDO.setSupplierId(warehouseEntryDO.getSupplierId());
-        supplierReturnDO.setSupplierSn(warehouseEntryDO.getSupplierSn());
-        supplierReturnDO.setContractId(warehouseEntryDO.getContractId());
-        supplierReturnDO.setContractSn(warehouseEntryDO.getContractSn());
-//        supplierReturnDO.setDeptName(warehouseEntryDO.getDeptName());
-        supplierReturnDO.setWarehouseName(warehouseEntryDO.getWarehouseName());
-        supplierReturnDO.setSupplierName(warehouseEntryDO.getSupplierName());
-        supplierReturnDO.setHandleByName(supplierReturnDTO.getHandleBy().getRealName());
-
-        return supplierReturnDO;
-    }
-
-    default List<StockUpdateDTO> convertStockUpdateList(List<SupplierReturnItemDO> returnItemList){
-        return returnItemList.stream().map(supplierReturnItemDO -> {
-            StockUpdateDTO stockUpdateDTO = new StockUpdateDTO();
-
-            stockUpdateDTO.setBatchId(supplierReturnItemDO.getWarehouseEntryBatchId());
-            stockUpdateDTO.setTip(supplierReturnItemDO.getProductName());
-            stockUpdateDTO.setOperate(StockOperateEnum.Reduce);
-            stockUpdateDTO.setChangeNum(supplierReturnItemDO.getReturnNum());
-
-            return stockUpdateDTO;
-        }).collect(Collectors.toList());
-    }
-}
-

+ 0 - 61
module-erp/src/main/java/com/hys/app/converter/erp/SupplierReturnItemConverter.java

@@ -1,61 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.model.erp.dos.SupplierReturnDO;
-import com.hys.app.model.erp.dos.WarehouseEntryBatchDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
-import com.hys.app.model.erp.dos.SupplierReturnItemDO;
-import com.hys.app.model.erp.vo.SupplierReturnItemVO;
-import com.hys.app.model.erp.dto.SupplierReturnItemDTO;
-import com.hys.app.framework.database.WebPage;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * 供应商退货项 Convert
- *
- * @author 张崧
- * @since 2023-12-14 11:12:46
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface SupplierReturnItemConverter {
-
-    SupplierReturnItemDO convert(SupplierReturnItemDTO supplierReturnItemDTO);
-    
-    SupplierReturnItemVO convert(SupplierReturnItemDO supplierReturnItemDO);
-    
-    List<SupplierReturnItemVO> convert(List<SupplierReturnItemDO> list);
-    
-    WebPage<SupplierReturnItemVO> convert(WebPage<SupplierReturnItemDO> webPage);
-
-    default List<SupplierReturnItemDO> combination(SupplierReturnDO supplierReturnDO, List<SupplierReturnItemDTO> itemList, Map<Long, WarehouseEntryBatchDO> batchMap){
-        return itemList.stream().map(supplierReturnItemDTO -> {
-            WarehouseEntryBatchDO batchDO = batchMap.get(supplierReturnItemDTO.getWarehouseEntryBatchId());
-
-            SupplierReturnItemDO supplierReturnItemDO = new SupplierReturnItemDO();
-
-            supplierReturnItemDO.setSupplierReturnId(supplierReturnDO.getId());
-            supplierReturnItemDO.setWarehouseEntryItemId(batchDO.getWarehouseEntryItemId());
-            supplierReturnItemDO.setWarehouseEntryBatchId(batchDO.getId());
-            supplierReturnItemDO.setWarehouseEntryBatchSn(batchDO.getSn());
-            supplierReturnItemDO.setGoodsId(batchDO.getGoodsId());
-            supplierReturnItemDO.setProductId(batchDO.getProductId());
-            supplierReturnItemDO.setProductSn(batchDO.getProductSn());
-            supplierReturnItemDO.setProductName(batchDO.getProductName());
-            supplierReturnItemDO.setProductSpecification(batchDO.getProductSpecification());
-            supplierReturnItemDO.setProductUnit(batchDO.getProductUnit());
-            supplierReturnItemDO.setProductBarcode(batchDO.getProductBarcode());
-            supplierReturnItemDO.setCategoryId(batchDO.getCategoryId());
-            supplierReturnItemDO.setCategoryName(batchDO.getCategoryName());
-            supplierReturnItemDO.setProductPrice(batchDO.getEntryPrice());
-            supplierReturnItemDO.setProductCostPrice(batchDO.getProductCostPrice());
-            supplierReturnItemDO.setTaxRate(batchDO.getTaxRate());
-            supplierReturnItemDO.setEntryNum(batchDO.getEntryNum());
-            supplierReturnItemDO.setReturnNum(supplierReturnItemDTO.getReturnNum());
-
-            return supplierReturnItemDO;
-        }).collect(Collectors.toList());
-    }
-}
-

+ 0 - 40
module-erp/src/main/java/com/hys/app/converter/erp/SupplierSettlementConverter.java

@@ -1,40 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.SupplierSettlementDO;
-import com.hys.app.model.erp.dto.SupplierSettlementDTO;
-import com.hys.app.model.erp.vo.SupplierSettlementVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 供应商结算单 Convert
- *
- * @author 张崧
- * @since 2023-12-15 14:09:09
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface SupplierSettlementConverter {
-
-    SupplierSettlementDO convert(SupplierSettlementDTO supplierSettlementDTO);
-
-    SupplierSettlementVO convert(SupplierSettlementDO supplierSettlementDO);
-
-    List<SupplierSettlementVO> convert(List<SupplierSettlementDO> list);
-
-    WebPage<SupplierSettlementVO> convert(WebPage<SupplierSettlementDO> webPage);
-
-    default WebPage<SupplierSettlementVO> combination(WebPage<SupplierSettlementDO> webPage, Map<Long, String> supplierNameMap) {
-        WebPage<SupplierSettlementVO> page = convert(webPage);
-
-        for (SupplierSettlementVO supplierSettlementVO : page.getData()) {
-            supplierSettlementVO.setSupplierName(supplierNameMap.get(supplierSettlementVO.getSupplierId()));
-        }
-
-        return page;
-    }
-}
-

+ 0 - 15
module-erp/src/main/java/com/hys/app/converter/erp/UserMenuConverter.java

@@ -1,28 +1,13 @@
 package com.hys.app.converter.erp;
 
 import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.base.CharacterConstant;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.GoodsLabelDO;
-import com.hys.app.model.erp.dos.GoodsLabelRelationDO;
 import com.hys.app.model.erp.dos.UserMenuDO;
-import com.hys.app.model.erp.dto.GoodsDTO;
-import com.hys.app.model.erp.dto.ProductDTO;
 import com.hys.app.model.erp.dto.UserMenuDto;
-import com.hys.app.model.erp.vo.GoodsVO;
-import com.hys.app.model.erp.vo.ProductVO;
 import com.hys.app.model.erp.vo.UserMenuVO;
-import com.hys.app.model.goods.dos.BrandDO;
-import com.hys.app.model.goods.dos.GoodsGalleryDO;
-import com.hys.app.model.goods.vo.GoodsParamsGroupVO;
-import com.hys.app.service.base.SensitiveFilter;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingConstants;
 
-import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 import static com.hys.app.framework.util.CollectionUtils.convertMap;
 

+ 0 - 88
module-erp/src/main/java/com/hys/app/converter/erp/WarehouseEntryBatchConverter.java

@@ -1,88 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.util.DateUtil;
-import com.hys.app.model.erp.dos.ProductDO;
-import com.hys.app.model.erp.dos.StockBatchFlowDO;
-import com.hys.app.model.erp.dos.WarehouseEntryBatchDO;
-import com.hys.app.model.erp.dto.StockUpdateDTO;
-import com.hys.app.model.erp.enums.StockChangeSourceEnum;
-import com.hys.app.model.erp.enums.StockOperateEnum;
-import com.hys.app.model.erp.vo.WarehouseEntryBatchVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static com.hys.app.framework.util.CollectionUtils.convertMap;
-
-/**
- * 入库批次 Convert
- *
- * @author 张崧
- * @since 2023-12-08 11:49:52
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface WarehouseEntryBatchConverter {
-
-    List<WarehouseEntryBatchVO> convert(List<WarehouseEntryBatchDO> list);
-
-    WarehouseEntryBatchVO convert(WarehouseEntryBatchDO warehouseEntryBatchDO);
-
-    WebPage<WarehouseEntryBatchVO> convert(WebPage<WarehouseEntryBatchDO> webPage);
-
-    @Mapping(source = "batchDO.id", target = "batchId")
-    @Mapping(source = "batchDO.sn", target = "batchSn")
-    @Mapping(source = "batchDO.entryPrice", target = "productPrice")
-    @Mapping(source = "batchDO.remainNum", target = "batchRemainNum")
-    @Mapping(target = "id", ignore = true)
-    StockBatchFlowDO convertFlow(WarehouseEntryBatchDO batchDO);
-
-    default List<StockBatchFlowDO> convertFlowList(StockChangeSourceEnum sourceType, String sourceSn, List<WarehouseEntryBatchDO> batchList) {
-        long dateline = DateUtil.getDateline();
-        return batchList.stream().map(warehouseEntryBatchDO -> {
-            StockBatchFlowDO stockBatchFlowDO = convertFlow(warehouseEntryBatchDO);
-
-            stockBatchFlowDO.setChangeType(StockOperateEnum.Increase);
-            // 新创建的批次,入库数量就是变更数量
-            stockBatchFlowDO.setChangeNum(warehouseEntryBatchDO.getEntryNum());
-            stockBatchFlowDO.setSourceType(sourceType);
-            stockBatchFlowDO.setSourceSn(sourceSn);
-            stockBatchFlowDO.setCreateTime(dateline);
-
-            return stockBatchFlowDO;
-        }).collect(Collectors.toList());
-    }
-
-    default List<StockBatchFlowDO> convertFlowList(StockChangeSourceEnum sourceType, String sourceSn, Map<Long, WarehouseEntryBatchDO> batchMap, List<StockUpdateDTO> updateStockList) {
-        long dateline = DateUtil.getDateline();
-        return updateStockList.stream().map(stockUpdateDTO -> {
-            WarehouseEntryBatchDO batchDO = batchMap.get(stockUpdateDTO.getBatchId());
-
-            StockBatchFlowDO stockBatchFlowDO = convertFlow(batchDO);
-
-            stockBatchFlowDO.setChangeType(stockUpdateDTO.getOperate());
-            stockBatchFlowDO.setChangeNum(stockUpdateDTO.getChangeNum());
-            stockBatchFlowDO.setSourceType(sourceType);
-            stockBatchFlowDO.setSourceSn(sourceSn);
-            stockBatchFlowDO.setCreateTime(dateline);
-
-            return stockBatchFlowDO;
-        }).collect(Collectors.toList());
-    }
-
-    default WebPage<WarehouseEntryBatchVO> convert(WebPage<WarehouseEntryBatchDO> webPage, List<ProductDO> productList){
-        WebPage<WarehouseEntryBatchVO> convert = convert(webPage);
-        Map<Long, ProductDO> productMap = convertMap(productList, ProductDO::getId, Function.identity());
-
-        for (WarehouseEntryBatchVO batchVO : convert.getData()) {
-            batchVO.setProduct(productMap.get(batchVO.getProductId()));
-        }
-        return convert;
-    }
-}
-

+ 0 - 85
module-erp/src/main/java/com/hys/app/converter/erp/WarehouseEntryConverter.java

@@ -1,85 +0,0 @@
-package com.hys.app.converter.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.util.DateUtil;
-import com.hys.app.model.erp.dos.ProcurementContractProduct;
-import com.hys.app.model.erp.dos.WarehouseEntryBatchDO;
-import com.hys.app.model.erp.dos.WarehouseEntryDO;
-import com.hys.app.model.erp.dos.WarehouseEntryProductDO;
-import com.hys.app.model.erp.dto.WarehouseEntryDTO;
-import com.hys.app.model.erp.enums.NoBusinessTypeEnum;
-import com.hys.app.model.erp.vo.WarehouseEntryBatchVO;
-import com.hys.app.model.erp.vo.WarehouseEntryProductVO;
-import com.hys.app.model.erp.vo.WarehouseEntryVO;
-import com.hys.app.service.erp.NoGenerateManager;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.MappingConstants;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.hys.app.framework.util.CollectionUtils.convertMap;
-
-/**
- * 入库单 Convert
- *
- * @author 张崧
- * @since 2023-12-05 11:25:07
- */
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface WarehouseEntryConverter {
-
-    WarehouseEntryDO convert(WarehouseEntryDTO warehouseEntryDTO);
-
-    WarehouseEntryVO convert(WarehouseEntryDO warehouseEntryDO);
-
-    WebPage<WarehouseEntryVO> convert(WebPage<WarehouseEntryDO> webPage);
-
-    List<WarehouseEntryVO> convert(List<WarehouseEntryDO> list);
-
-    default WarehouseEntryVO combination(WarehouseEntryDO warehouseEntryDO, List<WarehouseEntryProductVO> productList, List<ProcurementContractProduct> contractProductList, List<WarehouseEntryBatchVO> batchList) {
-        WarehouseEntryVO warehouseEntryVO = convert(warehouseEntryDO);
-
-        // 填充已入库数量字段
-        Map<Long, Integer> stockMap = convertMap(contractProductList, ProcurementContractProduct::getProductId, ProcurementContractProduct::getStockNum);
-        productList.forEach(productDetailVO -> productDetailVO.setAlreadyNum(stockMap.get(productDetailVO.getProductId())));
-
-        warehouseEntryVO.setProductList(productList);
-        warehouseEntryVO.setBatchList(batchList);
-        return warehouseEntryVO;
-    }
-
-    default List<WarehouseEntryBatchDO> combination(WarehouseEntryDO warehouseEntryDO, List<WarehouseEntryProductDO> productList, NoGenerateManager noGenerateManager) {
-        long dateline = DateUtil.getDateline();
-        return productList.stream().map(warehouseEntryProductDO -> {
-
-            WarehouseEntryBatchDO warehouseEntryBatchDO = new WarehouseEntryBatchDO();
-            warehouseEntryBatchDO.setWarehouseEntryId(warehouseEntryDO.getId());
-            warehouseEntryBatchDO.setWarehouseEntrySn(warehouseEntryDO.getSn());
-            warehouseEntryBatchDO.setWarehouseEntryItemId(warehouseEntryProductDO.getId());
-//            warehouseEntryBatchDO.setSn(noGenerateManager.generate(NoBusinessTypeEnum.WarehouseEntryBatch, warehouseEntryDO.getDeptId()));
-            warehouseEntryBatchDO.setWarehouseId(warehouseEntryDO.getWarehouseId());
-            warehouseEntryBatchDO.setGoodsId(warehouseEntryProductDO.getGoodsId());
-            warehouseEntryBatchDO.setProductId(warehouseEntryProductDO.getProductId());
-            warehouseEntryBatchDO.setProductSn(warehouseEntryProductDO.getSn());
-            warehouseEntryBatchDO.setProductName(warehouseEntryProductDO.getName());
-            warehouseEntryBatchDO.setProductUnit(warehouseEntryProductDO.getUnit());
-            warehouseEntryBatchDO.setProductBarcode(warehouseEntryProductDO.getProductBarcode());
-            warehouseEntryBatchDO.setCategoryId(warehouseEntryProductDO.getCategoryId());
-            warehouseEntryBatchDO.setCategoryName(warehouseEntryProductDO.getCategoryName());
-            warehouseEntryBatchDO.setProductSpecification(warehouseEntryProductDO.getSpecification());
-            warehouseEntryBatchDO.setEntryNum(warehouseEntryProductDO.getNum());
-            warehouseEntryBatchDO.setEntryPrice(warehouseEntryProductDO.getContractPrice());
-            warehouseEntryBatchDO.setProductCostPrice(warehouseEntryProductDO.getCostPrice());
-            warehouseEntryBatchDO.setTaxRate(warehouseEntryProductDO.getTaxRate());
-            warehouseEntryBatchDO.setRemainNum(warehouseEntryProductDO.getNum());
-            warehouseEntryBatchDO.setEntryTime(dateline);
-
-            return warehouseEntryBatchDO;
-
-        }).collect(Collectors.toList());
-    }
-}
-

+ 0 - 5
module-erp/src/main/java/com/hys/app/converter/erp/WarehouseOutItemConverter.java

@@ -1,16 +1,11 @@
 package com.hys.app.converter.erp;
 
 import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dos.OrderDO;
-import com.hys.app.model.erp.dos.OrderItemDO;
-import com.hys.app.model.erp.dos.WarehouseEntryBatchDO;
 import com.hys.app.model.erp.dos.WarehouseOutItemDO;
-import com.hys.app.model.erp.dto.WarehouseOutDTO;
 import com.hys.app.model.erp.vo.WarehouseOutItemVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingConstants;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**

+ 1 - 8
module-erp/src/main/java/com/hys/app/framework/datapermission/DataPermissionTableCustomizer.java

@@ -21,22 +21,15 @@ public class DataPermissionTableCustomizer {
             rule.addDeptColumn(AdminUser.class);
             // 仓库管理
             rule.addDeptColumn(WarehouseDO.class);
-            // 采购计划管理
-            rule.addDeptColumn(ProcurementPlan.class);
             // 入库单管理
             rule.addDeptColumn(WarehouseEntryDO.class);
             // 出库单管理
             rule.addDeptColumn(WarehouseOutDO.class);
-            // 供应商退货
-            rule.addDeptColumn(SupplierReturnDO.class);
+
             // 订单退货
             rule.addDeptColumn(OrderReturnDO.class);
             // 订单
             rule.addDeptColumn(OrderDO.class);
-            // 借出单
-            rule.addDeptColumn(LendForm.class);
-            // 换货单
-            rule.addDeptColumn(ChangeForm.class);
             // 库存报损单
             rule.addDeptColumn(StockDamageReport.class);
             // 库存盘点单

+ 0 - 12
module-erp/src/main/java/com/hys/app/mapper/erp/AreaStockMapper.java

@@ -1,19 +1,7 @@
 package com.hys.app.mapper.erp;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.cache.MybatisRedisCache;
 import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
 import com.hys.app.model.erp.dos.AreaStock;
-import com.hys.app.model.erp.dos.ChangeForm;
-import com.hys.app.model.erp.dos.WarehouseAreaDO;
-import com.hys.app.model.erp.dto.ChangeFormStatisticsQueryParam;
-import com.hys.app.model.erp.vo.ChangeFormStatistics;
-import org.apache.ibatis.annotations.CacheNamespace;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * 换货单Mapper

+ 0 - 39
module-erp/src/main/java/com/hys/app/mapper/erp/ChangeFormMapper.java

@@ -1,39 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.erp.dos.ChangeForm;
-import com.hys.app.model.erp.dto.ChangeFormStatisticsQueryParam;
-import com.hys.app.model.erp.vo.ChangeFormStatistics;
-import org.apache.ibatis.annotations.CacheNamespace;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 换货单Mapper
- * @author dmy
- * 2023-12-05
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface ChangeFormMapper extends BaseMapper<ChangeForm> {
-
-    /**
-     * 查询商品换货单商品统计分页列表数据
-     *
-     * @param page 分页参数
-     * @param param 查询参数
-     * @return
-     */
-    IPage<ChangeFormStatistics> selectFormPage(Page page, @Param("param") ChangeFormStatisticsQueryParam param);
-
-    /**
-     * 查询换货单商品统计信息集合
-     *
-     * @param param 查询参数
-     * @return
-     */
-    List<ChangeFormStatistics> selectFormList(@Param("param") ChangeFormStatisticsQueryParam param);
-}

+ 0 - 3
module-erp/src/main/java/com/hys/app/mapper/erp/CustomerMapper.java

@@ -1,12 +1,9 @@
 package com.hys.app.mapper.erp;
 
 import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.database.mybatisplus.base.BaseDO;
 import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
 import com.hys.app.model.erp.dos.CustomerDO;
-import com.hys.app.model.erp.dos.GoodsLabelDO;
 import com.hys.app.model.erp.dto.CustomerQueryParams;
-import com.hys.app.model.erp.dto.GoodsLabelQueryParams;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

+ 0 - 41
module-erp/src/main/java/com/hys/app/mapper/erp/EnterpriseMapper.java

@@ -1,41 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import org.apache.ibatis.annotations.Mapper;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.framework.database.mybatisplus.base.BaseDO;
-import com.hys.app.model.erp.dos.EnterpriseDO;
-import com.hys.app.model.erp.dto.EnterpriseQueryParams;
-import com.hys.app.framework.database.WebPage;
-
-/**
- * 企业 Mapper
- *
- * @author 张崧
- * 2024-03-25 15:44:10
- */
-@Mapper
-public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
-
-    default WebPage<EnterpriseDO> selectPage(EnterpriseQueryParams params) {
-        return lambdaQuery()
-                .likeIfPresent(EnterpriseDO::getName, params.getName())
-                .likeIfPresent(EnterpriseDO::getSn, params.getSn())
-                .likeIfPresent(EnterpriseDO::getMobile, params.getMobile())
-                .likeIfPresent(EnterpriseDO::getEmail, params.getEmail())
-                .eqIfPresent(EnterpriseDO::getZipCode, params.getZipCode())
-                .likeIfPresent(EnterpriseDO::getTaxNum, params.getTaxNum())
-                .eqIfPresent(EnterpriseDO::getBankName, params.getBankName())
-                .eqIfPresent(EnterpriseDO::getAddress, params.getAddress())
-                .eqIfPresent(EnterpriseDO::getLinkman, params.getLinkman())
-                .eqIfPresent(EnterpriseDO::getLinkPhone, params.getLinkPhone())
-                .eqIfPresent(EnterpriseDO::getFax, params.getFax())
-                .eqIfPresent(EnterpriseDO::getBankAccount, params.getBankAccount())
-                .eqIfPresent(EnterpriseDO::getBankAccountName, params.getBankAccountName())
-                .eqIfPresent(EnterpriseDO::getRemark, params.getRemark())
-                .betweenIfPresent(BaseDO::getCreateTime, params.getCreateTime())
-                .orderByDesc(EnterpriseDO::getId)
-                .page(params);
-    }
-
-}
-

+ 0 - 28
module-erp/src/main/java/com/hys/app/mapper/erp/GoodsLabelMapper.java

@@ -1,28 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import org.apache.ibatis.annotations.Mapper;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.framework.database.mybatisplus.base.BaseDO;
-import com.hys.app.model.erp.dos.GoodsLabelDO;
-import com.hys.app.model.erp.dto.GoodsLabelQueryParams;
-import com.hys.app.framework.database.WebPage;
-
-/**
- * 商品标签 Mapper
- *
- * @author 张崧
- * 2024-03-20 16:23:19
- */
-@Mapper
-public interface GoodsLabelMapper extends BaseMapperX<GoodsLabelDO> {
-
-    default WebPage<GoodsLabelDO> selectPage(GoodsLabelQueryParams params) {
-        return lambdaQuery()
-                .likeIfPresent(GoodsLabelDO::getName, params.getName())
-                .betweenIfPresent(BaseDO::getCreateTime, params.getCreateTime())
-                .orderByDesc(GoodsLabelDO::getId)
-                .page(params);
-    }
-
-}
-

+ 0 - 34
module-erp/src/main/java/com/hys/app/mapper/erp/GoodsLabelRelationMapper.java

@@ -1,34 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.hys.app.framework.database.mybatisplus.wrapper.MPJLambdaWrapperX;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.GoodsLabelDO;
-import com.hys.app.model.erp.vo.GoodsLabelRelationVO;
-import org.apache.ibatis.annotations.Mapper;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.GoodsLabelRelationDO;
-import com.hys.app.model.erp.dto.GoodsLabelRelationQueryParams;
-import com.hys.app.framework.database.WebPage;
-
-/**
- * 商品标签-商品关联表 Mapper
- *
- * @author 张崧
- * 2024-03-20 16:29:17
- */
-@Mapper
-public interface GoodsLabelRelationMapper extends BaseMapperX<GoodsLabelRelationDO> {
-
-    default WebPage<GoodsLabelRelationVO> selectPage(GoodsLabelRelationQueryParams params) {
-        return selectJoinPage(params, GoodsLabelRelationVO.class, new MPJLambdaWrapperX<GoodsLabelRelationDO>()
-                .leftJoin(GoodsDO.class, GoodsDO::getId, GoodsLabelRelationDO::getGoodsId)
-                .leftJoin(GoodsLabelDO.class, GoodsLabelDO::getId, GoodsLabelRelationDO::getLabelId)
-                .selectAll(GoodsDO.class)
-                .selectAs(GoodsLabelDO::getName, GoodsLabelRelationVO::getLabelName)
-                .eqIfPresent(GoodsLabelRelationDO::getLabelId, params.getLabelId())
-                .orderByDesc(GoodsLabelRelationDO::getId)
-        );
-    }
-
-}
-

+ 0 - 15
module-erp/src/main/java/com/hys/app/mapper/erp/LendFormMapper.java

@@ -1,15 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.erp.dos.LendForm;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 商品借出单Mapper
- * @author dmy
- * 2023-12-05
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface LendFormMapper extends BaseMapper<LendForm> {
-}

+ 0 - 29
module-erp/src/main/java/com/hys/app/mapper/erp/OrderPaymentMapper.java

@@ -1,29 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import org.apache.ibatis.annotations.Mapper;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.OrderPaymentDO;
-import com.hys.app.model.erp.dto.OrderPaymentQueryParams;
-import com.hys.app.framework.database.WebPage;
-
-/**
- * 订单支付明细 Mapper
- *
- * @author 张崧
- * 2024-01-24 17:00:32
- */
-@Mapper
-public interface OrderPaymentMapper extends BaseMapperX<OrderPaymentDO> {
-
-    default WebPage<OrderPaymentDO> selectPage(OrderPaymentQueryParams params) {
-        return lambdaQuery()
-                .eqIfPresent(OrderPaymentDO::getOrderId, params.getOrderId())
-                .eqIfPresent(OrderPaymentDO::getCollectingAccountId, params.getCollectingAccountId())
-                .eqIfPresent(OrderPaymentDO::getCollectingAccountName, params.getCollectingAccountName())
-                .eqIfPresent(OrderPaymentDO::getRemark, params.getRemark())
-                .orderByDesc(OrderPaymentDO::getId)
-                .page(params);
-    }
-
-}
-

+ 0 - 15
module-erp/src/main/java/com/hys/app/mapper/erp/ProcurementContractMapper.java

@@ -1,15 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.erp.dos.ProcurementContract;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 采购合同Mapper
- * @author dmy
- * 2023-12-05
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface ProcurementContractMapper extends BaseMapper<ProcurementContract> {
-}

+ 0 - 15
module-erp/src/main/java/com/hys/app/mapper/erp/ProcurementPlanMapper.java

@@ -1,15 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.erp.dos.ProcurementPlan;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 采购计划Mapper
- * @author dmy
- * 2023-12-05
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface ProcurementPlanMapper extends BaseMapper<ProcurementPlan> {
-}

+ 0 - 15
module-erp/src/main/java/com/hys/app/mapper/erp/ProcurementPlanProductMapper.java

@@ -1,15 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.erp.dos.ProcurementPlanProduct;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 采购计划产品Mapper
- * @author dmy
- * 2023-12-05
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface ProcurementPlanProductMapper extends BaseMapper<ProcurementPlanProduct> {
-}

+ 0 - 42
module-erp/src/main/java/com/hys/app/mapper/erp/StockBatchFlowMapper.java

@@ -1,42 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import org.apache.ibatis.annotations.Mapper;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.StockBatchFlowDO;
-import com.hys.app.model.erp.dto.StockBatchFlowQueryParams;
-import com.hys.app.framework.database.WebPage;
-
-/**
- * 库存批次流水 Mapper
- *
- * @author 张崧
- * 2024-01-16 11:39:01
- */
-@Mapper
-public interface StockBatchFlowMapper extends BaseMapperX<StockBatchFlowDO> {
-
-    default WebPage<StockBatchFlowDO> selectPage(StockBatchFlowQueryParams params) {
-        return lambdaQuery()
-                .eqIfPresent(StockBatchFlowDO::getWarehouseEntryId, params.getWarehouseEntryId())
-                .eqIfPresent(StockBatchFlowDO::getWarehouseEntrySn, params.getWarehouseEntrySn())
-                .eqIfPresent(StockBatchFlowDO::getBatchId, params.getBatchId())
-                .eqIfPresent(StockBatchFlowDO::getBatchSn, params.getBatchSn())
-                .eqIfPresent(StockBatchFlowDO::getWarehouseId, params.getWarehouseId())
-                .eqIfPresent(StockBatchFlowDO::getGoodsId, params.getGoodsId())
-                .eqIfPresent(StockBatchFlowDO::getProductId, params.getProductId())
-                .eqIfPresent(StockBatchFlowDO::getProductSn, params.getProductSn())
-                .eqIfPresent(StockBatchFlowDO::getProductName, params.getProductName())
-                .eqIfPresent(StockBatchFlowDO::getProductSpecification, params.getProductSpecification())
-                .eqIfPresent(StockBatchFlowDO::getProductUnit, params.getProductUnit())
-                .eqIfPresent(StockBatchFlowDO::getProductBarcode, params.getProductBarcode())
-                .eqIfPresent(StockBatchFlowDO::getCategoryId, params.getCategoryId())
-                .eqIfPresent(StockBatchFlowDO::getCategoryName, params.getCategoryName())
-                .eqIfPresent(StockBatchFlowDO::getSourceType, params.getSourceType())
-                .eqIfPresent(StockBatchFlowDO::getSourceSn, params.getSourceSn())
-                .betweenIfPresent(StockBatchFlowDO::getCreateTime, params.getCreateTime())
-                .orderByDesc(StockBatchFlowDO::getId)
-                .page(params);
-    }
-
-}
-

+ 0 - 38
module-erp/src/main/java/com/hys/app/mapper/erp/StockStatisticsMapper.java

@@ -1,38 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.erp.dos.StockStatistics;
-import com.hys.app.model.erp.dto.StockStatisticsQueryParam;
-import org.apache.ibatis.annotations.CacheNamespace;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 库存统计Mapper
- *
- * @author dmy
- * 2023-12-05
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface StockStatisticsMapper extends BaseMapper<StockStatistics> {
-
-    /**
-     * 查询商品库存统计信息
-     * @param objectPage
-     * @param params
-     * @return
-     */
-    IPage<StockStatistics> selectStockStatisticsPage(Page<Object> objectPage, @Param("param") StockStatisticsQueryParam params);
-
-    /**
-     * 查询商品库存统计信息
-     * @param params
-     * @return
-     */
-    List<StockStatistics> selectStockStatisticsPage(@Param("param") StockStatisticsQueryParam params);
-
-}

+ 0 - 18
module-erp/src/main/java/com/hys/app/mapper/erp/StockTransferMapper.java

@@ -9,7 +9,6 @@ import com.hys.app.model.erp.dos.StockTransferDO;
 import com.hys.app.model.erp.dto.StockTransferQueryParams;
 import com.hys.app.framework.database.WebPage;
 import com.hys.app.model.erp.dto.StockTransferStatisticsParam;
-import com.hys.app.model.erp.vo.StockTransferStatistics;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -40,22 +39,5 @@ public interface StockTransferMapper extends BaseMapperX<StockTransferDO> {
                 .orderByDesc(StockTransferDO::getTransferTime)
                 .page(params);
     }
-
-    /**
-     * 查询库存调拨统计分页列表数据
-     *
-     * @param page 分页参数
-     * @param param 查询参数
-     * @return
-     */
-    IPage<StockTransferStatistics> selectStockTransferPage(Page page, @Param("param") StockTransferStatisticsParam param);
-
-    /**
-     * 导出库存调拨统计列表
-     *
-     * @param param 查询参数
-     * @return
-     */
-    List<StockTransferStatistics> selectStockTransferList(@Param("param") StockTransferStatisticsParam param);
 }
 

+ 0 - 48
module-erp/src/main/java/com/hys/app/mapper/erp/SupplierMapper.java

@@ -1,48 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.SupplierDO;
-import com.hys.app.model.erp.dto.SupplierQueryParams;
-import com.hys.app.framework.database.WebPage;
-
-import java.util.List;
-
-/**
- * 供应商的Mapper
- *
- * @author 张崧
- * 2023-11-29 14:20:18
- */
-public interface SupplierMapper extends BaseMapperX<SupplierDO> {
-
-    default WebPage<SupplierDO> selectPage(SupplierQueryParams params) {
-        return lambdaQuery()
-                .likeIfPresent(SupplierDO::getCustomName, params.getKeyword())
-                .likeIfPresent(SupplierDO::getCustomName, params.getCustomName())
-                .likeIfPresent(SupplierDO::getCustomSn, params.getCustomSn())
-                .likeIfPresent(SupplierDO::getTransfer, params.getTransfer())
-                .likeIfPresent(SupplierDO::getZipcode, params.getZipcode())
-                .likeIfPresent(SupplierDO::getPostalAddress, params.getPostalAddress())
-                .likeIfPresent(SupplierDO::getTelephone, params.getTelephone())
-                .likeIfPresent(SupplierDO::getCompanyWebsite, params.getCompanyWebsite())
-                .likeIfPresent(SupplierDO::getLinkman, params.getLinkman())
-                .likeIfPresent(SupplierDO::getEmail, params.getEmail())
-                .likeIfPresent(SupplierDO::getMobile, params.getMobile())
-                .likeIfPresent(SupplierDO::getProductionAddress, params.getProductionAddress())
-                .likeIfPresent(SupplierDO::getRemark, params.getRemark())
-                .orderByDesc(SupplierDO::getId)
-                .page(params);
-    }
-
-    default List<SupplierDO> selectNormalStatusList(){
-        return lambdaQuery()
-                .eq(SupplierDO::getDisableFlag, false)
-                .orderByDesc(SupplierDO::getId)
-                .list();
-    }
-
-    default void updateDisable(Long id, Boolean disable){
-        lambdaUpdate().set(SupplierDO::getDisableFlag, disable).eq(SupplierDO::getId, id).update();
-    }
-}
-

+ 0 - 33
module-erp/src/main/java/com/hys/app/mapper/erp/SupplierReturnItemMapper.java

@@ -1,33 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.SupplierReturnItemDO;
-import com.hys.app.model.erp.dto.SupplierReturnItemQueryParams;
-import com.hys.app.framework.database.WebPage;
-
-/**
- * 供应商退货项的Mapper
- *
- * @author 张崧
- * @since 2023-12-14 11:12:46
- */
-public interface SupplierReturnItemMapper extends BaseMapperX<SupplierReturnItemDO> {
-
-    default WebPage<SupplierReturnItemDO> selectPage(SupplierReturnItemQueryParams params) {
-        return lambdaQuery()
-                .eqIfPresent(SupplierReturnItemDO::getSupplierReturnId, params.getSupplierReturnId())
-                .eqIfPresent(SupplierReturnItemDO::getWarehouseEntryBatchId, params.getWarehouseEntryBatchId())
-                .eqIfPresent(SupplierReturnItemDO::getWarehouseEntryBatchSn, params.getWarehouseEntryBatchSn())
-                .eqIfPresent(SupplierReturnItemDO::getProductId, params.getProductId())
-                .eqIfPresent(SupplierReturnItemDO::getProductSn, params.getProductSn())
-                .eqIfPresent(SupplierReturnItemDO::getProductName, params.getProductName())
-                .eqIfPresent(SupplierReturnItemDO::getProductSpecification, params.getProductSpecification())
-                .eqIfPresent(SupplierReturnItemDO::getProductPrice, params.getProductPrice())
-                .eqIfPresent(SupplierReturnItemDO::getEntryNum, params.getEntryNum())
-                .eqIfPresent(SupplierReturnItemDO::getReturnNum, params.getReturnNum())
-                .orderByDesc(SupplierReturnItemDO::getId)
-                .page(params);
-    }
-
-}
-

+ 0 - 60
module-erp/src/main/java/com/hys/app/mapper/erp/SupplierReturnMapper.java

@@ -1,60 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.SupplierReturnDO;
-import com.hys.app.model.erp.dto.SupplierReturnQueryParams;
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.model.erp.dto.SupplierReturnStatisticsParam;
-import com.hys.app.model.erp.vo.SupplierReturnStatistics;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 供应商退货的Mapper
- *
- * @author 张崧
- * @since 2023-12-14 11:12:46
- */
-public interface SupplierReturnMapper extends BaseMapperX<SupplierReturnDO> {
-
-    default WebPage<SupplierReturnDO> selectPage(SupplierReturnQueryParams params) {
-        return lambdaQuery()
-                .likeIfPresent(SupplierReturnDO::getSn, params.getSn())
-                .eqIfPresent(SupplierReturnDO::getDeptId, params.getDeptId())
-                .eqIfPresent(SupplierReturnDO::getWarehouseEntryId, params.getWarehouseEntryId())
-                .likeIfPresent(SupplierReturnDO::getWarehouseEntrySn, params.getWarehouseEntrySn())
-                .eqIfPresent(SupplierReturnDO::getWarehouseId, params.getWarehouseId())
-                .eqIfPresent(SupplierReturnDO::getSupplierId, params.getSupplierId())
-                .eqIfPresent(SupplierReturnDO::getContractId, params.getContractId())
-                .likeIfPresent(SupplierReturnDO::getHandleByName, params.getHandleBy())
-                .eqIfPresent(SupplierReturnDO::getAttachment, params.getAttachment())
-                .eqIfPresent(SupplierReturnDO::getReturnTime, params.getReturnTime())
-                .eqIfPresent(SupplierReturnDO::getStatus, params.getStatus())
-                .eqIfPresent(SupplierReturnDO::getAuditRemark, params.getAuditRemark())
-                .geIfPresent(SupplierReturnDO::getReturnTime, params.getStartTime())
-                .leIfPresent(SupplierReturnDO::getReturnTime, params.getEndTime())
-                .orderByDesc(SupplierReturnDO::getReturnTime)
-                .page(params);
-    }
-
-    /**
-     * 查询供应商退货统计分页列表数据
-     *
-     * @param page 分页参数
-     * @param param 查询参数
-     * @return
-     */
-    IPage<SupplierReturnStatistics> selectSupplierReturnPage(Page page, @Param("param") SupplierReturnStatisticsParam param);
-
-    /**
-     * 导出供应商退货统计列表
-     *
-     * @param param 查询参数
-     * @return
-     */
-    List<SupplierReturnStatistics> selectSupplierReturnList(@Param("param") SupplierReturnStatisticsParam param);
-}
-

+ 0 - 28
module-erp/src/main/java/com/hys/app/mapper/erp/SupplierSettlementMapper.java

@@ -1,28 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.SupplierSettlementDO;
-import com.hys.app.model.erp.dto.SupplierSettlementQueryParams;
-import com.hys.app.framework.database.WebPage;
-
-/**
- * 供应商结算单的Mapper
- *
- * @author 张崧
- * @since 2023-12-15 14:09:09
- */
-public interface SupplierSettlementMapper extends BaseMapperX<SupplierSettlementDO> {
-
-    default WebPage<SupplierSettlementDO> selectPage(SupplierSettlementQueryParams params) {
-        return lambdaQuery()
-                .eqIfPresent(SupplierSettlementDO::getSn, params.getSn())
-                .eqIfPresent(SupplierSettlementDO::getSupplierId, params.getSupplierId())
-                .geIfPresent(SupplierSettlementDO::getCreateTime, params.getStartTime())
-                .leIfPresent(SupplierSettlementDO::getCreateTime, params.getEndTime())
-                .eqIfPresent(SupplierSettlementDO::getTotalPrice, params.getTotalPrice())
-                .orderByDesc(SupplierSettlementDO::getId)
-                .page(params);
-    }
-
-}
-

+ 0 - 44
module-erp/src/main/java/com/hys/app/mapper/erp/WarehouseEntryBatchMapper.java

@@ -1,44 +0,0 @@
-package com.hys.app.mapper.erp;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.framework.util.StringUtil;
-import com.hys.app.model.erp.dos.WarehouseEntryBatchDO;
-import com.hys.app.model.erp.dto.WarehouseEntryBatchQueryParams;
-
-import java.util.List;
-
-/**
- * 入库批次的Mapper
- *
- * @author 张崧
- * @since 2023-12-08 11:49:52
- */
-public interface WarehouseEntryBatchMapper extends BaseMapperX<WarehouseEntryBatchDO> {
-
-    default WebPage<WarehouseEntryBatchDO> selectPage(WarehouseEntryBatchQueryParams params) {
-        return lambdaQuery()
-                .andX(StringUtil.notEmpty(params.getKeyword()),
-                        w -> w.like(WarehouseEntryBatchDO::getProductName, params.getKeyword()).or()
-                                .like(WarehouseEntryBatchDO::getProductSn, params.getKeyword()))
-                .eqIfPresent(WarehouseEntryBatchDO::getWarehouseEntryId, params.getWarehouseEntryId())
-                .likeIfPresent(WarehouseEntryBatchDO::getWarehouseEntrySn, params.getWarehouseEntrySn())
-                .likeIfPresent(WarehouseEntryBatchDO::getSn, params.getSn())
-                .eqIfPresent(WarehouseEntryBatchDO::getWarehouseId, params.getWarehouseId())
-                .eqIfPresent(WarehouseEntryBatchDO::getProductId, params.getProductId())
-                .orderByDesc(WarehouseEntryBatchDO::getId)
-                .page(params);
-    }
-
-    default List<WarehouseEntryBatchDO> listAll(WarehouseEntryBatchQueryParams params) {
-        return lambdaQuery()
-                .eqIfPresent(WarehouseEntryBatchDO::getWarehouseEntryId, params.getWarehouseEntryId())
-                .likeIfPresent(WarehouseEntryBatchDO::getWarehouseEntrySn, params.getWarehouseEntrySn())
-                .likeIfPresent(WarehouseEntryBatchDO::getSn, params.getSn())
-                .eqIfPresent(WarehouseEntryBatchDO::getWarehouseId, params.getWarehouseId())
-                .eqIfPresent(WarehouseEntryBatchDO::getProductId, params.getProductId())
-                .orderByDesc(WarehouseEntryBatchDO::getId)
-                .list();
-    }
-}
-

+ 0 - 39
module-erp/src/main/java/com/hys/app/mapper/goods/BrandMapper.java

@@ -1,39 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.BrandDO;
-import com.hys.app.model.goods.vo.SelectVO;
-import org.apache.ibatis.annotations.CacheNamespace;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-
-/**
- * 品牌BrandDO的Mapper
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface BrandMapper extends BaseMapper<BrandDO> {
-
-    /**
-     * 查询某分类下的品牌
-     *
-     * @param categoryId 分类id
-     * @return
-     */
-    List<BrandDO> getBrandsByCategory(@Param("category_id") Long categoryId);
-
-    /**
-     * 查询分类品牌,所有品牌,分类绑定的品牌为已选中状态
-     *
-     * @param categoryId 分类id
-     * @return
-     */
-    List<SelectVO> getCatBrand(@Param("category_id")Long categoryId);
-
-}

+ 0 - 17
module-erp/src/main/java/com/hys/app/mapper/goods/CategoryBrandMapper.java

@@ -1,17 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.CategoryBrandDO;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * CategoryBrand的Mapper
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface CategoryBrandMapper extends BaseMapper<CategoryBrandDO> {
-}

+ 0 - 19
module-erp/src/main/java/com/hys/app/mapper/goods/CategoryMapper.java

@@ -1,19 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.CategoryDO;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 分类Category的Mapper
- *
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation = MybatisRedisCache.class, eviction = MybatisRedisCache.class)
-public interface CategoryMapper extends BaseMapper<CategoryDO> {
-
-}

+ 0 - 17
module-erp/src/main/java/com/hys/app/mapper/goods/CategorySpecMapper.java

@@ -1,17 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.CategorySpecDO;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * CategorySpec的Mapper
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface CategorySpecMapper extends BaseMapper<CategorySpecDO> {
-}

+ 0 - 17
module-erp/src/main/java/com/hys/app/mapper/goods/GoodsGalleryMapper.java

@@ -1,17 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.GoodsGalleryDO;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * GoodsGallery的Mapper
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface GoodsGalleryMapper extends BaseMapper<GoodsGalleryDO> {
-}

+ 0 - 31
module-erp/src/main/java/com/hys/app/mapper/goods/GoodsMapper.java

@@ -1,31 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.hys.app.framework.context.user.AdminUserContext;
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.framework.util.StringUtil;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dto.GoodsQueryParams;
-
-/**
- * 商品的Mapper
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-public interface GoodsMapper extends BaseMapperX<GoodsDO> {
-
-    default WebPage<GoodsDO> selectPage(GoodsQueryParams params) {
-        return lambdaQuery()
-                .andX(StringUtil.notEmpty(params.getKeyword()),
-                        w -> w.like(GoodsDO::getName, params.getKeyword()).or().like(GoodsDO::getSn, params.getKeyword()))
-                .eqIfPresent(GoodsDO::getSn, params.getSn())
-                .eqIfPresent(GoodsDO::getName, params.getName())
-                .eqIfPresent(GoodsDO::getCompanyId, AdminUserContext.getCompanyId())
-                .eqIfPresent(GoodsDO::getCategoryId, params.getCategoryId())
-                .orderByDesc(GoodsDO::getSort)
-                .page(params);
-    }
-
-}
-

+ 0 - 38
module-erp/src/main/java/com/hys/app/mapper/goods/GoodsParamsMapper.java

@@ -1,38 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.GoodsParamsDO;
-import com.hys.app.model.goods.vo.GoodsParamsVO;
-import org.apache.ibatis.annotations.CacheNamespace;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * GoodsParams的Mapper
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface GoodsParamsMapper extends BaseMapper<GoodsParamsDO> {
-
-
-    /**
-     * 查询商品关联的参数及参数值
-     * @param categoryId 分类id
-     * @param goodsId 商品id
-     * @return
-     */
-    List<GoodsParamsVO> queryGoodsParamsValue(@Param("category_id") Long categoryId, @Param("goods_id")Long goodsId);
-
-    /**
-     * 查询商品关联的可检索的参数值
-     * @param ids id集合
-     * @return
-     */
-    List<Map<String, Object>> getIndexGoodsList(@Param("params") List<Object> ids);
-}

+ 0 - 50
module-erp/src/main/java/com/hys/app/mapper/goods/GoodsSnMapper.java

@@ -1,50 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.framework.util.StringUtil;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.GoodsSnDO;
-import com.hys.app.model.erp.dto.GoodsQueryParams;
-import com.hys.app.model.erp.dto.GoodsSnQueryParams;
-import com.hys.app.model.goods.vo.GoodsParamsVO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 商品的Mapper
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-public interface GoodsSnMapper extends BaseMapperX<GoodsSnDO> {
-
-    default WebPage<GoodsSnDO> selectPage(GoodsSnQueryParams params) {
-        return lambdaQuery()
-                .likeIfPresent(GoodsSnDO::getSnCode, params.getSnCode())
-                .likeIfPresent(GoodsSnDO::getSku, params.getSku())
-                .eqIfPresent(GoodsSnDO::getStatus, params.getStatus())
-                .orderByDesc(GoodsSnDO::getId)
-                .page(params);
-    }
-
-
-
-    /**
-     * 查询商品关联的参数及参数值
-     * @return
-     */
-    List<GoodsSnDO> getGoodsSnCount(@Param("request")GoodsSnQueryParams params);
-
-    /**
-     * 查询商品关联的参数及参数值
-     * @return
-     */
-    Long getGoodsSnCountQty(@Param("request")GoodsSnQueryParams params);
-
-
-
-
-}
-

+ 0 - 18
module-erp/src/main/java/com/hys/app/mapper/goods/LogisticsCompanyMapper.java

@@ -1,18 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.system.dos.LogisticsCompanyDO;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-
-/**
- * 物流公司的Mapper
- * @author zhanghao
- * @version v1.0
- * @since v7.2.2
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface LogisticsCompanyMapper extends BaseMapper<LogisticsCompanyDO> {
-}

+ 0 - 17
module-erp/src/main/java/com/hys/app/mapper/goods/ParameterGroupMapper.java

@@ -1,17 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.ParameterGroupDO;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * ParameterGroup的Mapper
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface ParameterGroupMapper extends BaseMapper<ParameterGroupDO> {
-}

+ 0 - 29
module-erp/src/main/java/com/hys/app/mapper/goods/ParametersMapper.java

@@ -1,29 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.ParametersDO;
-import com.hys.app.model.goods.vo.GoodsParamsVO;
-import org.apache.ibatis.annotations.CacheNamespace;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * Parameters的Mapper
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface ParametersMapper extends BaseMapper<ParametersDO> {
-
-
-    /**
-     * 查询分类关联的参数
-     * @param categoryId 分类id
-     * @return
-     */
-    List<GoodsParamsVO> queryParams(@Param("category_id") Long categoryId);
-}

+ 0 - 21
module-erp/src/main/java/com/hys/app/mapper/goods/PayTypeMapper.java

@@ -1,21 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.hys.app.framework.database.WebPage;
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.framework.util.StringUtil;
-import com.hys.app.model.erp.dos.GoodsDO;
-import com.hys.app.model.erp.dos.PayTypeDO;
-import com.hys.app.model.erp.dto.GoodsQueryParams;
-
-/**
- * 商品的Mapper
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-public interface PayTypeMapper extends BaseMapperX<PayTypeDO> {
-
-
-
-}
-

+ 0 - 16
module-erp/src/main/java/com/hys/app/mapper/goods/ProductGroupItemMapper.java

@@ -1,16 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.ProductGroupDO;
-import com.hys.app.model.erp.dos.ProductGroupItemDO;
-
-/**
- * 商品的Mapper
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-public interface ProductGroupItemMapper extends BaseMapperX<ProductGroupItemDO> {
-
-}
-

+ 0 - 15
module-erp/src/main/java/com/hys/app/mapper/goods/ProductGroupMapper.java

@@ -1,15 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.hys.app.framework.database.mybatisplus.base.BaseMapperX;
-import com.hys.app.model.erp.dos.ProductGroupDO;
-
-/**
- * 商品的Mapper
- *
- * @author 张崧
- * 2023-12-26 15:56:58
- */
-public interface ProductGroupMapper extends BaseMapperX<ProductGroupDO> {
-
-}
-

+ 0 - 19
module-erp/src/main/java/com/hys/app/mapper/goods/ShipTemplateChildMapper.java

@@ -1,19 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.system.dos.ShipTemplateChild;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * 运费模版详细配置Mapper接口
- *
- * @author duanmingyu
- * @version v1.0
- * @since v7.2.2
- * 2020-07-28
- */
-@CacheNamespace(implementation = MybatisRedisCache.class, eviction = MybatisRedisCache.class)
-public interface ShipTemplateChildMapper extends BaseMapper<ShipTemplateChild> {
-
-}

+ 0 - 27
module-erp/src/main/java/com/hys/app/mapper/goods/ShipTemplateMapper.java

@@ -1,27 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.system.dos.ShipTemplateDO;
-import com.hys.app.model.system.vo.ShipTemplateSellerVO;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-import java.util.List;
-
-/**
- * 运费模版Mapper接口
- * @author duanmingyu
- * @version v1.0
- * @since v7.2.2
- * 2020-07-28
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface ShipTemplateMapper extends BaseMapper<ShipTemplateDO> {
-
-    /**
-     * 根据店铺id获取店铺运费模板集合
-     * @return
-     */
-    List<ShipTemplateSellerVO> selectShipTemplateList();
-
-}

+ 0 - 17
module-erp/src/main/java/com/hys/app/mapper/goods/SpecValuesMapper.java

@@ -1,17 +0,0 @@
-package com.hys.app.mapper.goods;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hys.app.framework.cache.MybatisRedisCache;
-import com.hys.app.model.goods.dos.SpecValuesDO;
-import org.apache.ibatis.annotations.CacheNamespace;
-
-/**
- * SpecValues的Mapper
- * @author fk
- * @version 1.0
- * @since 7.1.0
- * 2020/7/21
- */
-@CacheNamespace(implementation= MybatisRedisCache.class,eviction=MybatisRedisCache.class)
-public interface SpecValuesMapper extends BaseMapper<SpecValuesDO> {
-}

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott