24282 1 anno fa
parent
commit
2c3e9ec331
43 ha cambiato i file con 113 aggiunte e 129 eliminazioni
  1. 2 2
      code-generation/pom.xml
  2. 2 2
      pom.xml
  3. 2 2
      sd-business/pom.xml
  4. 1 1
      sd-business/src/main/java/com/sd/business/controller/order/OrderController.java
  5. 1 1
      sd-business/src/main/java/com/sd/business/controller/sku/SkuClassifyController.java
  6. 8 5
      sd-business/src/main/java/com/sd/business/controller/supplier/SupplierController.java
  7. 4 3
      sd-business/src/main/java/com/sd/business/controller/synchro/SynchroTimeController.java
  8. 1 1
      sd-business/src/main/java/com/sd/business/entity/in/po/InOutStorageDetails.java
  9. 0 1
      sd-business/src/main/java/com/sd/business/entity/inventory/po/BalancePriceNum.java
  10. 1 1
      sd-business/src/main/java/com/sd/business/entity/purchase/dto/PurchaseBomDto.java
  11. 1 1
      sd-business/src/main/java/com/sd/business/entity/purchase/dto/PurchaseBomSelectDto.java
  12. 4 4
      sd-business/src/main/java/com/sd/business/entity/purchase/po/PurchaseBom.java
  13. 1 1
      sd-business/src/main/java/com/sd/business/entity/purchase/vo/PurchaseVo.java
  14. 1 1
      sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuClassifySelectDto.java
  15. 1 1
      sd-business/src/main/java/com/sd/business/entity/sku/po/SkuClassify.java
  16. 1 1
      sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuClassifyVo.java
  17. 1 1
      sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierDto.java
  18. 1 4
      sd-business/src/main/java/com/sd/business/entity/supplier/po/Supplier.java
  19. 1 1
      sd-business/src/main/java/com/sd/business/entity/supplier/vo/SupplierVo.java
  20. 3 3
      sd-business/src/main/java/com/sd/business/entity/synchro/po/SynchroTime.java
  21. 1 1
      sd-business/src/main/java/com/sd/business/entity/synchro/vo/SynchroTimeVo.java
  22. 2 2
      sd-business/src/main/java/com/sd/business/flow/PurchaseFlow.java
  23. 2 6
      sd-business/src/main/java/com/sd/business/mapper/in/InOutStorageDetailsMapper.java
  24. 0 1
      sd-business/src/main/java/com/sd/business/mapper/inventory/InventoryMapper.java
  25. 1 1
      sd-business/src/main/java/com/sd/business/mapper/sku/SkuClassifyMapper.java
  26. 3 3
      sd-business/src/main/java/com/sd/business/mapper/supplier/SupplierMapper.java
  27. 3 3
      sd-business/src/main/java/com/sd/business/mapper/synchro/SynchroTimeMapper.java
  28. 4 4
      sd-business/src/main/java/com/sd/business/service/in/InOutStorageDetailsService.java
  29. 7 9
      sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageDetailsServiceImpl.java
  30. 1 1
      sd-business/src/main/java/com/sd/business/service/sku/SkuClassifyService.java
  31. 1 1
      sd-business/src/main/java/com/sd/business/service/sku/SkuService.java
  32. 1 1
      sd-business/src/main/java/com/sd/business/service/sku/impl/SkuClassifyServiceImpl.java
  33. 5 5
      sd-business/src/main/java/com/sd/business/service/supplier/SupplierService.java
  34. 1 1
      sd-business/src/main/java/com/sd/business/service/supplier/impl/SupplierServiceImpl.java
  35. 3 3
      sd-business/src/main/java/com/sd/business/service/synchro/SynchroTimeService.java
  36. 3 3
      sd-business/src/main/java/com/sd/business/service/synchro/impl/SynchroTimeServiceImpl.java
  37. 1 1
      sd-business/src/main/resources/mapper/contract/ContractTemplateMapper.xml
  38. 12 15
      sd-business/src/main/resources/mapper/in/InOutStorageDetailsMapper.xml
  39. 5 10
      sd-business/src/main/resources/mapper/inventory/InventoryMapper.xml
  40. 14 15
      sd-business/src/main/resources/mapper/purchase/PurchaseBomMapper.xml
  41. 2 2
      sd-framework/pom.xml
  42. 2 2
      sd-starter/pom.xml
  43. 2 2
      sd-wln/pom.xml

+ 2 - 2
code-generation/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

+ 2 - 2
pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
sd-business/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

+ 1 - 1
sd-business/src/main/java/com/sd/business/controller/order/OrderController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 订单 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-06-30
  */
 @RestController

+ 1 - 1
sd-business/src/main/java/com/sd/business/controller/sku/SkuClassifyController.java

@@ -15,7 +15,7 @@ import java.util.List;
  * sku分类 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-03
  */
 @RestController

+ 8 - 5
sd-business/src/main/java/com/sd/business/controller/supplier/SupplierController.java

@@ -1,13 +1,16 @@
 package com.sd.business.controller.supplier;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.supplier.vo.SupplierVo;
-import com.sd.business.entity.supplier.dto.SupplierSelectDto;
-import com.sd.business.entity.supplier.dto.SupplierDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.supplier.dto.SupplierDto;
+import com.sd.business.entity.supplier.dto.SupplierSelectDto;
+import com.sd.business.entity.supplier.vo.SupplierVo;
 import com.sd.business.service.supplier.SupplierService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -15,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 供应商 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-01
  */
 @RestController

+ 4 - 3
sd-business/src/main/java/com/sd/business/controller/synchro/SynchroTimeController.java

@@ -1,14 +1,15 @@
 package com.sd.business.controller.synchro;
 
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-04
  */
 @RestController

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/in/po/InOutStorageDetails.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * 出入库详情表
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-25
  */
 @Getter

+ 0 - 1
sd-business/src/main/java/com/sd/business/entity/inventory/po/BalancePriceNum.java

@@ -1,7 +1,6 @@
 package com.sd.business.entity.inventory.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/purchase/dto/PurchaseBomDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 采购合同bom新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-08-07
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/purchase/dto/PurchaseBomSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 采购合同bom列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-08-07
  */
 @Getter

+ 4 - 4
sd-business/src/main/java/com/sd/business/entity/purchase/po/PurchaseBom.java

@@ -1,18 +1,18 @@
 package com.sd.business.entity.purchase.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 采购合同bom
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-08-07
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/purchase/vo/PurchaseVo.java

@@ -19,7 +19,7 @@ public class PurchaseVo extends Purchase {
     /**
      * 供应商名称
      */
-    private  String supplierName;
+    private String supplierName;
 
     /**
      * 申购单号

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/sku/dto/SkuClassifySelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * sku分类列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-07-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/sku/po/SkuClassify.java

@@ -10,7 +10,7 @@ import lombok.Setter;
  * sku分类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuClassifyVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * sku分类列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-07-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 供应商新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-07-01
  */
 @Getter

+ 1 - 4
sd-business/src/main/java/com/sd/business/entity/supplier/po/Supplier.java

@@ -2,7 +2,6 @@ package com.sd.business.entity.supplier.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,7 +10,7 @@ import lombok.Setter;
  * 供应商
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-01
  */
 @Getter
@@ -101,13 +100,11 @@ public class Supplier extends BasePo {
 
     /**
      * 银行
-
      */
     private String bank;
 
     /**
      * 银行账户名
-
      */
     private String bankAccountName;
 

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/supplier/vo/SupplierVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 供应商列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-07-01
  */
 @Getter

+ 3 - 3
sd-business/src/main/java/com/sd/business/entity/synchro/po/SynchroTime.java

@@ -1,16 +1,16 @@
 package com.sd.business.entity.synchro.po;
 
-import com.ruoyi.common.core.domain.BaseIdPo;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseIdPo;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-04
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/synchro/vo/SynchroTimeVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-07-04
  */
 @Getter

+ 2 - 2
sd-business/src/main/java/com/sd/business/flow/PurchaseFlow.java

@@ -26,7 +26,7 @@ import java.util.Map;
  * 发起采购流程
  */
 @Service
-public class PurchaseFlow  extends FlowDelegate {
+public class PurchaseFlow extends FlowDelegate {
 
     @Autowired
     private PurchaseService purchaseService;
@@ -38,7 +38,7 @@ public class PurchaseFlow  extends FlowDelegate {
     private ApplyBuyService applyBuyService;
 
     @Autowired
-    private ApplyBuyBomService  applyBuyBomService;
+    private ApplyBuyBomService applyBuyBomService;
 
     @Override
     public String getFlowKey() {

+ 2 - 6
sd-business/src/main/java/com/sd/business/mapper/in/InOutStorageDetailsMapper.java

@@ -1,16 +1,12 @@
 package com.sd.business.mapper.in;
 
-import com.sd.business.entity.in.po.InOutStorageDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.in.vo.InOutStorageDetailsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.sd.business.entity.inventory.po.BalancePriceNum;
+import com.sd.business.entity.in.po.InOutStorageDetails;
+import com.sd.business.entity.in.vo.InOutStorageDetailsVo;
 import org.apache.ibatis.annotations.Param;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 
 /**
  * <p>

+ 0 - 1
sd-business/src/main/java/com/sd/business/mapper/inventory/InventoryMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.in.po.InOutStorageDetails;
 import com.sd.business.entity.inventory.dto.QuantityByWarehouseDto;
-import com.sd.business.entity.inventory.po.BalancePriceNum;
 import com.sd.business.entity.inventory.po.Inventory;
 import com.sd.business.entity.inventory.vo.InventoryVo;
 import com.sd.business.entity.inventory.vo.QuantityByDepartmentVo;

+ 1 - 1
sd-business/src/main/java/com/sd/business/mapper/sku/SkuClassifyMapper.java

@@ -8,7 +8,7 @@ import com.sd.business.entity.sku.po.SkuClassify;
  * sku分类 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-03
  */
 public interface SkuClassifyMapper extends BaseMapper<SkuClassify> {

+ 3 - 3
sd-business/src/main/java/com/sd/business/mapper/supplier/SupplierMapper.java

@@ -1,10 +1,10 @@
 package com.sd.business.mapper.supplier;
 
-import com.sd.business.entity.supplier.po.Supplier;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.supplier.vo.SupplierVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.supplier.po.Supplier;
+import com.sd.business.entity.supplier.vo.SupplierVo;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * 供应商 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-01
  */
 public interface SupplierMapper extends BaseMapper<Supplier> {

+ 3 - 3
sd-business/src/main/java/com/sd/business/mapper/synchro/SynchroTimeMapper.java

@@ -1,15 +1,15 @@
 package com.sd.business.mapper.synchro;
 
-import com.sd.business.entity.synchro.po.SynchroTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sd.business.entity.synchro.po.SynchroTime;
 
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-04
  */
 public interface SynchroTimeMapper extends BaseMapper<SynchroTime> {

+ 4 - 4
sd-business/src/main/java/com/sd/business/service/in/InOutStorageDetailsService.java

@@ -1,11 +1,11 @@
 package com.sd.business.service.in;
 
-import com.sd.business.entity.in.po.InOutStorageDetails;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.in.vo.InOutStorageDetailsVo;
-import com.sd.business.entity.in.dto.InOutStorageDetailsSelectDto;
+import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.in.dto.InOutStorageDetailsDto;
+import com.sd.business.entity.in.dto.InOutStorageDetailsSelectDto;
+import com.sd.business.entity.in.po.InOutStorageDetails;
+import com.sd.business.entity.in.vo.InOutStorageDetailsVo;
 
 
 /**

+ 7 - 9
sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageDetailsServiceImpl.java

@@ -1,18 +1,16 @@
 package com.sd.business.service.in.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.in.dto.InOutStorageDetailsDto;
+import com.sd.business.entity.in.dto.InOutStorageDetailsSelectDto;
 import com.sd.business.entity.in.po.InOutStorageDetails;
+import com.sd.business.entity.in.vo.InOutStorageDetailsVo;
 import com.sd.business.mapper.in.InOutStorageDetailsMapper;
 import com.sd.business.service.in.InOutStorageDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.in.vo.InOutStorageDetailsVo;
-import com.sd.business.entity.in.dto.InOutStorageDetailsSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.sd.business.entity.in.dto.InOutStorageDetailsDto;
-import cn.hutool.core.bean.BeanUtil;
-
-import java.util.List;
 
 
 /**

+ 1 - 1
sd-business/src/main/java/com/sd/business/service/sku/SkuClassifyService.java

@@ -12,7 +12,7 @@ import java.util.List;
  * sku分类 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-03
  */
 public interface SkuClassifyService extends BaseService<SkuClassify> {

+ 1 - 1
sd-business/src/main/java/com/sd/business/service/sku/SkuService.java

@@ -14,7 +14,7 @@ import com.sd.business.entity.sku.vo.SkuVo;
  * sku 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-03
  */
 public interface SkuService extends BaseService<Sku> {

+ 1 - 1
sd-business/src/main/java/com/sd/business/service/sku/impl/SkuClassifyServiceImpl.java

@@ -17,7 +17,7 @@ import java.util.List;
  * sku分类 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-03
  */
 @Service

+ 5 - 5
sd-business/src/main/java/com/sd/business/service/supplier/SupplierService.java

@@ -1,11 +1,11 @@
 package com.sd.business.service.supplier;
 
-import com.sd.business.entity.supplier.po.Supplier;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.supplier.vo.SupplierVo;
-import com.sd.business.entity.supplier.dto.SupplierSelectDto;
+import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.supplier.dto.SupplierDto;
+import com.sd.business.entity.supplier.dto.SupplierSelectDto;
+import com.sd.business.entity.supplier.po.Supplier;
+import com.sd.business.entity.supplier.vo.SupplierVo;
 
 
 /**
@@ -13,7 +13,7 @@ import com.sd.business.entity.supplier.dto.SupplierDto;
  * 供应商 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-01
  */
 public interface SupplierService extends BaseService<Supplier> {

+ 1 - 1
sd-business/src/main/java/com/sd/business/service/supplier/impl/SupplierServiceImpl.java

@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  * 供应商 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-01
  */
 @Service

+ 3 - 3
sd-business/src/main/java/com/sd/business/service/synchro/SynchroTimeService.java

@@ -1,15 +1,15 @@
 package com.sd.business.service.synchro;
 
-import com.sd.business.entity.synchro.po.SynchroTime;
 import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.synchro.po.SynchroTime;
 
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-04
  */
 public interface SynchroTimeService extends BaseService<SynchroTime> {

+ 3 - 3
sd-business/src/main/java/com/sd/business/service/synchro/impl/SynchroTimeServiceImpl.java

@@ -1,18 +1,18 @@
 package com.sd.business.service.synchro.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sd.business.entity.synchro.po.SynchroTime;
 import com.sd.business.mapper.synchro.SynchroTimeMapper;
 import com.sd.business.service.synchro.SynchroTimeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-07-04
  */
 @Service

+ 1 - 1
sd-business/src/main/resources/mapper/contract/ContractTemplateMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.contract.ContractTemplateMapper">
 
-<select id="getPage" resultType="com.sd.business.entity.contract.vo.ContractTemplateVo">
+    <select id="getPage" resultType="com.sd.business.entity.contract.vo.ContractTemplateVo">
         select ct.id,
                ct.name,
                ct.create_user,

+ 12 - 15
sd-business/src/main/resources/mapper/in/InOutStorageDetailsMapper.xml

@@ -2,24 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.in.InOutStorageDetailsMapper">
     <select id="getPage" resultType="com.sd.business.entity.in.vo.InOutStorageDetailsVo">
-        select
-            iosd.id,
-            iosd.in_out_storage_id,
-            iosd.department_id,
-            iosd.warehouse_id,
-            iosd.bom_spec_id,
-            iosd.in_sum_price,
-            iosd.in_unit_price,
-            iosd.quantity,
-            iosd.create_user,
-            iosd.create_time,
-            iosd.update_user,
-            iosd.update_time
+        select iosd.id,
+               iosd.in_out_storage_id,
+               iosd.department_id,
+               iosd.warehouse_id,
+               iosd.bom_spec_id,
+               iosd.in_sum_price,
+               iosd.in_unit_price,
+               iosd.quantity,
+               iosd.create_user,
+               iosd.create_time,
+               iosd.update_user,
+               iosd.update_time
         from in_out_storage_details iosd
             ${ew.customSqlSegment}
     </select>
 
 
-
-
 </mapper>

+ 5 - 10
sd-business/src/main/resources/mapper/inventory/InventoryMapper.xml

@@ -67,16 +67,11 @@
     </select>
 
     <select id="getQuantityByBomSpecId" resultType="java.math.BigDecimal" parameterType="java.lang.Long">
-        SELECT
-	        sum(quantity)
-        FROM
-	        in_out_storage_details
-        WHERE
-            warehouse_id = #{warehouseId}
-        AND
-	        bom_spec_id = #{bomSpecId}
-	    AND
-	        del_flag = 0
+        SELECT sum(quantity)
+        FROM in_out_storage_details
+        WHERE warehouse_id = #{warehouseId}
+          AND bom_spec_id = #{bomSpecId}
+          AND del_flag = 0
     </select>
 
 

+ 14 - 15
sd-business/src/main/resources/mapper/purchase/PurchaseBomMapper.xml

@@ -2,21 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.purchase.PurchaseBomMapper">
 
-<select id="getPage" resultType="com.sd.business.entity.purchase.vo.PurchaseBomVo">
-        select
-            pb.id,
-            pb.purchase_id,
-            pb.apply_buy_bom_id,
-            pb.bom_spec_id,
-            pb.unit_price,
-            pb.tax_rate,
-            pb.purchase_quantity,
-            pb.return_quantity,
-            pb.paid_amount,
-            pb.create_user,
-            pb.create_time,
-            pb.update_user,
-            pb.update_time
+    <select id="getPage" resultType="com.sd.business.entity.purchase.vo.PurchaseBomVo">
+        select pb.id,
+               pb.purchase_id,
+               pb.apply_buy_bom_id,
+               pb.bom_spec_id,
+               pb.unit_price,
+               pb.tax_rate,
+               pb.purchase_quantity,
+               pb.return_quantity,
+               pb.paid_amount,
+               pb.create_user,
+               pb.create_time,
+               pb.update_user,
+               pb.update_time
         from purchase_bom pb
             ${ew.customSqlSegment}
     </select>

+ 2 - 2
sd-framework/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

+ 2 - 2
sd-starter/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
sd-wln/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>