Ver Fonte

出库单

24282 há 1 ano atrás
pai
commit
46206f16af
39 ficheiros alterados com 130 adições e 120 exclusões
  1. 2 2
      pom.xml
  2. 8 5
      sd-business/src/main/java/com/sd/business/controller/apply/ApplyBuyBomController.java
  3. 9 6
      sd-business/src/main/java/com/sd/business/controller/apply/ApplyBuyController.java
  4. 8 5
      sd-business/src/main/java/com/sd/business/controller/outbound/OutboundOrderController.java
  5. 8 5
      sd-business/src/main/java/com/sd/business/controller/supplier/SupplierController.java
  6. 1 1
      sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuyBomDto.java
  7. 1 1
      sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuyBomSelectDto.java
  8. 1 1
      sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuyDto.java
  9. 1 1
      sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuySelectDto.java
  10. 3 3
      sd-business/src/main/java/com/sd/business/entity/apply/po/ApplyBuy.java
  11. 3 4
      sd-business/src/main/java/com/sd/business/entity/apply/po/ApplyBuyBom.java
  12. 1 1
      sd-business/src/main/java/com/sd/business/entity/apply/vo/ApplyBuyBomVo.java
  13. 1 1
      sd-business/src/main/java/com/sd/business/entity/apply/vo/ApplyBuyVo.java
  14. 1 1
      sd-business/src/main/java/com/sd/business/entity/outbound/dto/OutboundOrderDto.java
  15. 1 1
      sd-business/src/main/java/com/sd/business/entity/outbound/dto/OutboundOrderSelectDto.java
  16. 1 1
      sd-business/src/main/java/com/sd/business/entity/outbound/vo/OutboundOrderVo.java
  17. 1 1
      sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierDto.java
  18. 1 1
      sd-business/src/main/java/com/sd/business/entity/supplier/dto/SupplierSelectDto.java
  19. 1 4
      sd-business/src/main/java/com/sd/business/entity/supplier/po/Supplier.java
  20. 1 1
      sd-business/src/main/java/com/sd/business/entity/supplier/vo/SupplierVo.java
  21. 2 3
      sd-business/src/main/java/com/sd/business/entity/work/vo/WorkOrderVo.java
  22. 2 4
      sd-business/src/main/java/com/sd/business/flow/PurchaseFlow.java
  23. 1 1
      sd-business/src/main/java/com/sd/business/mapper/apply/ApplyBuyBomMapper.java
  24. 1 1
      sd-business/src/main/java/com/sd/business/mapper/apply/ApplyBuyMapper.java
  25. 1 1
      sd-business/src/main/java/com/sd/business/mapper/outbound/OutboundOrderMapper.java
  26. 1 1
      sd-business/src/main/java/com/sd/business/mapper/supplier/SupplierMapper.java
  27. 5 5
      sd-business/src/main/java/com/sd/business/service/apply/ApplyBuyBomService.java
  28. 5 5
      sd-business/src/main/java/com/sd/business/service/apply/ApplyBuyService.java
  29. 7 7
      sd-business/src/main/java/com/sd/business/service/apply/impl/ApplyBuyBomServiceImpl.java
  30. 8 8
      sd-business/src/main/java/com/sd/business/service/apply/impl/ApplyBuyServiceImpl.java
  31. 5 5
      sd-business/src/main/java/com/sd/business/service/outbound/OutboundOrderService.java
  32. 7 7
      sd-business/src/main/java/com/sd/business/service/outbound/impl/OutboundOrderServiceImpl.java
  33. 0 2
      sd-business/src/main/java/com/sd/business/service/purchase/PurchaseService.java
  34. 5 5
      sd-business/src/main/java/com/sd/business/service/supplier/SupplierService.java
  35. 7 7
      sd-business/src/main/java/com/sd/business/service/supplier/impl/SupplierServiceImpl.java
  36. 5 5
      sd-business/src/main/java/com/sd/business/service/work/impl/WorkOrderServiceImpl.java
  37. 9 1
      sd-vision/src/main/java/com/sd/vision/Main.java
  38. 0 1
      sd-wln/src/main/java/com/sd/wln/constants/WlnConstant.java
  39. 5 5
      sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

+ 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>
 

+ 8 - 5
sd-business/src/main/java/com/sd/business/controller/apply/ApplyBuyBomController.java

@@ -1,13 +1,16 @@
 package com.sd.business.controller.apply;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.apply.vo.ApplyBuyBomVo;
-import com.sd.business.entity.apply.dto.ApplyBuyBomSelectDto;
-import com.sd.business.entity.apply.dto.ApplyBuyBomDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.apply.dto.ApplyBuyBomDto;
+import com.sd.business.entity.apply.dto.ApplyBuyBomSelectDto;
+import com.sd.business.entity.apply.vo.ApplyBuyBomVo;
 import com.sd.business.service.apply.ApplyBuyBomService;
 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;
  * 申购单bom 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @RestController

+ 9 - 6
sd-business/src/main/java/com/sd/business/controller/apply/ApplyBuyController.java

@@ -1,14 +1,17 @@
 package com.sd.business.controller.apply;
 
-import com.fjhx.flow.enums.FlowStatusEnum;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.apply.vo.ApplyBuyVo;
-import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
-import com.sd.business.entity.apply.dto.ApplyBuyDto;
+import com.fjhx.flow.enums.FlowStatusEnum;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.apply.dto.ApplyBuyDto;
+import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
+import com.sd.business.entity.apply.vo.ApplyBuyVo;
 import com.sd.business.service.apply.ApplyBuyService;
 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;
 
 
 /**
@@ -16,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 申购单 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @RestController

+ 8 - 5
sd-business/src/main/java/com/sd/business/controller/outbound/OutboundOrderController.java

@@ -1,13 +1,16 @@
 package com.sd.business.controller.outbound;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.outbound.vo.OutboundOrderVo;
-import com.sd.business.entity.outbound.dto.OutboundOrderSelectDto;
-import com.sd.business.entity.outbound.dto.OutboundOrderDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.outbound.dto.OutboundOrderDto;
+import com.sd.business.entity.outbound.dto.OutboundOrderSelectDto;
+import com.sd.business.entity.outbound.vo.OutboundOrderVo;
 import com.sd.business.service.outbound.OutboundOrderService;
 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-12-15
  */
 @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 2024-01-02
  */
 @RestController

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuyBomDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 申购单bom新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuyBomSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 申购单bom列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuyDto.java

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 申购单新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuySelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 申购单列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Getter

+ 3 - 3
sd-business/src/main/java/com/sd/business/entity/apply/po/ApplyBuy.java

@@ -2,17 +2,17 @@ package com.sd.business.entity.apply.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * <p>
  * 申购单
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Getter

+ 3 - 4
sd-business/src/main/java/com/sd/business/entity/apply/po/ApplyBuyBom.java

@@ -2,18 +2,17 @@ package com.sd.business.entity.apply.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 申购单bom
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/apply/vo/ApplyBuyBomVo.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 申购单bom列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/apply/vo/ApplyBuyVo.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 申购单列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/outbound/dto/OutboundOrderDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 出库单新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-12-15
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/outbound/dto/OutboundOrderSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 出库单列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-12-15
  */
 @Getter

+ 1 - 1
sd-business/src/main/java/com/sd/business/entity/outbound/vo/OutboundOrderVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 出库单列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-12-15
  */
 @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 2024-01-02
  */
 @Getter

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 供应商列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2024-01-02
  */
 @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 2024-01-02
  */
 @Getter
@@ -116,13 +115,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 2024-01-02
  */
 @Getter

+ 2 - 3
sd-business/src/main/java/com/sd/business/entity/work/vo/WorkOrderVo.java

@@ -39,11 +39,10 @@ public class WorkOrderVo extends WorkOrder {
     /**
      * 工单详情
      */
-    List<WorkOrderDetailVo> workOrderDetailList;
-
+    private List<WorkOrderDetailVo> workOrderDetailList;
     /**
      * 公海工单
      */
-    List<OpenSeaWorkOrderVo> openSeaWorkOrderList;
+    private List<OpenSeaWorkOrderVo> openSeaWorkOrderList;
 
 }

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

@@ -146,10 +146,8 @@ public class PurchaseFlow extends FlowDelegate {
         purchaseService.update(q -> q
                 .eq(BaseIdPo::getId, businessId)
                 .set(Purchase::getFlowStatus, flowStatus.getKey())
-                .set(Purchase::getStatus,
-                        ObjectUtil.equals(FlowStatusEnum.REJECT.getKey(), flowStatus.getKey()) ?
-                        PurchaseStatusEnum.REJECT.getKey() : PurchaseStatusEnum.CANCELLATION.getKey()
-                    )
+                .set(Purchase::getStatus, ObjectUtil.equals(FlowStatusEnum.REJECT.getKey(), flowStatus.getKey()) ?
+                        PurchaseStatusEnum.REJECT.getKey() : PurchaseStatusEnum.CANCELLATION.getKey())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );

+ 1 - 1
sd-business/src/main/java/com/sd/business/mapper/apply/ApplyBuyBomMapper.java

@@ -8,7 +8,7 @@ import com.sd.business.entity.apply.po.ApplyBuyBom;
  * 申购单bom Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 public interface ApplyBuyBomMapper extends BaseMapper<ApplyBuyBom> {

+ 1 - 1
sd-business/src/main/java/com/sd/business/mapper/apply/ApplyBuyMapper.java

@@ -8,7 +8,7 @@ import com.sd.business.entity.apply.po.ApplyBuy;
  * 申购单 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 public interface ApplyBuyMapper extends BaseMapper<ApplyBuy> {

+ 1 - 1
sd-business/src/main/java/com/sd/business/mapper/outbound/OutboundOrderMapper.java

@@ -8,7 +8,7 @@ import com.sd.business.entity.outbound.po.OutboundOrder;
  * 出库单 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-12-15
  */
 public interface OutboundOrderMapper extends BaseMapper<OutboundOrder> {

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

@@ -8,7 +8,7 @@ import com.sd.business.entity.supplier.po.Supplier;
  * 供应商 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-02
  */
 public interface SupplierMapper extends BaseMapper<Supplier> {

+ 5 - 5
sd-business/src/main/java/com/sd/business/service/apply/ApplyBuyBomService.java

@@ -1,11 +1,11 @@
 package com.sd.business.service.apply;
 
-import com.sd.business.entity.apply.po.ApplyBuyBom;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.apply.vo.ApplyBuyBomVo;
-import com.sd.business.entity.apply.dto.ApplyBuyBomSelectDto;
+import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.apply.dto.ApplyBuyBomDto;
+import com.sd.business.entity.apply.dto.ApplyBuyBomSelectDto;
+import com.sd.business.entity.apply.po.ApplyBuyBom;
+import com.sd.business.entity.apply.vo.ApplyBuyBomVo;
 
 
 /**
@@ -13,7 +13,7 @@ import com.sd.business.entity.apply.dto.ApplyBuyBomDto;
  * 申购单bom 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 public interface ApplyBuyBomService extends BaseService<ApplyBuyBom> {

+ 5 - 5
sd-business/src/main/java/com/sd/business/service/apply/ApplyBuyService.java

@@ -1,11 +1,11 @@
 package com.sd.business.service.apply;
 
-import com.sd.business.entity.apply.po.ApplyBuy;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.apply.vo.ApplyBuyVo;
-import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
+import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.apply.dto.ApplyBuyDto;
+import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
+import com.sd.business.entity.apply.po.ApplyBuy;
+import com.sd.business.entity.apply.vo.ApplyBuyVo;
 
 
 /**
@@ -13,7 +13,7 @@ import com.sd.business.entity.apply.dto.ApplyBuyDto;
  * 申购单 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 public interface ApplyBuyService extends BaseService<ApplyBuy> {

+ 7 - 7
sd-business/src/main/java/com/sd/business/service/apply/impl/ApplyBuyBomServiceImpl.java

@@ -1,15 +1,15 @@
 package com.sd.business.service.apply.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sd.business.entity.apply.dto.ApplyBuyBomDto;
+import com.sd.business.entity.apply.dto.ApplyBuyBomSelectDto;
 import com.sd.business.entity.apply.po.ApplyBuyBom;
+import com.sd.business.entity.apply.vo.ApplyBuyBomVo;
 import com.sd.business.mapper.apply.ApplyBuyBomMapper;
 import com.sd.business.service.apply.ApplyBuyBomService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.apply.vo.ApplyBuyBomVo;
-import com.sd.business.entity.apply.dto.ApplyBuyBomSelectDto;
-import com.sd.business.entity.apply.dto.ApplyBuyBomDto;
-import com.sd.framework.util.sql.Sql;
 import com.sd.framework.util.Assert;
+import com.sd.framework.util.sql.Sql;
 import org.springframework.stereotype.Service;
 
 
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  * 申购单bom 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Service

+ 8 - 8
sd-business/src/main/java/com/sd/business/service/apply/impl/ApplyBuyServiceImpl.java

@@ -1,26 +1,26 @@
 package com.sd.business.service.apply.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sd.business.entity.apply.dto.ApplyBuyDto;
+import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
 import com.sd.business.entity.apply.po.ApplyBuy;
 import com.sd.business.entity.apply.po.ApplyBuyBom;
 import com.sd.business.entity.apply.vo.ApplyBuyBomVo;
+import com.sd.business.entity.apply.vo.ApplyBuyVo;
 import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.mapper.apply.ApplyBuyMapper;
 import com.sd.business.service.apply.ApplyBuyBomService;
 import com.sd.business.service.apply.ApplyBuyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.apply.vo.ApplyBuyVo;
-import com.sd.business.entity.apply.dto.ApplyBuySelectDto;
-import com.sd.business.entity.apply.dto.ApplyBuyDto;
 import com.sd.business.util.CodeEnum;
-import com.sd.framework.util.sql.Sql;
 import com.sd.framework.util.Assert;
+import com.sd.framework.util.sql.Sql;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.List;
 
 
 /**
@@ -28,7 +28,7 @@ import java.util.*;
  * 申购单 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-03
  */
 @Service

+ 5 - 5
sd-business/src/main/java/com/sd/business/service/outbound/OutboundOrderService.java

@@ -1,11 +1,11 @@
 package com.sd.business.service.outbound;
 
-import com.sd.business.entity.outbound.po.OutboundOrder;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.outbound.vo.OutboundOrderVo;
-import com.sd.business.entity.outbound.dto.OutboundOrderSelectDto;
+import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.outbound.dto.OutboundOrderDto;
+import com.sd.business.entity.outbound.dto.OutboundOrderSelectDto;
+import com.sd.business.entity.outbound.po.OutboundOrder;
+import com.sd.business.entity.outbound.vo.OutboundOrderVo;
 
 
 /**
@@ -13,7 +13,7 @@ import com.sd.business.entity.outbound.dto.OutboundOrderDto;
  * 出库单 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-12-15
  */
 public interface OutboundOrderService extends BaseService<OutboundOrder> {

+ 7 - 7
sd-business/src/main/java/com/sd/business/service/outbound/impl/OutboundOrderServiceImpl.java

@@ -1,15 +1,15 @@
 package com.sd.business.service.outbound.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sd.business.entity.outbound.dto.OutboundOrderDto;
+import com.sd.business.entity.outbound.dto.OutboundOrderSelectDto;
 import com.sd.business.entity.outbound.po.OutboundOrder;
+import com.sd.business.entity.outbound.vo.OutboundOrderVo;
 import com.sd.business.mapper.outbound.OutboundOrderMapper;
 import com.sd.business.service.outbound.OutboundOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.outbound.vo.OutboundOrderVo;
-import com.sd.business.entity.outbound.dto.OutboundOrderSelectDto;
-import com.sd.business.entity.outbound.dto.OutboundOrderDto;
-import com.sd.framework.util.sql.Sql;
 import com.sd.framework.util.Assert;
+import com.sd.framework.util.sql.Sql;
 import org.springframework.stereotype.Service;
 
 
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  * 出库单 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-12-15
  */
 @Service

+ 0 - 2
sd-business/src/main/java/com/sd/business/service/purchase/PurchaseService.java

@@ -54,13 +54,11 @@ public interface PurchaseService extends BaseService<Purchase> {
 
     /**
      * 采购合同终止
-     * @param id
      */
     void purchaseTermination(Long id);
 
     /**
      * 导入E10采购合同
-     * @param list
      */
     void purchaseImport(List<PurchaseBomImportDataDto> list);
 }

+ 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 2024-01-02
  */
 public interface SupplierService extends BaseService<Supplier> {

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

@@ -1,15 +1,15 @@
 package com.sd.business.service.supplier.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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;
 import com.sd.business.mapper.supplier.SupplierMapper;
 import com.sd.business.service.supplier.SupplierService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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.sd.framework.util.sql.Sql;
 import com.sd.framework.util.Assert;
+import com.sd.framework.util.sql.Sql;
 import org.springframework.stereotype.Service;
 
 
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  * 供应商 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-01-02
  */
 @Service

+ 5 - 5
sd-business/src/main/java/com/sd/business/service/work/impl/WorkOrderServiceImpl.java

@@ -635,11 +635,6 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         return openSeaWorkOrderList;
     }
 
-    @FunctionalInterface
-    private interface CommonSchedulingFunInterface {
-        void run(Long bomSpecId, Long printingPaperBomSpecId, List<OrderSku> list, Map<Long, SkuSpec> skuSpecMap);
-    }
-
     /**
      * 原料出库
      */
@@ -751,4 +746,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         inStorageService.add(inOutStorageDto);
     }
 
+    @FunctionalInterface
+    private interface CommonSchedulingFunInterface {
+        void run(Long bomSpecId, Long printingPaperBomSpecId, List<OrderSku> list, Map<Long, SkuSpec> skuSpecMap);
+    }
+
 }

+ 9 - 1
sd-vision/src/main/java/com/sd/vision/Main.java

@@ -6,7 +6,15 @@ import cn.hutool.core.io.FileUtil;
 import java.util.ArrayList;
 
 import static MvCameraControlWrapper.MvCameraControl.MV_CC_EnumDevices;
-import static MvCameraControlWrapper.MvCameraControlDefines.*;
+import static MvCameraControlWrapper.MvCameraControlDefines.Handle;
+import static MvCameraControlWrapper.MvCameraControlDefines.MVCC_INTVALUE;
+import static MvCameraControlWrapper.MvCameraControlDefines.MV_CC_DEVICE_INFO;
+import static MvCameraControlWrapper.MvCameraControlDefines.MV_FRAME_OUT_INFO;
+import static MvCameraControlWrapper.MvCameraControlDefines.MV_GIGE_DEVICE;
+import static MvCameraControlWrapper.MvCameraControlDefines.MV_OK;
+import static MvCameraControlWrapper.MvCameraControlDefines.MV_SAVE_IAMGE_TYPE;
+import static MvCameraControlWrapper.MvCameraControlDefines.MV_SAVE_IMAGE_PARAM;
+import static MvCameraControlWrapper.MvCameraControlDefines.MV_USB_DEVICE;
 
 public class Main {
     public static void main(String[] args) {

+ 0 - 1
sd-wln/src/main/java/com/sd/wln/constants/WlnConstant.java

@@ -1,6 +1,5 @@
 package com.sd.wln.constants;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 

+ 5 - 5
sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -53,6 +53,11 @@ import java.util.stream.Collectors;
 @Service
 public class WlnOrderServiceImpl implements WlnOrderService {
 
+    /**
+     * 只抓指定仓库编码订单数据
+     */
+    public static final String WAREHOUSE_CODE = "T008";
+
     @Autowired
     private OrderInfoService orderInfoService;
 
@@ -74,11 +79,6 @@ public class WlnOrderServiceImpl implements WlnOrderService {
     @Autowired
     private InventoryFinishedService inventoryFinishedService;
 
-    /**
-     * 只抓指定仓库编码订单数据
-     */
-    public static final String WAREHOUSE_CODE = "T008";
-
     @Override
     public void syncOrder() {