yzc 2 жил өмнө
parent
commit
52b1146c3f
28 өөрчлөгдсөн 641 нэмэгдсэн , 2 устгасан
  1. 17 0
      code/src/test/java/JxstDataSource.java
  2. 5 0
      hx-admin/pom.xml
  3. 4 0
      hx-admin/src/main/resources/application-dev.yml
  4. 4 0
      hx-admin/src/main/resources/application-test.yml
  5. 2 0
      hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java
  6. 35 0
      hx-jxst/pom.xml
  7. 52 0
      hx-jxst/src/main/java/com/fjhx/jxst/controller/sales/SalesContractController.java
  8. 19 0
      hx-jxst/src/main/java/com/fjhx/jxst/controller/sales/SalesContractDetailsController.java
  9. 17 0
      hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDetailsDto.java
  10. 17 0
      hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDetailsSelectDto.java
  11. 25 0
      hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDto.java
  12. 17 0
      hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractSelectDto.java
  13. 57 0
      hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContract.java
  14. 48 0
      hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContractDetails.java
  15. 17 0
      hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractDetailsVo.java
  16. 29 0
      hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractVo.java
  17. 54 0
      hx-jxst/src/main/java/com/fjhx/jxst/flow/SalesContractFlow.java
  18. 17 0
      hx-jxst/src/main/java/com/fjhx/jxst/mapper/sales/SalesContractDetailsMapper.java
  19. 26 0
      hx-jxst/src/main/java/com/fjhx/jxst/mapper/sales/SalesContractMapper.java
  20. 17 0
      hx-jxst/src/main/java/com/fjhx/jxst/service/sales/SalesContractDetailsService.java
  21. 36 0
      hx-jxst/src/main/java/com/fjhx/jxst/service/sales/SalesContractService.java
  22. 21 0
      hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractDetailsServiceImpl.java
  23. 70 0
      hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java
  24. 4 0
      hx-jxst/src/main/resources/mapper/sales/SalesContractDetailsMapper.xml
  25. 22 0
      hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml
  26. 1 1
      hx-mes/src/main/java/com/fjhx/mes/entity/work/po/WorkOrder.java
  27. 1 1
      hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java
  28. 7 0
      pom.xml

+ 17 - 0
code/src/test/java/JxstDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class JxstDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-jxst")
+                .parent("com.fjhx.jxst")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

+ 5 - 0
hx-admin/pom.xml

@@ -90,6 +90,11 @@
         </dependency>
 
         <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-jxst</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>

+ 4 - 0
hx-admin/src/main/resources/application-dev.yml

@@ -77,6 +77,10 @@ spring:
                     url: jdbc:mysql://36.134.91.96:17330/yf_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
+                jxst:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
 
     # redis 配置
     redis:

+ 4 - 0
hx-admin/src/main/resources/application-test.yml

@@ -73,6 +73,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
+                jxst:
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
 
     # redis 配置
     redis:

+ 2 - 0
hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java

@@ -44,4 +44,6 @@ public interface SourceConstant {
      */
     String DATA = "data";
 
+    String JXST = "jxsr";
+
 }

+ 35 - 0
hx-jxst/pom.xml

@@ -0,0 +1,35 @@
+<?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"
+         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>
+        <groupId>com.fjhx</groupId>
+        <artifactId>bytesailing</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>hx-jxst</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-customer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-mes</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

+ 52 - 0
hx-jxst/src/main/java/com/fjhx/jxst/controller/sales/SalesContractController.java

@@ -0,0 +1,52 @@
+package com.fjhx.jxst.controller.sales;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.jxst.entity.sales.vo.SalesContractVo;
+import com.fjhx.jxst.entity.sales.dto.SalesContractSelectDto;
+import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.jxst.service.sales.SalesContractService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 销售合同 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@RestController
+@RequestMapping("/salesContract")
+public class SalesContractController {
+
+    @Autowired
+    private SalesContractService salesContractService;
+
+    /**
+     * 销售合同分页
+     */
+    @PostMapping("/page")
+    public Page<SalesContractVo> page(@RequestBody SalesContractSelectDto dto) {
+        return salesContractService.getPage(dto);
+    }
+
+    /**
+     * 销售合同明细
+     */
+    @PostMapping("/detail")
+    public SalesContractVo detail(@RequestBody BaseSelectDto dto) {
+        return salesContractService.detail(dto.getId());
+    }
+
+    /**
+     * 销售合同新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody SalesContractDto salesContractDto) {
+        salesContractService.add(salesContractDto);
+    }
+
+}

+ 19 - 0
hx-jxst/src/main/java/com/fjhx/jxst/controller/sales/SalesContractDetailsController.java

@@ -0,0 +1,19 @@
+package com.fjhx.jxst.controller.sales;
+
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * <p>
+ * 销售合同明细 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@RestController
+@RequestMapping("/salesContractDetails")
+public class SalesContractDetailsController {
+
+
+}

+ 17 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDetailsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.jxst.entity.sales.dto;
+
+import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 销售合同明细新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@Getter
+@Setter
+public class SalesContractDetailsDto extends SalesContractDetails {
+
+}

+ 17 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDetailsSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.jxst.entity.sales.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 销售合同明细列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@Getter
+@Setter
+public class SalesContractDetailsSelectDto extends BaseSelectDto {
+
+}

+ 25 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractDto.java

@@ -0,0 +1,25 @@
+package com.fjhx.jxst.entity.sales.dto;
+
+import com.fjhx.jxst.entity.sales.po.SalesContract;
+import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 销售合同新增编辑入参实体
+ *
+ * @author
+ * @since 2023-05-16
+ */
+@Getter
+@Setter
+public class SalesContractDto extends SalesContract {
+
+    /**
+     * 明细列表
+     */
+    List<SalesContractDetails> salesContractDetailsList;
+
+}

+ 17 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/dto/SalesContractSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.jxst.entity.sales.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 销售合同列表查询入参实体
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@Getter
+@Setter
+public class SalesContractSelectDto extends BaseSelectDto {
+
+}

+ 57 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContract.java

@@ -0,0 +1,57 @@
+package com.fjhx.jxst.entity.sales.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 销售合同
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@Getter
+@Setter
+@TableName("sales_contract")
+public class SalesContract extends BasePo {
+
+    /**
+     * 客户id
+     */
+    private Long customerId;
+
+    /**
+     * 交货日期
+     */
+    private Date deliveryDate;
+
+    /**
+     * 付款方式 租户字典
+     */
+    private String payMethod;
+
+    /**
+     * 运费支付方 甲方/乙方
+     */
+    private String freightPayer;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 流程id
+     */
+    private Long flowId;
+
+    /**
+     * 流程key
+     */
+    private String flowKey;
+
+}

+ 48 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContractDetails.java

@@ -0,0 +1,48 @@
+package com.fjhx.jxst.entity.sales.po;
+
+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;
+
+/**
+ * <p>
+ * 销售合同明细
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@Getter
+@Setter
+@TableName("sales_contract_details")
+public class SalesContractDetails extends BasePo {
+
+    /**
+     * 销售合同id
+     */
+    private Long salesContractId;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 是否定制
+     */
+    private String isCustomized;
+
+}

+ 17 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractDetailsVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.jxst.entity.sales.vo;
+
+import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 销售合同明细列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@Getter
+@Setter
+public class SalesContractDetailsVo extends SalesContractDetails {
+
+}

+ 29 - 0
hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractVo.java

@@ -0,0 +1,29 @@
+package com.fjhx.jxst.entity.sales.vo;
+
+import com.fjhx.jxst.entity.sales.po.SalesContract;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 销售合同列表查询返回值实体
+ *
+ * @author
+ * @since 2023-05-16
+ */
+@Getter
+@Setter
+public class SalesContractVo extends SalesContract {
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 合同金额
+     */
+    private BigDecimal contractAmount;
+
+}

+ 54 - 0
hx-jxst/src/main/java/com/fjhx/jxst/flow/SalesContractFlow.java

@@ -0,0 +1,54 @@
+package com.fjhx.jxst.flow;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
+import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
+import com.fjhx.jxst.service.sales.SalesContractDetailsService;
+import com.fjhx.jxst.service.sales.SalesContractService;
+import com.fjhx.mes.entity.work.dto.WorkOrderDto;
+import com.fjhx.mes.entity.work.po.WorkOrder;
+import com.fjhx.mes.service.work.WorkOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class SalesContractFlow extends FlowDelegate {
+
+    @Autowired
+    private SalesContractService salesContractService;
+    @Autowired
+    private SalesContractDetailsService salesContractDetailsService;
+    @Autowired
+    private WorkOrderService workOrderService;
+
+    @Override
+    public String getFlowKey() {
+        return "jxst_sales_contract_flow";
+    }
+
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+        SalesContractDto salesContractDto = submitData.toJavaObject(SalesContractDto.class);
+        salesContractDto.setFlowId(flowId);
+        salesContractService.add(salesContractDto);
+        return salesContractDto.getId();
+    }
+
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        //按产品往“工单管理”中插入对应的工单数据
+        List<SalesContractDetails> salesContractDetailsList = salesContractDetailsService.list(q -> q.eq(SalesContractDetails::getSalesContractId, businessId));
+        for (SalesContractDetails salesContractDetails : salesContractDetailsList) {
+            WorkOrderDto workOrder = new WorkOrderDto();
+            workOrder.setSourceId(businessId);
+            workOrder.setSource("sales_contract");//销售合同
+            workOrder.setProductId(salesContractDetails.getProductId());
+            workOrder.setQuantity(salesContractDetails.getQuantity());
+            //添加工单
+            workOrderService.add(workOrder);
+        }
+    }
+}

+ 17 - 0
hx-jxst/src/main/java/com/fjhx/jxst/mapper/sales/SalesContractDetailsMapper.java

@@ -0,0 +1,17 @@
+package com.fjhx.jxst.mapper.sales;
+
+import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * <p>
+ * 销售合同明细 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+public interface SalesContractDetailsMapper extends BaseMapper<SalesContractDetails> {
+
+}

+ 26 - 0
hx-jxst/src/main/java/com/fjhx/jxst/mapper/sales/SalesContractMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.jxst.mapper.sales;
+
+import com.fjhx.jxst.entity.sales.po.SalesContract;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.jxst.entity.sales.vo.SalesContractVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 销售合同 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+public interface SalesContractMapper extends BaseMapper<SalesContract> {
+
+    /**
+     * 销售合同分页
+     */
+    Page<SalesContractVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<SalesContract> wrapper);
+
+}

+ 17 - 0
hx-jxst/src/main/java/com/fjhx/jxst/service/sales/SalesContractDetailsService.java

@@ -0,0 +1,17 @@
+package com.fjhx.jxst.service.sales;
+
+import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 销售合同明细 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+public interface SalesContractDetailsService extends BaseService<SalesContractDetails> {
+
+}

+ 36 - 0
hx-jxst/src/main/java/com/fjhx/jxst/service/sales/SalesContractService.java

@@ -0,0 +1,36 @@
+package com.fjhx.jxst.service.sales;
+
+import com.fjhx.jxst.entity.sales.po.SalesContract;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.jxst.entity.sales.vo.SalesContractVo;
+import com.fjhx.jxst.entity.sales.dto.SalesContractSelectDto;
+import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
+
+
+/**
+ * <p>
+ * 销售合同 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+public interface SalesContractService extends BaseService<SalesContract> {
+
+    /**
+     * 销售合同分页
+     */
+    Page<SalesContractVo> getPage(SalesContractSelectDto dto);
+
+    /**
+     * 销售合同明细
+     */
+    SalesContractVo detail(Long id);
+
+    /**
+     * 销售合同新增
+     */
+    void add(SalesContractDto salesContractDto);
+
+}

+ 21 - 0
hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractDetailsServiceImpl.java

@@ -0,0 +1,21 @@
+package com.fjhx.jxst.service.sales.impl;
+
+import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
+import com.fjhx.jxst.mapper.sales.SalesContractDetailsMapper;
+import com.fjhx.jxst.service.sales.SalesContractDetailsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 销售合同明细 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@Service
+public class SalesContractDetailsServiceImpl extends ServiceImpl<SalesContractDetailsMapper, SalesContractDetails> implements SalesContractDetailsService {
+
+}

+ 70 - 0
hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -0,0 +1,70 @@
+package com.fjhx.jxst.service.sales.impl;
+
+import com.fjhx.customer.service.customer.CustomerService;
+import com.fjhx.jxst.entity.sales.po.SalesContract;
+import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
+import com.fjhx.jxst.mapper.sales.SalesContractMapper;
+import com.fjhx.jxst.service.sales.SalesContractDetailsService;
+import com.fjhx.jxst.service.sales.SalesContractService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.jxst.entity.sales.vo.SalesContractVo;
+import com.fjhx.jxst.entity.sales.dto.SalesContractSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
+import cn.hutool.core.bean.BeanUtil;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 销售合同 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-05-16
+ */
+@Service
+public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, SalesContract> implements SalesContractService {
+
+    @Autowired
+    private SalesContractDetailsService salesContractDetailsService;
+    @Autowired
+    private CustomerService customerService;
+
+    @Override
+    public Page<SalesContractVo> getPage(SalesContractSelectDto dto) {
+        IWrapper<SalesContract> wrapper = getWrapper();
+        wrapper.orderByDesc("sc", SalesContract::getId);
+        Page<SalesContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<SalesContractVo> records = page.getRecords();
+        //赋值客户名称
+        customerService.attributeAssign(records, SalesContractVo::getCustomerId, (item, customer) -> {
+            item.setCustomerName(customer.getName());
+        });
+        return page;
+    }
+
+    @Override
+    public SalesContractVo detail(Long id) {
+        SalesContract SalesContract = this.getById(id);
+        SalesContractVo result = BeanUtil.toBean(SalesContract, SalesContractVo.class);
+        return result;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(SalesContractDto salesContractDto) {
+        this.save(salesContractDto);
+        List<SalesContractDetails> salesContractDetailsList = salesContractDto.getSalesContractDetailsList();
+        for (SalesContractDetails salesContractDetails : salesContractDetailsList) {
+            salesContractDetails.setSalesContractId(salesContractDto.getId());
+        }
+        salesContractDetailsService.saveBatch(salesContractDetailsList);
+    }
+
+}

+ 4 - 0
hx-jxst/src/main/resources/mapper/sales/SalesContractDetailsMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.jxst.mapper.sales.SalesContractDetailsMapper">
+</mapper>

+ 22 - 0
hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.jxst.mapper.sales.SalesContractMapper">
+    <select id="getPage" resultType="com.fjhx.jxst.entity.sales.vo.SalesContractVo">
+        select
+            sc.id,
+            sc.customer_id,
+            sc.delivery_date,
+            sc.pay_method,
+            sc.freight_payer,
+            sc.remark,
+            sc.create_user,
+            sc.create_time,
+            sc.update_user,
+            sc.update_time,
+            (SELECT sum(unit_price * quantity) FROM sales_contract_details WHERE sales_contract_id = sc.id) contractAmount,
+            sc.flow_id
+        from sales_contract sc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 1 - 1
hx-mes/src/main/java/com/fjhx/mes/entity/work/po/WorkOrder.java

@@ -35,7 +35,7 @@ public class WorkOrder extends BasePo {
     /**
      * 工单来源
      */
-    private Integer source;
+    private String source;
 
     /**
      * 产品id

+ 1 - 1
hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -186,7 +186,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             //生成工单编号,以及设置默认状态
             w.setCode(CodeEnum.WORK_ORDER.getCode());
             w.setStatus(0);
-            if (ObjectUtil.isNotEmpty(w.getSourceId()) && w.getSource() == 1) {//外销合同生产数据
+            if (ObjectUtil.isNotEmpty(w.getSourceId()) && w.getSource() == "1") {//外销合同生产数据
                 ContractProduct contractProduct = contractProductService.getById(w.getSourceId());
                 if (ObjectUtil.isNotEmpty(contractProduct)) {
                     throw new ServiceException("该合同产品不存在,请检查");

+ 7 - 0
pom.xml

@@ -30,6 +30,7 @@
         <module>hx-victoriatourist</module>
         <module>hx-dingding</module>
         <module>hx-data</module>
+        <module>hx-jxst</module>
     </modules>
 
     <properties>
@@ -156,6 +157,12 @@
                 <version>${hx.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-jxst</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>