pms服务改造首上传

wms-produce-manage/.gitignore

@@ -0,0 +1,100 @@
+##ignore this file##
+/target/
+target/ 
+.classpath
+.project
+.factorypath
+.settings
+.apt_generated
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+###VS CODE ###
+node_modules/
+
+dist/
+logs/
+.vscode/
+
+
+# Java class files
+*.class
+*.classpath  
+
+# Built application files
+*.apk
+*.ap_
+
+# Generated files
+bin/
+gen/
+out/ 
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+logs/
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Files for the ART/Dalvik VM
+*.dex  
+
+ ##filter databfile、sln file##
+*.mdb  
+*.ldb  
+*.sln    
+##class file##
+*.com  
+*.class  
+*.dll  
+*.exe  
+*.o  
+*.so  
+
+# compression file
+*.7z  
+*.dmg  
+*.gz  
+*.iso  
+*.jar  
+*.rar  
+*.tar  
+*.zip  
+*.via
+*.tmp
+*.err 
+
+# OS generated files #  
+.DS_Store  
+.DS_Store?  
+._*  
+.Spotlight-V100  
+.Trashes  
+Icon?  
+ehthumbs.db  
+Thumbs.db  
+
+# Keystore files
+*.jks
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+

wms-produce-manage/pom.xml

@@ -0,0 +1,48 @@
+<?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">
+    <parent>
+        <artifactId>wms-parent</artifactId>
+        <groupId>com.deer</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wms-produce-manage</artifactId>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <java.version>1.8</java.version>
+        <main.class>com.deer.wms.produce.manage.PmsApplication</main.class>
+        <batik.version>1.10</batik.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.deer</groupId>
+            <artifactId>wms-project-seed</artifactId>
+            <version>${project.version}</version>
+            <!--<scope>compile</scope>-->
+        </dependency>
+        <dependency>
+            <groupId>com.deer</groupId>
+            <artifactId>wms-intercept</artifactId>
+            <version>${project.version}</version>
+            <!--<scope>compile</scope>-->
+        </dependency>
+
+    </dependencies>
+    <build>
+        <finalName>mt-pms</finalName> <!-- 指定package生成的文件名为 -->
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/PmsApplication.java

@@ -0,0 +1,19 @@
+package com.deer.wms.produce.manage;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+
+@SpringBootApplication
+@ComponentScan(value = {
+         "com.deer.wms.project.seed"
+        , "com.deer.wms.intercept.common.data"
+        , "com.deer.wms.produce.manage"
+})
+public class PmsApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(PmsApplication.class, args);
+    }
+
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageMybatisConfigurer.java

@@ -0,0 +1,29 @@
+package com.deer.wms.produce.manage.configurer;
+
+
+import com.deer.wms.produce.manage.constant.ProduceManageConstant;
+import com.deer.wms.project.seed.configurer.AbstractMybatisConfigurer;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Mybatis & Mapper & PageHelper 配置
+ */
+@Configuration
+public class ProduceManageMybatisConfigurer extends AbstractMybatisConfigurer {
+
+    @Override
+    public  String getTypeAliasesPackage() {
+        return    ProduceManageConstant.MODEL_PACKAGE; }
+
+    @Override
+    public String getMapperLocations() {
+        return   ProduceManageConstant.MAPPER_LOCATIONS;
+    }
+
+    @Override
+    public String getBasePackage() {
+        return   ProduceManageConstant.DAO_PACKAGE;
+    }
+
+}
+

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageSwaggerConfigurer.java

@@ -0,0 +1,57 @@
+package com.deer.wms.produce.manage.configurer;
+import com.deer.wms.project.seed.configurer.WebMvcConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * Swagger 配置文件
+ *
+ * Created by Floki on 2017/8/10.
+ */
+@Configuration
+@EnableSwagger2
+public class ProduceManageSwaggerConfigurer extends WebMvcConfigurer {
+    /**
+     * 注册swagger-ui.html
+     *
+     * @param registry
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/**").addResourceLocations("classpath:/static/").addResourceLocations("classpath:/templates/");
+    }
+
+    /**
+     * 创建API基本信息
+     *
+     * @return
+     */
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2).groupName("生产管理")
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.deer.wms.produce.manage"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo apiInfo() {// 创建API的基本信息，这些信息会在Swagger UI中进行显示
+        return new ApiInfoBuilder()
+                .title("使用 Swagger2 构建的 RestFul APIs")// API 标题
+                .description("生产管理服务提供的 RestFul APIs")// API描述
+                .contact(new Contact("guojingxun", "", "1466181575@qq.com")) //联系人
+                .version("1.0")// 版本号
+                .build();
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageWebMvcConfigurer.java

@@ -0,0 +1,37 @@
+package com.deer.wms.produce.manage.configurer;
+import com.deer.wms.intercept.annotation.UserAnnotationMethodArgumentResolver;
+import com.deer.wms.intercept.intercept.AccessIntercept;
+import com.deer.wms.project.seed.configurer.WebMvcConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+
+import java.util.List;
+
+/**
+ * Created by Floki on 2017/9/29.
+ */
+@Configuration
+public class ProduceManageWebMvcConfigurer extends WebMvcConfigurer {
+
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new AccessIntercept()).addPathPatterns("/**");
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        super.addArgumentResolvers(argumentResolvers);
+        argumentResolvers.add(new UserAnnotationMethodArgumentResolver());
+    }
+
+    @Bean
+    RestTemplate restTemplate()
+    {
+        return new RestTemplate();
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ExcelUtils.java

@@ -0,0 +1,38 @@
+package com.deer.wms.produce.manage.constant;
+
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.ss.usermodel.Cell;
+
+import java.text.DecimalFormat;
+
+/**
+ * @Author: weihongyang
+ * @Date: 2019/10/12 13:51
+ * @Version 1.0
+ */
+public class ExcelUtils {
+    /**
+     *对excel单元格数据进行类型匹配
+     */
+    private String getCellValue(Cell cell){
+        String cellValue = "";
+        DecimalFormat df = new DecimalFormat("#");
+        switch (cell.getCellType()) {
+            case Cell.CELL_TYPE_STRING:
+                cellValue =cell.getRichStringCellValue().getString().trim();
+                break;
+            case Cell.CELL_TYPE_NUMERIC:
+                cellValue =df.format(cell.getNumericCellValue()).toString();
+                break;
+            case Cell.CELL_TYPE_BOOLEAN:
+                cellValue =String.valueOf(cell.getBooleanCellValue()).trim();
+                break;
+            case Cell.CELL_TYPE_FORMULA:
+                cellValue =cell.getCellFormula();
+                break;
+            default:
+                cellValue = "";
+        }
+        return cellValue;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManageConstant.java

@@ -0,0 +1,86 @@
+package com.deer.wms.produce.manage.constant;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+
+import com.deer.wms.project.seed.util.RandomUtil;
+
+/**
+ * Created by Floki on 2017/9/30.
+ */
+public class ProduceManageConstant {
+    /**
+     * 项目基础包名称，根据公司实际项目修改
+     */
+    public static final String BASE_PACKAGE = "com.deer.wms.produce.manage";
+
+    /**
+     * Model所在包
+     */
+    public static final String MODEL_PACKAGE = BASE_PACKAGE + ".model";
+
+    /**
+     * Dao所在包
+     */
+    public static final String DAO_PACKAGE = BASE_PACKAGE + ".dao";
+
+    /**
+     * MapperLocations
+     */
+    public static final String MAPPER_LOCATIONS = "classpath*:com/deer/wms/**/mapper/*.xml";
+    
+    /**
+     * CK=出库类型单号；
+     */
+    public static final String DELIVERY_ORDER_TYPE = "CK";
+    /**
+     * PD=盘点类型单号；
+     */
+    public static final String STOCKTAKING_ORDER_TYPE = "PD";
+    /**
+     * DJJ=打卷机编号
+     */
+    public static final String WINDING_MACHINE_TYPE = "DJJ";
+
+    /**
+     * STATUS状态：0，使用
+     */
+    public static final Integer STATUS_AVAILABLE = 0;
+
+    /**
+     * STATUS状态：1，禁用
+     */
+    public static final Integer STATUS_NOTAVAILABLE = 1;
+
+    /**
+     * STATUS状态：2，删除
+     */
+    public static final Integer STATUS_DELETE = 2;
+
+    /**
+     * 物料出入库记录类型：0，入库
+     */
+    public static final Integer TYPE_IN = 0;
+
+    /**
+     * 物料出入库记录类型：1，出库
+     */
+    public static final Integer TYPE_OUT = 1;
+
+    /**
+     * 生产计划审核状态：0等待审核
+     */
+    public static final Integer REVIEW_STATUS_FORREVIEW = 0;
+
+    /**
+     * 生产计划审核状态：1审核通过
+     */
+    public static final Integer REVIEW_STATUS_SUCCESS = 1;
+
+    /**
+     * 生产计划审核状态：2审核失败
+     */
+    public static final Integer REVIEW_STATUS_FAIL = 2;
+
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManagePublicMethod.java

@@ -0,0 +1,46 @@
+package com.deer.wms.produce.manage.constant;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+import com.deer.wms.project.seed.util.RandomUtil;
+
+
+public class ProduceManagePublicMethod {
+
+    /**
+     * 自动生成唯一的物料编码，规则：类型简称（type）+20190728+UUID后十位
+     * type:WL,物料编码；JGD，加工单
+     * @return
+     */
+    public static String creatUniqueCode(String type) {
+        Date date = new Date();
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyyMMddhh");
+        String timePartStr = sdf1.format(date);
+        String uuidStr = UUID.randomUUID().toString().substring(24);
+        String newCode = type+timePartStr+uuidStr;
+
+        return newCode;
+    }
+
+
+
+    //public static String creatOrderCode(String orderType) {
+	//	String orderCode=null;
+    	//Date date = new Date();
+    	//SimpleDateFormat sdf= new SimpleDateFormat("yyyyMMdd");
+    	//String bach= sdf.format(date);
+    	//String rondomStr=RandomUtil.generateString(4);
+	//	if(orderType.equals(ProduceManageConstant.DELIVERY_ORDER_TYPE)) {
+	//		orderCode=orderType+bach+rondomStr;
+	//	}
+	//	if(orderType.equals(ProduceManageConstant.STOCKTAKING_ORDER_TYPE)){
+	//		orderCode=orderType+bach+rondomStr;
+	//	}
+	//	if(orderType.equals(ProduceManageConstant.WINDING_MACHINE_TYPE)){
+	//		orderCode=orderType+bach+rondomStr;
+	//	}
+	//	return orderCode;
+	//}
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MachiningProductMapper.java

@@ -0,0 +1,23 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.MachingProductDto;
+import com.deer.wms.produce.manage.model.MachiningProduct;
+import com.deer.wms.produce.manage.model.MachiningProductHaveBom;
+import com.deer.wms.produce.manage.model.MachiningProductParams;
+import com.deer.wms.produce.manage.model.MachiningProductVo;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MachiningProductMapper extends Mapper<MachiningProduct> {
+    List<MachiningProduct> findList(MachiningProductParams params);
+
+    List<MachiningProduct> findProductList(MachiningProductParams params);
+
+    List<MachiningProductHaveBom> findProductHaveBomList(MachiningProductParams params);
+
+    List<MachiningProduct> findListByClothAttr(MachiningProduct mtAloneMachiningProduct);
+
+    List<MachiningProductVo> findProductListBom(MachiningProductParams params);
+
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MaterialsInfoMapper.java

@@ -0,0 +1,18 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.MaterialsInfo;
+import com.deer.wms.produce.manage.model.MaterialsInfoDto;
+import com.deer.wms.produce.manage.model.MaterialsInfoParams;
+import com.deer.wms.produce.manage.model.MaterialsInfoVO;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+
+import java.util.List;
+
+public interface MaterialsInfoMapper extends Mapper<MaterialsInfo> {
+    List<MaterialsInfoDto> findList(MaterialsInfoParams params);
+
+    MaterialsInfoDto findDetailById(MaterialsInfoParams params);
+    List<MaterialsInfoVO> findMaterialByNameOrNum(MaterialsInfoParams params);
+    List<MaterialsInfoVO> findMaterialsByKeyWords(MaterialsInfoParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MaterialsOutgoingLogMapper.java

@@ -0,0 +1,14 @@
+package com.deer.wms.produce.manage.dao;
+
+
+import com.deer.wms.produce.manage.model.MaterialsOutgoingLog;
+import com.deer.wms.produce.manage.model.MaterialsOutgoingLogParams;
+import com.deer.wms.produce.manage.model.MaterialsOutgoingLogVo;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MaterialsOutgoingLogMapper extends Mapper<MaterialsOutgoingLog> {
+    List<MaterialsOutgoingLogVo> findListByOneMaterial(MaterialsOutgoingLogParams params);
+
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MaterialsStockInfoMapper.java

@@ -0,0 +1,17 @@
+package com.deer.wms.produce.manage.dao;
+
+
+import com.deer.wms.produce.manage.model.MaterialsInfoParams;
+import com.deer.wms.produce.manage.model.MaterialsStockInfo;
+import com.deer.wms.produce.manage.model.MaterialsStockInfoParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MaterialsStockInfoMapper extends Mapper<MaterialsStockInfo> {
+    List<MaterialsStockInfo> findList(MaterialsStockInfoParams params);
+
+    Float getStockQuantityByMaId(MaterialsInfoParams params);
+
+    String getStockPositionByMaId(MaterialsInfoParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java

@@ -0,0 +1,11 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.MtAloneProcess;
+import com.deer.wms.produce.manage.model.MtAloneProcessParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MtAloneProcessMapper extends Mapper<MtAloneProcess> {
+
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMethodsMapper.java

@@ -0,0 +1,11 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.MtAloneProcessMethods;
+import com.deer.wms.produce.manage.model.MtAloneProcessMethodsParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MtAloneProcessMethodsMapper extends Mapper<MtAloneProcessMethods> {
+    List<MtAloneProcessMethods> findList(MtAloneProcessMethodsParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProductNameMapper.java

@@ -0,0 +1,11 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.MtAloneProductName;
+import com.deer.wms.produce.manage.model.MtAloneProductNameParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MtAloneProductNameMapper extends Mapper<MtAloneProductName> {
+    List<MtAloneProductName> findList(MtAloneProductNameParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneSerialNumberMapper.java

@@ -0,0 +1,13 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.MtAloneSerialNumber;
+import com.deer.wms.produce.manage.model.MtAloneSerialNumberParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MtAloneSerialNumberMapper extends Mapper<MtAloneSerialNumber> {
+    List<MtAloneSerialNumber> findList(MtAloneSerialNumberParams params);
+
+    void updatePinCounter(MtAloneSerialNumber mtAloneSerialNumber);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtNumberConfMapper.java

@@ -0,0 +1,13 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.MtNumberConf;
+import com.deer.wms.produce.manage.model.MtNumberConfParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MtNumberConfMapper extends Mapper<MtNumberConf> {
+    List<MtNumberConf> findList(MtNumberConfParams params);
+
+    void updatePinSerial(MtNumberConf mtNumberConf);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtStockProvendorMapper.java

@@ -0,0 +1,11 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.MtStockProvendor;
+import com.deer.wms.produce.manage.model.MtStockProvendorParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface MtStockProvendorMapper extends Mapper<MtStockProvendor> {
+    List<MtStockProvendor> findList(MtStockProvendorParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessBatchRelatMapper.java

@@ -0,0 +1,11 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.ProcessBatchRelat;
+import com.deer.wms.produce.manage.model.ProcessBatchRelatParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProcessBatchRelatMapper extends Mapper<ProcessBatchRelat> {
+    List<ProcessBatchRelat> findList(ProcessBatchRelatParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessBomMapper.java

@@ -0,0 +1,25 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.*;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProcessBomMapper extends Mapper<ProcessBom> {
+    List<ProcessBom> findList(ProcessBomParams params);
+
+    List<ProcessBom> findListById(ProcessBomParams params);
+
+    Integer insertProductProcessBom(ProcessBomParams params);
+
+    void insertProcessBom(List<ProcessBomVo> list);
+
+    void insertProcessMaterialsBom(List<ProcessMaterialsBom> list);
+
+    List<ProcessBom> findListByProductBom(ProcessBomParams params);
+    List<ProcessBom> findListByProductBomId(ProcessBomParams params);
+
+    List<ProcessBomDto> findListByProductNameId(ProcessBomParams params);
+
+    void insertOrUpdate(List<ProcessBom> processBomList);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessDetectRelatMapper.java

@@ -0,0 +1,12 @@
+package com.deer.wms.produce.manage.dao;
+
+
+import com.deer.wms.produce.manage.model.ProcessDetectRelat;
+import com.deer.wms.produce.manage.model.ProcessDetectRelatParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProcessDetectRelatMapper extends Mapper<ProcessDetectRelat> {
+    List<ProcessDetectRelat> findList(ProcessDetectRelatParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java

@@ -0,0 +1,20 @@
+package com.deer.wms.produce.manage.dao;
+
+
+import com.deer.wms.produce.manage.model.*;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProcessMaterialsBomMapper extends Mapper<ProcessMaterialsBom> {
+
+    List<ProcessMaterialsBomVo> findProcMatBomVoListByProId(ProcessMaterialsBomParams params);
+
+    List<ProcessMaterialsBom> findListByProcessBomId(ProcessMaterialsBomParams params);
+
+    List<MaterialInfoVo> findMaterilaListByProcessBomId(ProcessBom processBom);
+
+
+    void insertOrUpdate(List<ProcessMaterialsBom> processMaterialsBomList);
+
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsMapper.java

@@ -0,0 +1,8 @@
+package com.deer.wms.produce.manage.dao;
+
+
+import com.deer.wms.produce.manage.model.ProcessMaterials;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+public interface ProcessMaterialsMapper extends Mapper<ProcessMaterials> {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessQualityInfoMapper.java

@@ -0,0 +1,8 @@
+package com.deer.wms.produce.manage.dao;
+
+
+import com.deer.wms.produce.manage.model.ProcessQualityInfo;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+public interface ProcessQualityInfoMapper extends Mapper<ProcessQualityInfo> {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectDetMapper.java

@@ -0,0 +1,11 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.ProductBatchDetectDet;
+import com.deer.wms.produce.manage.model.ProductBatchDetectDetParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProductBatchDetectDetMapper extends Mapper<ProductBatchDetectDet> {
+    List<ProductBatchDetectDet> findList(ProductBatchDetectDetParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductBatchDetectMapper.java

@@ -0,0 +1,11 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.ProductBatchDetect;
+import com.deer.wms.produce.manage.model.ProductBatchDetectParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProductBatchDetectMapper extends Mapper<ProductBatchDetect> {
+    List<ProductBatchDetect> findList(ProductBatchDetectParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessBatchDetMapper.java

@@ -0,0 +1,11 @@
+package com.deer.wms.produce.manage.dao;
+
+import com.deer.wms.produce.manage.model.ProductProcessBatchDet;
+import com.deer.wms.produce.manage.model.ProductProcessBatchDetParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProductProcessBatchDetMapper extends Mapper<ProductProcessBatchDet> {
+    List<ProductProcessBatchDet> findList(ProductProcessBatchDetParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessBomMapper.java

@@ -0,0 +1,22 @@
+package com.deer.wms.produce.manage.dao;
+
+
+import com.deer.wms.produce.manage.model.ProductProcessBom;
+import com.deer.wms.produce.manage.model.ProductProcessBomDto;
+import com.deer.wms.produce.manage.model.ProductProcessBomParams;
+import com.deer.wms.produce.manage.model.ProductProcessBomVO;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProductProcessBomMapper extends Mapper<ProductProcessBom> {
+    List<ProductProcessBomDto> findProBomAndProList(ProductProcessBomParams params);
+
+    List<ProductProcessBom> findList(ProductProcessBomParams params);
+
+    List<ProductProcessBomDto> findListByTerm(ProductProcessBomParams params);
+
+    List<ProductProcessBom> findListById(ProductProcessBomParams params);
+
+    List<ProductProcessBomVO> findByProductNameAndProductNum(ProductProcessBomParams mtAloneProductProcessBomParams);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessMapper.java

@@ -0,0 +1,13 @@
+package com.deer.wms.produce.manage.dao;
+
+
+import com.deer.wms.produce.manage.model.ProductProcess;
+import com.deer.wms.produce.manage.model.ProductProcessParams;
+import com.deer.wms.produce.manage.model.ProductProcessVo;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
+public interface ProductProcessMapper extends Mapper<ProductProcess> {
+    List<ProductProcessVo> findList(ProductProcessParams params);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MachiningProductMapper.xml

@@ -0,0 +1,142 @@
+<?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.deer.wms.produce.manage.dao.MachiningProductMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MachiningProduct">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="product_code" jdbcType="VARCHAR" property="productCode" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="product_type_code" jdbcType="VARCHAR" property="productTypeCode" />
+    <result column="product_variety_code" jdbcType="VARCHAR" property="productVarietyCode" />
+    <result column="shell_fabric" jdbcType="VARCHAR" property="shellFabric" />
+    <result column="tissue" jdbcType="VARCHAR" property="tissue" />
+    <result column="larghezza" jdbcType="REAL" property="larghezza" />
+    <result column="grammage" jdbcType="REAL" property="grammage" />
+    <result column="density" jdbcType="VARCHAR" property="density" />
+    <result column="specification" jdbcType="VARCHAR" property="specification" />
+    <result column="processing_mode" jdbcType="VARCHAR" property="processingMode" />
+    <result column="product_bar_code" jdbcType="VARCHAR" property="productBarCode" />
+    <result column="specimen_bar_code" jdbcType="VARCHAR" property="specimenBarCode" />
+    <result column="cloth_attr" jdbcType="INTEGER" property="clothAttr" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="note" jdbcType="VARCHAR" property="note" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+      <result column="unit_id" jdbcType="INTEGER" property="unitId" />
+  </resultMap>
+    <resultMap id="MachingProductDtoResultMap" type="com.deer.wms.produce.manage.model.MachingProductDto" extends="BaseResultMap">
+        <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
+        <result column="process_name" jdbcType="VARCHAR" property="processName" />
+        <result column="process_apartment" jdbcType="VARCHAR" property="processApartment" />
+        <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+        <result column="process_step" jdbcType="INTEGER" property="processStep" />
+    </resultMap>
+
+    <resultMap id="ProductHaveBomResultMap" type="com.deer.wms.produce.manage.model.MachiningProductHaveBom">
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="version" jdbcType="VARCHAR" property="version" />
+        <result column="status" jdbcType="INTEGER" property="status" />
+        <result column="product_code" jdbcType="VARCHAR" property="productCode" />
+        <result column="product_name" jdbcType="VARCHAR" property="productName" />
+        <result column="product_type_code" jdbcType="VARCHAR" property="productTypeCode" />
+        <result column="product_variety_code" jdbcType="VARCHAR" property="productVarietyCode" />
+        <result column="shell_fabric" jdbcType="VARCHAR" property="shellFabric" />
+        <result column="tissue" jdbcType="VARCHAR" property="tissue" />
+        <result column="larghezza" jdbcType="REAL" property="larghezza" />
+        <result column="grammage" jdbcType="REAL" property="grammage" />
+        <result column="density" jdbcType="VARCHAR" property="density" />
+        <result column="specification" jdbcType="VARCHAR" property="specification" />
+        <result column="processing_mode" jdbcType="VARCHAR" property="processingMode" />
+        <result column="product_bar_code" jdbcType="VARCHAR" property="productBarCode" />
+        <result column="specimen_bar_code" jdbcType="VARCHAR" property="specimenBarCode" />
+        <result column="cloth_attr" jdbcType="INTEGER" property="clothAttr" />
+        <result column="description" jdbcType="VARCHAR" property="description" />
+        <result column="note" jdbcType="VARCHAR" property="note" />
+        <result column="company_id" jdbcType="INTEGER" property="companyId" />
+        <result column="product_process_id" jdbcType="INTEGER" property="productProcessId" />
+        <result column="product_process_name" jdbcType="VARCHAR" property="productProcessName" />
+    </resultMap>
+
+
+    <resultMap id="MachiningProductVo" type="com.deer.wms.produce.manage.model.MachiningProductVo" extends="BaseResultMap">
+        <result column="specification_bom" jdbcType="VARCHAR" property="specificationBom" />
+        <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
+    </resultMap>
+
+  <select id="findList" parameterType="com.deer.wms.produce.manage.model.MachiningProductParams" resultMap="BaseResultMap">
+    SELECT mappb.*,mamp.*,COUNT(mapb.process_step) process_step
+    FROM mt_alone_machining_product mamp
+    LEFT JOIN mt_alone_product_process_bom mappb ON mappb.product_id = mamp.id
+    LEFT JOIN mt_alone_process_bom mapb ON mapb.product_process_id = mappb.id
+    <where>
+      <if test="productCode != null and productCode != ''">
+        AND mamp.product_code = #{productCode}
+      </if>
+      <if test="productName != null and productName != ''">
+        AND mamp.product_name = #{productName}
+      </if>
+      <if test="specification != null and specification != ''">
+        AND mamp.specification = #{specification}
+      </if>
+      <if test="companyId != null">
+        AND mapb.company_id = #{companyId}
+      </if>
+    </where>
+    GROUP BY mapb.product_process_id
+  </select>
+
+
+
+  <select id="findProductList" parameterType="com.deer.wms.produce.manage.model.MachiningProductParams" resultMap="BaseResultMap">
+      SELECT product.*
+      FROM  mt_alone_machining_product product
+      <where>
+          <if test="companyId != null">
+              AND product.company_id = #{companyId}
+          </if>
+      </where>
+  </select>
+
+
+    <select id="findProductListBom" parameterType="com.deer.wms.produce.manage.model.MachiningProductParams" resultMap="MachiningProductVo">
+        SELECT a.*,b.specification as specification_bom,c.unit_name
+        from mt_alone_machining_product a
+        LEFT JOIN mt_alone_product_process_bom b ON a.id = b.product_id
+        LEFT JOIN unit c ON a.unit_id = c.unit_id
+        <where>
+            <if test="companyId != null">
+                AND a.company_id = #{companyId}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="findProductHaveBomList" parameterType="com.deer.wms.produce.manage.model.MachiningProductParams" resultMap="ProductHaveBomResultMap">
+        SELECT product.*, probom.id product_process_id, probom.product_process_name
+        FROM  mt_alone_machining_product product
+        INNER JOIN mt_alone_product_process_bom probom ON product.id = probom.product_id
+        <where>
+            <if test="companyId != null">
+                AND product.company_id = #{companyId}
+            </if>
+        </where>
+    </select>
+
+    <select id="findListByClothAttr" parameterType="com.deer.wms.produce.manage.model.MachiningProduct" resultMap="BaseResultMap">
+        select * from mt_alone_machining_product machiningproduct
+        where 1=1
+        <if test="clothAttr!=null and clothAttr!=''">
+            <![CDATA[  AND machiningproduct.cloth_attr =  #{clothAttr}]]>
+        </if>
+    </select>
+
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml

@@ -0,0 +1,140 @@
+<?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.deer.wms.produce.manage.dao.MaterialsInfoMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MaterialsInfo">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+    <result column="parent_id" jdbcType="INTEGER" property="parentId" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="unit_id" jdbcType="INTEGER" property="unitId" />
+    <result column="specification" jdbcType="VARCHAR" property="specification" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+    <result column="supplier_id" jdbcType="INTEGER" property="supplierId" />
+  </resultMap>
+
+   <resultMap id="MatInfoDTOResultMap" type="com.deer.wms.produce.manage.model.MaterialsInfoDto">
+     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+     <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+     <result column="position_name" jdbcType="VARCHAR" property="positionName" />
+     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+     <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
+     <result column="parent_name" jdbcType="VARCHAR" property="parentName" />
+     <result column="supplier_name" jdbcType="VARCHAR" property="supplierName" />
+   </resultMap>
+
+    <resultMap extends="BaseResultMap" id="mtAloneProcessMaterialsBomVO" type="com.deer.wms.produce.manage.model.MaterialsInfoVO">
+        <result column="process_bom_id" jdbcType="INTEGER" property="processBomId" />
+        <result column="dosage" jdbcType="REAL" property="dosage" />
+    </resultMap>
+
+
+    <select id="findList" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams"  resultMap="MatInfoDTOResultMap">
+        SELECT
+        materials.id,
+        materials.create_time,
+        materials.materials_name,
+        (SELECT m.materials_name FROM mt_alone_materials_info m
+        WHERE m.id =  materials.parent_id ) parent_name,
+        materials.specification,
+        materials.memo,
+        IFNULL(stock.quantity,0) quantity,
+        stock.position_name,
+        unit.unit_name,
+        com.company_name,
+        user_info.user_name,
+        supplier.supplier_name
+        FROM mt_alone_materials_info materials
+        LEFT JOIN mt_alone_materials_stock_info stock ON materials.id = stock.materials_id AND materials.company_id = stock.company_id
+        LEFT JOIN unit ON materials.unit_id = unit.unit_id AND materials.company_id = unit.company_id
+        LEFT JOIN company com ON materials.company_id = com.company_id
+        LEFT JOIN user_info ON materials.operator_id = user_info.user_id AND materials.company_id = user_info.company_id
+        LEFT JOIN supplier_manage supplier ON materials.supplier_id = supplier.supplier_id AND materials.company_id = supplier.company_id
+        <where>
+            <if test="keywords != null and keywords != ''">
+                AND materials.create_time LIKE binary CONCAT('%', #{keywords}, '%')
+                OR materials.materials_name LIKE CONCAT('%', #{keywords}, '%')
+                OR materials.specification LIKE CONCAT('%', #{keywords}, '%')
+                OR  materials.memo LIKE CONCAT('%', #{keywords}, '%')
+                OR  stock.quantity LIKE CONCAT('%', #{keywords}, '%')
+                OR  stock.position_name LIKE CONCAT('%', #{keywords}, '%')
+                OR  unit.unit_name LIKE CONCAT('%', #{keywords}, '%')
+                OR  com.company_name LIKE CONCAT('%', #{keywords}, '%')
+                OR  supplier.supplier_name LIKE CONCAT('%', #{keywords}, '%')
+            </if>
+            <if test="begDate!=null and begDate!=''">
+                <![CDATA[  AND DATE_FORMAT(materials.create_time, '%Y-%m-%d')>=  DATE_FORMAT(#{begDate}, '%Y-%m-%d')   ]]>
+            </if>
+            <if test="endDate!=null and endDate!=''">
+                <![CDATA[  AND DATE_FORMAT(materials.create_time, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d')    ]]>
+            </if>
+            <if test="companyId != null">
+                AND com.company_id = #{companyId}
+            </if>
+        </where> order by materials.id
+    </select>
+
+    <select id="findDetailById" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams"  resultMap="MatInfoDTOResultMap">
+        SELECT
+        materials.create_time,
+        materials.materials_name,
+        (SELECT m.materials_name FROM mt_alone_materials_info m
+        WHERE m.id =  materials.parent_id ) parent_name,
+        materials.specification,
+        materials.memo,
+        IFNULL(stock.quantity,0) quantity,
+        stock.position_name,
+        unit.unit_name,
+        com.company_name company_name,
+        user_info.user_name,
+        supplier.supplier_name
+        FROM mt_alone_materials_info materials
+        LEFT JOIN mt_alone_materials_stock_info stock ON materials.id = stock.materials_id AND materials.company_id = stock.company_id
+        LEFT JOIN unit ON materials.unit_id = unit.unit_id AND materials.company_id = unit.company_id
+        LEFT JOIN company com ON materials.company_id = com.company_id
+        LEFT JOIN user_info ON materials.operator_id = user_info.user_id AND materials.company_id = user_info.company_id
+        LEFT JOIN supplier_manage supplier ON materials.supplier_id = supplier.supplier_id AND materials.company_id = supplier.company_id
+        <where>
+            <if test="materialsId != null">
+                AND materials.id = #{materialsId}
+            </if>
+            <if test="companyId != null">
+                AND com.company_id = #{companyId}
+            </if>
+        </where>
+    </select>
+
+    <select id="findMaterialByNameOrNum" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams" resultMap="mtAloneProcessMaterialsBomVO">
+        SELECT * from mt_alone_materials_info materialsInfo inner JOIN mt_alone_process_materials_bom pmb on materialsInfo.id = pmb.materials_id
+        WHERE 1=1
+        <if test="materialName!=null and materialName!=''">
+            <![CDATA[ AND materialsInfo.materials_name = #{materialName} ]]>
+        </if>
+
+        <if test="materialCode!=null and materialCode!=''">
+            <![CDATA[ And materialsInfo.code= #{materialCode}   ]]>
+        </if>
+
+    </select>
+
+    <select id="findMaterialsByKeyWords" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams" resultMap="mtAloneProcessMaterialsBomVO">
+        SELECT * from mt_alone_materials_info materialsInfo inner JOIN mt_alone_process_materials_bom pmb on materialsInfo.id = pmb.materials_id
+        <where>
+            <if test="keywords != null and keywords != ''">
+                AND materialsInfo.materials_name LIKE CONCAT('%', #{keywords}, '%')
+                OR  materialsInfo.code LIKE CONCAT('%', #{keywords}, '%')
+                OR  materialsInfo.specification LIKE CONCAT('%', #{keywords}, '%')
+                OR  materialsInfo.unit_id LIKE CONCAT('%', #{keywords}, '%')
+                OR  pmb.dosage LIKE CONCAT('%', #{keywords}, '%')
+            </if>
+        </where>
+
+    </select>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsOutgoingLogMapper.xml

@@ -0,0 +1,50 @@
+<?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.deer.wms.produce.manage.dao.MaterialsOutgoingLogMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MaterialsOutgoingLog">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="materials_id" jdbcType="INTEGER" property="materialsId" />
+    <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+    <result column="quantity" jdbcType="REAL" property="quantity" />
+    <result column="position_name" jdbcType="VARCHAR" property="positionName" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+
+    <resultMap id="MatOutVOResultMap" type="com.deer.wms.produce.manage.model.MaterialsOutgoingLogVo">
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+        <result column="position_name" jdbcType="VARCHAR" property="positionName" />
+        <result column="user_name" jdbcType="VARCHAR" property="userName" />
+    </resultMap>
+
+    <select id="findListByOneMaterial" parameterType="com.deer.wms.produce.manage.model.MaterialsOutgoingLogParams"  resultMap="MatOutVOResultMap">
+        SELECT
+        outgoing.id,
+        outgoing.create_time,
+        IFNULL(outgoing.quantity,0) quantity,
+        outgoing.position_name,
+        user_info.user_name
+        FROM mt_alone_materials_outgoing_log outgoing
+        LEFT JOIN user_info ON outgoing.operator_id = user_info.user_id AND outgoing.company_id = user_info.company_id
+        <where>
+            <if test="materialsId != null">
+                AND outgoing.materials_id = #{materialsId}
+            </if>
+            <if test="type != null">
+                AND outgoing.type = #{type}
+            </if>
+            <if test="companyId != null">
+                AND outgoing.company_id = #{companyId}
+            </if>
+        </where> ORDER BY outgoing.id
+    </select>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsStockInfoMapper.xml

@@ -0,0 +1,47 @@
+<?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.deer.wms.produce.manage.dao.MaterialsStockInfoMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MaterialsStockInfo">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="materials_id" jdbcType="INTEGER" property="materialsId" />
+    <result column="quantity" jdbcType="REAL" property="quantity" />
+    <result column="unit_id" jdbcType="INTEGER" property="unitId" />
+    <result column="position_name" jdbcType="VARCHAR" property="positionName" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+
+    <select id="getStockQuantityByMaId" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams"  resultType="java.lang.Float">
+        SELECT SUM(IFNULL(stock.quantity,0))
+        FROM mt_alone_materials_stock_info stock
+        <where>
+            <if test="materialsId != null">
+                stock.materials_id = #{materialsId}
+            </if>
+            <if test="companyId != null">
+                AND stock.company_id = #{companyId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getStockPositionByMaId" parameterType="com.deer.wms.produce.manage.model.MaterialsInfoParams"  resultType="java.lang.String">
+        SELECT stock.position_name
+        FROM mt_alone_materials_stock_info stock
+        <where>
+            <if test="materialsId != null">
+                stock.materials_id = #{materialsId}
+            </if>
+            <if test="companyId != null">
+                AND stock.company_id = #{companyId}
+            </if>
+        </where>
+    </select>
+
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml

@@ -0,0 +1,38 @@
+<?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.deer.wms.produce.manage.dao.MtAloneProcessMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MtAloneProcess">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="process_name" jdbcType="VARCHAR" property="processName" />
+    <result column="product_process_id" jdbcType="INTEGER" property="productProcessId" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="specification" jdbcType="VARCHAR" property="specification" />
+    <result column="process_source" jdbcType="INTEGER" property="processSource" />
+    <result column="process_price" jdbcType="REAL" property="processPrice" />
+    <result column="process_unit_price" jdbcType="REAL" property="processUnitPrice" />
+    <result column="original_len" jdbcType="REAL" property="originalLen" />
+    <result column="loss" jdbcType="REAL" property="loss" />
+    <result column="after_len" jdbcType="REAL" property="afterLen" />
+    <result column="shrinkage" jdbcType="VARCHAR" property="shrinkage" />
+    <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+    <result column="supplier_id" jdbcType="INTEGER" property="supplierId" />
+    <result column="process_step" jdbcType="INTEGER" property="processStep" />
+    <result column="merchandiser_id" jdbcType="INTEGER" property="merchandiserId" />
+    <result column="product_bar_code" jdbcType="VARCHAR" property="productBarCode" />
+    <result column="process_bom_id" jdbcType="INTEGER" property="processBomId" />
+    <result column="process_bom_name" jdbcType="VARCHAR" property="processBomName" />
+    <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+
+
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMethodsMapper.xml

@@ -0,0 +1,28 @@
+<?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.deer.wms.produce.manage.dao.MtAloneProcessMethodsMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MtAloneProcessMethods">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <result column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="updater_id" jdbcType="BIGINT" property="updaterId" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="process_methods_code" jdbcType="VARCHAR" property="processMethodsCode" />
+    <result column="process_methods_name" jdbcType="VARCHAR" property="processMethodsName" />
+    <result column="note" jdbcType="VARCHAR" property="note" />
+  </resultMap>
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_process_methods
+    <if test="keywords != null and keywords != ''">
+      process_methods_name LIKE CONCAT('%', #{keywords}, '%')
+    </if>
+  </select>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProductNameMapper.xml

@@ -0,0 +1,29 @@
+<?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.deer.wms.produce.manage.dao.MtAloneProductNameMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MtAloneProductName">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <result column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="updater_id" jdbcType="BIGINT" property="updaterId" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="product_name_code" jdbcType="VARCHAR" property="productNameCode" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="note" jdbcType="VARCHAR" property="note" />
+  </resultMap>
+
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_product_name
+    <if test="keywords != null and keywords != ''">
+      product_name LIKE CONCAT('%', #{keywords}, '%')
+    </if>
+  </select>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneSerialNumberMapper.xml

@@ -0,0 +1,34 @@
+<?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.deer.wms.produce.manage.dao.MtAloneSerialNumberMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MtAloneSerialNumber">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <result column="id" jdbcType="BIGINT" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="updater_id" jdbcType="BIGINT" property="updaterId" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="first_large_class" jdbcType="VARCHAR" property="firstLargeClass" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="sort_name" jdbcType="VARCHAR" property="sortName" />
+    <result column="pin_counter" jdbcType="INTEGER" property="pinCounter" />
+    <result column="note" jdbcType="VARCHAR" property="note" />
+  </resultMap>
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT * FROM mt_alone_serial_number
+    WHERE first_large_class = #{firstLargeClass}
+    AND product_name = #{productName}
+    AND sort_name = #{sortName}
+  </select>
+
+  <update id="updatePinCounter" parameterType="com.deer.wms.produce.manage.model.MtAloneSerialNumber">
+    UPDATE mt_alone_serial_number SET pin_counter = #{pinCounter}
+    WHERE id = #{id}
+  </update>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtNumberConfMapper.xml

@@ -0,0 +1,29 @@
+<?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.deer.wms.produce.manage.dao.MtNumberConfMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MtNumberConf">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <result column="id" jdbcType="BIGINT" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="updater_id" jdbcType="BIGINT" property="updaterId" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="pin_serial" jdbcType="INTEGER" property="pinSerial" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT * FROM mt_number_conf
+  </select>
+
+  <update id="updatePinSerial" parameterType="com.deer.wms.produce.manage.model.MtNumberConf">
+    UPDATE mt_number_conf SET pin_serial = #{pinSerial}
+    WHERE id = #{id}
+  </update>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtStockProvendorMapper.xml

@@ -0,0 +1,46 @@
+<?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.deer.wms.produce.manage.dao.MtStockProvendorMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.MtStockProvendor">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <result column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
+    <result column="updater_id" jdbcType="BIGINT" property="updaterId" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="provendor_type" jdbcType="INTEGER" property="provendorType" />
+    <result column="customer_code" jdbcType="VARCHAR" property="customerCode" />
+    <result column="provendor_name" jdbcType="VARCHAR" property="provendorName" />
+    <result column="first_large_class" jdbcType="VARCHAR" property="firstLargeClass" />
+    <result column="fax" jdbcType="VARCHAR" property="fax" />
+    <result column="contact_name" jdbcType="VARCHAR" property="contactName" />
+    <result column="tel" jdbcType="VARCHAR" property="tel" />
+    <result column="position" jdbcType="VARCHAR" property="position" />
+    <result column="gender" jdbcType="VARCHAR" property="gender" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_stock_provendor
+    <where>
+      <if test="keywords != null and keywords != ''">
+        (
+        provendor_name LIKE CONCAT('%', #{keywords}, '%')
+        )
+      </if>
+      <if test="firstLargeClass != null and firstLargeClass != ''">
+        AND  first_large_class = #{firstLargeClass}
+      </if>
+    </where>
+    ORDER BY create_time DESC
+  </select>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBatchRelatMapper.xml

@@ -0,0 +1,24 @@
+<?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.deer.wms.produce.manage.dao.ProcessBatchRelatMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProcessBatchRelat">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="batch_id" jdbcType="INTEGER" property="batchId" />
+    <result column="process_id" jdbcType="INTEGER" property="processId" />
+    <result column="batch_code" jdbcType="VARCHAR" property="batchCode" />
+    <result column="len" jdbcType="REAL" property="len" />
+    <result column="delivery_len" jdbcType="REAL" property="deliveryLen" />
+    <result column="detection_len" jdbcType="REAL" property="detectionLen" />
+    <result column="shrinkage" jdbcType="VARCHAR" property="shrinkage" />
+    <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBomMapper.xml

@@ -0,0 +1,164 @@
+<?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.deer.wms.produce.manage.dao.ProcessBomMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProcessBom">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="process_name" jdbcType="VARCHAR" property="processName" />
+    <result column="product_process_id" jdbcType="INTEGER" property="productProcessId" />
+    <result column="specification" jdbcType="VARCHAR" property="specification" />
+    <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+    <result column="process_step" jdbcType="INTEGER" property="processStep" />
+    <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+    <result column="process_num" jdbcType="VARCHAR" property="processNum" />
+    <result column="process_apartment" jdbcType="VARCHAR" property="processApartment" />
+
+  </resultMap>
+    <resultMap id="ProcessBomDto" type="com.deer.wms.produce.manage.model.ProcessBomDto" extends="BaseResultMap">
+
+        <collection property="processMaterialsBomDtoList" ofType="com.deer.wms.produce.manage.model.ProcessMaterialsBomDto">
+            <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+            <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+            <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+            <result column="version" jdbcType="INTEGER" property="version" />
+            <result column="status" jdbcType="INTEGER" property="status" />
+            <result column="process_bom_id" jdbcType="INTEGER" property="processBomId" />
+            <result column="materials_id" jdbcType="INTEGER" property="materialsId" />
+            <result column="code" jdbcType="VARCHAR" property="code" />
+            <result column="specification" jdbcType="VARCHAR" property="specification" />
+            <result column="dosage" jdbcType="REAL" property="dosage" />
+            <result column="unit_id" jdbcType="INTEGER" property="unitId" />
+            <result column="memo" jdbcType="VARCHAR" property="memo" />
+            <result column="company_id" jdbcType="INTEGER" property="companyId" />
+            <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+        </collection>
+    </resultMap>
+
+    <resultMap id="ProcessBomDTOResultMap" type="com.deer.wms.produce.manage.model.ProcessBomDto">
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="process_name" jdbcType="VARCHAR" property="processName" />
+        <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+        <result column="process_step" jdbcType="INTEGER" property="processStep" />
+        <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+        <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+        <result column="product_process_name" jdbcType="VARCHAR" property="productProcessName" />
+    </resultMap>
+
+    <select id="findList" resultMap="BaseResultMap">
+        SELECT *
+        FROM mt_alone_process_bom
+        <where>
+            <if test="companyId != null">
+                AND company_id = #{companyId}
+            </if>
+        </where>
+        GROUP BY process_name
+    </select>
+
+    <select id="findListById" resultMap="ProcessBomDto">
+        SELECT
+        mapb.id,mapb.process_name,mapb.process_apartment,mapb.process_step,mapb.process_content,mapab.code,mapab.specification,mapab.dosage,mami.materials_name
+        FROM mt_alone_product_process_bom mappb
+        LEFT JOIN mt_alone_process_bom mapb ON mappb.id = mapb.product_process_id
+        LEFT JOIN mt_alone_process_materials_bom mapab ON mapb.id = mapab.process_bom_id
+        LEFT JOIN mt_alone_materials_info mami ON mapab.materials_id = mami.id
+        WHERE mapb.product_process_id = #{productProcessId}
+        ORDER BY mapb.process_step
+    </select>
+
+    <select id="findListByProductNameId" resultMap="ProcessBomDto">
+        SELECT
+        mapb.id,mapb.product_process_id,mapb.process_name,mapb.process_apartment,mapb.process_step,mapb.process_content,mapab.code,mapab.specification,mapab.dosage,mapab.materials_id,mami.materials_name
+        FROM mt_alone_product_process_bom mappb
+        LEFT JOIN mt_alone_process_bom mapb ON mappb.id = mapb.product_process_id
+        LEFT JOIN mt_alone_process_materials_bom mapab ON mapb.id = mapab.process_bom_id
+        LEFT JOIN mt_alone_materials_info mami ON mapab.materials_id = mami.id
+        WHERE mappb.product_id = #{productId}
+        ORDER BY mapb.process_step
+    </select>
+
+    <insert id="insertOrUpdate">
+        INSERT INTO mt_alone_process_bom
+        (id,create_time,process_name,product_process_id,specification,process_content,process_step,process_apartment)
+        VALUES
+        <foreach collection="list" index="index" item="item" separator=",">
+            (#{item.id}, #{item.createTime}, #{item.processName}, #{item.productProcessId},
+            #{item.specification},#{item.processContent}, #{item.processStep}, #{item.processApartment})
+        </foreach>
+        ON DUPLICATE KEY UPDATE
+        process_name = VALUES(process_name),
+        product_process_id = VALUES(product_process_id),
+        specification = VALUES(specification),
+        process_content = VALUES(process_content),
+        process_step = VALUES(process_step),
+        process_apartment = VALUES(process_apartment)
+    </insert>
+
+    <insert id="insertProductProcessBom">
+        INSERT INTO mt_alone_product_process_bom
+        (create_time,version,product_process_name,product_id,specification,process_content,memo,company_id)
+        VALUE(#{createTime},#{version},#{productProcessName},#{productId},#{specification},#{processContent},#{memo},#{companyId})
+        <selectKey keyColumn="id" resultType="Integer" keyProperty="id" order="AFTER">
+            SELECT LAST_INSERT_ID()
+        </selectKey>
+    </insert>
+
+    <insert id="insertProcessBom" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="Id">
+        INSERT INTO
+        mt_alone_process_bom(create_time,process_name,product_process_id,specification,process_content,process_step,memo,company_id,process_apartment)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+                #{item.createTime},
+                #{item.processName},
+                #{item.productProcessId},
+                #{item.specification},
+                #{item.processContent},
+                #{item.memo},
+                #{item.companyId},
+                #{item.processApartment}
+            )
+        </foreach>
+    </insert>
+
+    <insert id="insertProcessMaterialsBom" parameterType="java.util.List">
+        INSERT INTO
+        mt_alone_process_materials_bom(create_time,process_bom_id,materials_id,code,specification,dosage,memo,company_id)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+                #{item.createTime},
+                #{item.processBomId},
+                #{item.materialsId},
+                #{item.code},
+                #{item.specification},
+                #{item.dosage},
+                #{item.memo},
+                #{item.company_id}
+            )
+        </foreach>
+    </insert>
+
+    <select id="findListByProductBom" parameterType="com.deer.wms.produce.manage.model.ProcessBomParams" resultMap="BaseResultMap">
+        SELECT procbom.*
+        FROM mt_alone_process_bom procbom
+        <where>
+            <if test="productProcessId != null and productProcessId != ''">
+                AND procbom.product_process_id = #{productProcessId}
+            </if>
+            <if test="companyId != null">
+                AND procbom.company_id = #{companyId}
+            </if>
+        </where> ORDER BY procbom.process_step
+    </select>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessDetectRelatMapper.xml

@@ -0,0 +1,19 @@
+<?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.deer.wms.produce.manage.dao.ProcessDetectRelatMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProcessDetectRelat">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="process_id" jdbcType="INTEGER" property="processId" />
+    <result column="product_bar_code" jdbcType="VARCHAR" property="productBarCode" />
+    <result column="product_bar_det_code" jdbcType="VARCHAR" property="productBarDetCode" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml

@@ -0,0 +1,125 @@
+<?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.deer.wms.produce.manage.dao.ProcessMaterialsBomMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProcessMaterialsBom">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="process_bom_id" jdbcType="INTEGER" property="processBomId" />
+    <result column="materials_id" jdbcType="INTEGER" property="materialsId" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="specification" jdbcType="VARCHAR" property="specification" />
+    <result column="dosage" jdbcType="REAL" property="dosage" />
+    <result column="unit_id" jdbcType="INTEGER" property="unitId" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+
+    <resultMap id="ProcessMatBomDTOResultMap" type="com.deer.wms.produce.manage.model.ProcessMaterialsBomDto">
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+        <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+        <result column="product_process_name" jdbcType="VARCHAR" property="productProcessName" />
+        <result column="process_name" jdbcType="VARCHAR" property="processName" />
+    </resultMap>
+
+    <resultMap id="ProcessMatBomVoResultMap" type="com.deer.wms.produce.manage.model.ProcessMaterialsBomVo">
+        <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+        <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
+        <result column="process_step" jdbcType="INTEGER" property="processStep" />
+        <result column="process_name" jdbcType="VARCHAR" property="processName" />
+    </resultMap>
+
+    <resultMap id="MaterialsInfoBaseResultMap" type="com.deer.wms.produce.manage.model.MaterialsInfo">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="version" jdbcType="VARCHAR" property="version" />
+        <result column="status" jdbcType="INTEGER" property="status" />
+        <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+        <result column="parent_id" jdbcType="INTEGER" property="parentId" />
+        <result column="code" jdbcType="VARCHAR" property="code" />
+        <result column="unit_id" jdbcType="INTEGER" property="unitId" />
+        <result column="specification" jdbcType="VARCHAR" property="specification" />
+        <result column="memo" jdbcType="VARCHAR" property="memo" />
+        <result column="company_id" jdbcType="INTEGER" property="companyId" />
+        <result column="supplier_id" jdbcType="INTEGER" property="supplierId" />
+    </resultMap>
+    <resultMap id="ProcessMaterialBomResultMap" type="com.deer.wms.produce.manage.model.MaterialInfoVo" extends="MaterialsInfoBaseResultMap">
+        <result column="specification_materilas_bom" jdbcType="VARCHAR" property="specificationMaterilasBom" />
+        <result column="dosage" jdbcType="FLOAT" property="dosage" />
+
+    </resultMap>
+
+    <select id="findProcMatBomVoListByProId" parameterType="com.deer.wms.produce.manage.model.ProcessMaterialsBomParams" resultMap="ProcessMatBomVoResultMap">
+        SELECT materials.code, materials.materials_name,
+        unit.unit_name, matbom.specification, procbom.process_name,
+        procbom.process_step, matbom.dosage, stock.quantity, (stock.quantity-matbom.dosage) AS remain,
+        probom.product_process_name, product.product_name
+        FROM mt_alone_machining_product product
+        LEFT JOIN mt_alone_product_process_bom probom ON probom.product_id = product.id AND probom.company_id = product.company_id
+        LEFT JOIN mt_alone_process_bom procbom ON procbom.product_process_id = probom.id AND procbom.company_id = probom.company_id
+        LEFT JOIN mt_alone_process_materials_bom matbom ON matbom.process_bom_id = procbom.id AND matbom.company_id = procbom.company_id
+        LEFT JOIN mt_alone_materials_info materials ON matbom.materials_id = materials.id AND matbom.company_id = materials.company_id
+        LEFT JOIN mt_alone_materials_stock_info stock ON materials.id = stock.materials_id AND stock.company_id = materials.company_id
+        LEFT JOIN unit ON matbom.unit_id = unit.unit_id AND matbom.company_id = unit.company_id
+        <where>
+            <if test="companyId != null">
+                AND product.company_id = #{companyId}
+            </if>
+            <if test="productId != null">
+                AND product.id = #{productId}
+            </if>
+        </where>
+    </select>
+
+    <select id="findListByProcessBomId" parameterType="com.deer.wms.produce.manage.model.ProcessMaterialsBomParams" resultMap="BaseResultMap">
+        SELECT matbom.*
+        FROM mt_alone_process_materials_bom matbom
+        <where>
+            <if test="companyId != null">
+                AND matbom.company_id = #{companyId}
+            </if>
+            <if test="processBomId != null">
+                AND matbom.process_bom_id = #{processBomId}
+            </if>
+        </where>
+    </select>
+
+    <select id="findMaterilaListByProcessBomId" parameterType="com.deer.wms.produce.manage.model.MaterialInfoVo" resultMap="ProcessMaterialBomResultMap">
+        SELECT mi.*,pmb.specification as specification_materilas_bom,pmb.dosage  from mt_alone_process_materials_bom pmb
+        INNER JOIN mt_alone_materials_info mi
+        ON pmb.materials_id = mi.id
+        <where>
+            <if test="id != null">
+                AND pmb.process_bom_id = #{id}
+            </if>
+        </where>
+    </select>
+
+    <insert id="insertOrUpdate">
+        INSERT INTO mt_alone_process_materials_bom
+        (id,create_time,process_bom_id,materials_id,code,specification,dosage)
+        VALUES
+        <foreach collection="list" index="index" item="item" separator=",">
+            (#{item.id}, #{item.createTime}, #{item.processBomId}, #{item.materialsId},
+            #{item.code},#{item.specification}, #{item.dosage})
+        </foreach>
+        ON DUPLICATE KEY UPDATE
+        process_bom_id = VALUES(process_bom_id),
+        materials_id = VALUES(materials_id),
+        code = VALUES(code),
+        specification = VALUES(specification),
+        dosage = VALUES(dosage)
+    </insert>
+
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml

@@ -0,0 +1,25 @@
+<?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.deer.wms.produce.manage.dao.ProcessMaterialsMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProcessMaterials">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="process_id" jdbcType="INTEGER" property="processId" />
+    <result column="materials_bom_id" jdbcType="INTEGER" property="materialsBomId" />
+    <result column="materials_name" jdbcType="VARCHAR" property="materialsName" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="specification" jdbcType="VARCHAR" property="specification" />
+    <result column="dosage" jdbcType="REAL" property="dosage" />
+    <result column="unit_id" jdbcType="INTEGER" property="unitId" />
+    <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectDetMapper.xml

@@ -0,0 +1,21 @@
+<?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.deer.wms.produce.manage.dao.ProductBatchDetectDetMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProductBatchDetectDet">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="process_id" jdbcType="INTEGER" property="processId" />
+    <result column="product_det_barcode" jdbcType="VARCHAR" property="productDetBarcode" />
+    <result column="position" jdbcType="REAL" property="position" />
+    <result column="defect_id" jdbcType="INTEGER" property="defectId" />
+    <result column="defect_name" jdbcType="VARCHAR" property="defectName" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductBatchDetectMapper.xml

@@ -0,0 +1,21 @@
+<?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.deer.wms.produce.manage.dao.ProductBatchDetectMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProductBatchDetect">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="process_id" jdbcType="INTEGER" property="processId" />
+    <result column="batch_det_code" jdbcType="VARCHAR" property="batchDetCode" />
+    <result column="product_det_barcode" jdbcType="VARCHAR" property="productDetBarcode" />
+    <result column="grade" jdbcType="INTEGER" property="grade" />
+    <result column="winding_machine_id" jdbcType="INTEGER" property="windingMachineId" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBatchDetMapper.xml

@@ -0,0 +1,28 @@
+<?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.deer.wms.produce.manage.dao.ProductProcessBatchDetMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProductProcessBatchDet">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="batch_code" jdbcType="VARCHAR" property="batchCode" />
+    <result column="delivery_code" jdbcType="VARCHAR" property="deliveryCode" />
+    <result column="product_process_code" jdbcType="VARCHAR" property="productProcessCode" />
+    <result column="volume_num" jdbcType="VARCHAR" property="volumeNum" />
+    <result column="batch_det_code" jdbcType="VARCHAR" property="batchDetCode" />
+    <result column="len" jdbcType="REAL" property="len" />
+    <result column="delivery_len" jdbcType="REAL" property="deliveryLen" />
+    <result column="detection_len" jdbcType="REAL" property="detectionLen" />
+    <result column="shrinkage" jdbcType="VARCHAR" property="shrinkage" />
+    <result column="dyelot_num" jdbcType="VARCHAR" property="dyelotNum" />
+    <result column="dyelot_order" jdbcType="VARCHAR" property="dyelotOrder" />
+    <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBomMapper.xml

@@ -0,0 +1,155 @@
+<?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.deer.wms.produce.manage.dao.ProductProcessBomMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProductProcessBom">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="product_process_name" jdbcType="VARCHAR" property="productProcessName" />
+    <result column="finish_time" jdbcType="TIMESTAMP" property="finishTime" />
+    <result column="product_id" jdbcType="INTEGER" property="productId" />
+    <result column="specification" jdbcType="VARCHAR" property="specification" />
+    <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+
+    <resultMap id="ProPrcessBomDTOResultMap" type="com.deer.wms.produce.manage.model.ProductProcessBomDto">
+        <result column="product_code" jdbcType="VARCHAR" property="productCode" />
+        <result column="product_name" jdbcType="VARCHAR" property="productName" />
+        <result column="specification" jdbcType="VARCHAR" property="specification" />
+        <result column="process_step" jdbcType="INTEGER" property="processStep" />
+        <result column="work_specification" jdbcType="VARCHAR" property="workSpecification" />
+        <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+        <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+        <result column="product_process_name" jdbcType="VARCHAR" property="productProcessName" />
+        <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+        <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
+    </resultMap>
+
+    <resultMap id="BaseResultMap2" type="com.deer.wms.produce.manage.model.MachiningProduct">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="version" jdbcType="VARCHAR" property="version" />
+        <result column="status" jdbcType="INTEGER" property="status" />
+        <result column="product_code" jdbcType="VARCHAR" property="productCode" />
+        <result column="product_name" jdbcType="VARCHAR" property="productName" />
+        <result column="product_type_code" jdbcType="VARCHAR" property="productTypeCode" />
+        <result column="product_variety_code" jdbcType="VARCHAR" property="productVarietyCode" />
+        <result column="shell_fabric" jdbcType="VARCHAR" property="shellFabric" />
+        <result column="tissue" jdbcType="VARCHAR" property="tissue" />
+        <result column="larghezza" jdbcType="REAL" property="larghezza" />
+        <result column="grammage" jdbcType="REAL" property="grammage" />
+        <result column="density" jdbcType="VARCHAR" property="density" />
+        <result column="specification" jdbcType="VARCHAR" property="specification" />
+        <result column="processing_mode" jdbcType="VARCHAR" property="processingMode" />
+        <result column="product_bar_code" jdbcType="VARCHAR" property="productBarCode" />
+        <result column="specimen_bar_code" jdbcType="VARCHAR" property="specimenBarCode" />
+        <result column="cloth_attr" jdbcType="INTEGER" property="clothAttr" />
+        <result column="description" jdbcType="VARCHAR" property="description" />
+        <result column="note" jdbcType="VARCHAR" property="note" />
+        <result column="company_id" jdbcType="INTEGER" property="companyId" />
+    </resultMap>
+
+    <resultMap id="mtAloneProductProcessBomVO" type="com.deer.wms.produce.manage.model.ProductProcessBomVO" extends="BaseResultMap2">
+        <result column="product_process_name" jdbcType="VARCHAR" property="productProcessName" />
+        <result column="finish_time" jdbcType="TIMESTAMP" property="finishTime" />
+        <result column="product_id" jdbcType="INTEGER" property="productId" />
+        <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+        <result column="memo" jdbcType="VARCHAR" property="memo" />
+        <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+    </resultMap>
+
+<!--    <select id="findList" parameterType="com.deer.wms.produce.manage.model.ProductProcessBomParams" resultMap="ProPrcessBomDTOResultMap">-->
+<!--        SELECT product.product_name, productBom.product_process_name, com.company_name-->
+<!--        FROM  mt_alone_product_process_bom productBom-->
+<!--        LEFT JOIN mt_alone_machining_product product ON product.id = productBom.product_id AND product.company_id = productBom.company_id-->
+<!--        LEFT JOIN company com ON productBom.company_id = com.company_id-->
+<!--        <where>-->
+<!--            <if test="companyId != null">-->
+<!--                AND productBom.company_id = #{companyId}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
+    <select id="findList" resultMap="ProPrcessBomDTOResultMap">
+        SELECT *,COUNT(mapb.process_step) process_step
+        FROM mt_alone_product_process_bom mappb
+        LEFT JOIN mt_alone_machining_product mamp ON mappb.product_id = mamp.id
+        LEFT JOIN mt_alone_process_bom mapb ON mapb.product_process_id = mappb.id
+        <where>
+            <if test="productCode != null and productCode != ''">
+                AND mamp.product_code = #{productCode}
+            </if>
+            <if test="productName != null and productName != ''">
+                AND mamp.product_name = #{productName}
+            </if>
+            <if test="specification != null and specification != ''">
+                AND mamp.specification = #{specification}
+            </if>
+            <if test="companyId != null">
+                AND mapb.company_id = #{companyId}
+            </if>
+        </where>
+        GROUP BY mapb.product_process_id
+    </select>
+
+    <select id="findListByTerm" resultMap="ProPrcessBomDTOResultMap">
+        SELECT u.unit_name,mappb.id,mamp.product_code, mamp.product_name,mamp.specification,mapb.specification AS
+        work_specification,mapb.process_content, COUNT(mapb.process_step) process_step
+        FROM mt_alone_product_process_bom mappb
+        LEFT JOIN mt_alone_machining_product mamp ON mappb.product_id = mamp.id
+        LEFT JOIN mt_alone_process_bom mapb ON mapb.product_process_id = mappb.id
+        LEFT JOIN unit u ON mamp.unit_id = u.unit_id
+        <where>
+            <if test="keywords != null and keywords != ''">
+                (
+                mamp.product_code LIKE CONCAT('%', #{keywords}, '%')
+                OR mamp.product_name LIKE CONCAT('%', #{keywords}, '%')
+                OR mamp.specification LIKE CONCAT('%', #{keywords}, '%')
+                )
+            </if>
+            <if test="companyId != null">
+                AND mapb.company_id = #{companyId}
+            </if>
+        </where>
+        GROUP BY mapb.product_process_id
+    </select>
+
+    <select id="findListById" parameterType="com.deer.wms.produce.manage.model.ProductProcessBomParams" resultMap="BaseResultMap">
+        SELECT probom.*
+        FROM mt_alone_product_process_bom probom
+        <where>
+            <if test="productId != null and productId != ''">
+                AND probom.product_id = #{productId}
+            </if>
+            <if test="companyId != null">
+                AND probom.company_id = #{companyId}
+            </if>
+        </where>
+    </select>
+
+    <select id="findByProductNameAndProductNum" parameterType="com.deer.wms.produce.manage.model.ProductProcessBomParams" resultMap="mtAloneProductProcessBomVO">
+        SELECT * from mt_alone_machining_product machining inner JOIN mt_alone_product_process_bom pprocess on machining.id = pprocess.product_id
+        WHERE 1=1
+        <if test="productNum!=null and productNum!=''">
+            <![CDATA[ AND machining.product_code = #{productNum} ]]>
+        </if>
+
+        <if test="productName!=null and productName!=''">
+            <![CDATA[ And machining.product_name= #{productName}   ]]>
+        </if>
+    </select>
+
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml

@@ -0,0 +1,116 @@
+<?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.deer.wms.produce.manage.dao.ProductProcessMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProductProcess">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="sales_number" jdbcType="VARCHAR" property="salesNumber" />
+    <result column="version" jdbcType="VARCHAR" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="sales_number" jdbcType="VARCHAR" property="salesNumber" />
+    <result column="work_order_code" jdbcType="VARCHAR" property="workOrderCode" />
+    <result column="work_order_name" jdbcType="VARCHAR" property="workOrderName" />
+    <result column="delivery_code" jdbcType="VARCHAR" property="deliveryCode" />
+    <result column="plan_finish_time" jdbcType="TIMESTAMP" property="planFinishTime" />
+    <result column="plan_begin_time" jdbcType="TIMESTAMP" property="planBeginTime" />
+    <result column="actual_finish_time" jdbcType="TIMESTAMP" property="actualFinishTime" />
+    <result column="actual_begin_time" jdbcType="TIMESTAMP" property="actualBeginTime" />
+    <result column="client_id" jdbcType="INTEGER" property="clientId" />
+    <result column="client_name" jdbcType="VARCHAR" property="clientName" />
+    <result column="contract_code" jdbcType="VARCHAR" property="contractCode" />
+    <result column="contract_name" jdbcType="VARCHAR" property="contractName" />
+    <result column="product_process_code" jdbcType="VARCHAR" property="productProcessCode" />
+    <result column="product_process_name0" jdbcType="VARCHAR" property="productProcessName0" />
+    <result column="finish_time" jdbcType="TIMESTAMP" property="finishTime" />
+    <result column="product_bom_id" jdbcType="INTEGER" property="productBomId" />
+    <result column="specification" jdbcType="VARCHAR" property="specification" />
+    <result column="process_price" jdbcType="REAL" property="processPrice" />
+    <result column="len" jdbcType="REAL" property="len" />
+    <result column="delivery_len" jdbcType="REAL" property="deliveryLen" />
+    <result column="detection_len" jdbcType="REAL" property="detectionLen" />
+    <result column="batch_code" jdbcType="VARCHAR" property="batchCode" />
+    <result column="batch_order_code" jdbcType="VARCHAR" property="batchOrderCode" />
+    <result column="shrinkage" jdbcType="VARCHAR" property="shrinkage" />
+    <result column="pi_num" jdbcType="INTEGER" property="piNum" />
+    <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+    <result column="merchandiser_id" jdbcType="INTEGER" property="merchandiserId" />
+    <result column="merchandiser_name" jdbcType="VARCHAR" property="merchandiserName" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="review_status" jdbcType="INTEGER" property="reviewStatus" />
+    <result column="review_time" jdbcType="TIMESTAMP" property="reviewTime" />
+    <result column="reviewer_id" jdbcType="INTEGER" property="reviewerId" />
+    <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+
+    <resultMap id="ProductProcessVoResultMap" type="com.deer.wms.produce.manage.model.ProductProcessVo">
+
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="sales_number" jdbcType="VARCHAR" property="salesNumber" />
+        <result column="version" jdbcType="VARCHAR" property="version" />
+        <result column="status" jdbcType="INTEGER" property="status" />
+        <result column="sales_number" jdbcType="VARCHAR" property="salesNumber" />
+        <result column="work_order_code" jdbcType="VARCHAR" property="workOrderCode" />
+        <result column="work_order_name" jdbcType="VARCHAR" property="workOrderName" />
+        <result column="delivery_code" jdbcType="VARCHAR" property="deliveryCode" />
+        <result column="plan_finish_time" jdbcType="TIMESTAMP" property="planFinishTime" />
+        <result column="plan_begin_time" jdbcType="TIMESTAMP" property="planBeginTime" />
+        <result column="actual_finish_time" jdbcType="TIMESTAMP" property="actualFinishTime" />
+        <result column="actual_begin_time" jdbcType="TIMESTAMP" property="actualBeginTime" />
+        <result column="client_id" jdbcType="INTEGER" property="clientId" />
+        <result column="client_name" jdbcType="VARCHAR" property="clientName" />
+        <result column="contract_code" jdbcType="VARCHAR" property="contractCode" />
+        <result column="contract_name" jdbcType="VARCHAR" property="contractName" />
+        <result column="product_process_code" jdbcType="VARCHAR" property="productProcessCode" />
+        <result column="product_process_name0" jdbcType="VARCHAR" property="productProcessName0" />
+        <result column="finish_time" jdbcType="TIMESTAMP" property="finishTime" />
+        <result column="product_bom_id" jdbcType="INTEGER" property="productBomId" />
+        <result column="specification" jdbcType="VARCHAR" property="specification" />
+        <result column="process_price" jdbcType="REAL" property="processPrice" />
+        <result column="len" jdbcType="REAL" property="len" />
+        <result column="delivery_len" jdbcType="REAL" property="deliveryLen" />
+        <result column="detection_len" jdbcType="REAL" property="detectionLen" />
+        <result column="batch_code" jdbcType="VARCHAR" property="batchCode" />
+        <result column="batch_order_code" jdbcType="VARCHAR" property="batchOrderCode" />
+        <result column="shrinkage" jdbcType="VARCHAR" property="shrinkage" />
+        <result column="pi_num" jdbcType="INTEGER" property="piNum" />
+        <result column="process_content" jdbcType="VARCHAR" property="processContent" />
+        <result column="merchandiser_id" jdbcType="INTEGER" property="merchandiserId" />
+        <result column="merchandiser_name" jdbcType="VARCHAR" property="merchandiserName" />
+        <result column="memo" jdbcType="VARCHAR" property="memo" />
+        <result column="review_status" jdbcType="INTEGER" property="reviewStatus" />
+        <result column="review_time" jdbcType="TIMESTAMP" property="reviewTime" />
+        <result column="reviewer_id" jdbcType="INTEGER" property="reviewerId" />
+        <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+        <result column="company_id" jdbcType="INTEGER" property="companyId" />
+        <result column="product_process_name" jdbcType="VARCHAR" property="productProcessName" />
+        <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    </resultMap>
+
+    <select id="findList" parameterType="com.deer.wms.produce.manage.model.ProductProcessParams" resultMap="ProductProcessVoResultMap">
+        SELECT prodproc.*, probom.product_process_name, product.product_name
+        FROM mt_alone_product_process prodproc
+        LEFT JOIN mt_alone_product_process_bom probom ON prodproc.product_bom_id = probom.id AND prodproc.company_id = probom.company_id
+        LEFT JOIN mt_alone_machining_product product ON probom.product_id =  product.id AND probom.company_id = product.company_id
+        <where>
+            <if test="keywords != null and keywords != ''">
+                AND prodproc.work_order_code LIKE CONCAT('%', #{keywords}, '%')
+                OR probom.product_bom_name LIKE CONCAT('%', #{keywords}, '%')
+                OR prodproc.product_process_name LIKE CONCAT('%', #{keywords}, '%')
+                OR  client.client_name LIKE CONCAT('%', #{keywords}, '%')
+                OR  prodproc.contract_name LIKE CONCAT('%', #{keywords}, '%')
+            </if>
+            <if test="companyId != null">
+                AND prodproc.company_id = #{companyId}
+            </if>
+        </where>
+    </select>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/QualityInfoMapper.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.deer.wms.produce.manage.dao.ProcessQualityInfoMapper">
+  <resultMap id="BaseResultMap" type="com.deer.wms.produce.manage.model.ProcessQualityInfo">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="operator_id" jdbcType="INTEGER" property="operatorId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="process_id" jdbcType="INTEGER" property="processId" />
+    <result column="complete_ratio" jdbcType="VARCHAR" property="completeRatio" />
+    <result column="quality_info" jdbcType="VARCHAR" property="qualityInfo" />
+    <result column="completed_num" jdbcType="INTEGER" property="completedNum" />
+    <result column="product_annex_code" jdbcType="VARCHAR" property="productAnnexCode" />
+    <result column="memo" jdbcType="VARCHAR" property="memo" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+</mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachingProductDto.java

@@ -0,0 +1,54 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: weihongyang
+ * @Date: 2019/10/30 15:00
+ * @Version 1.0
+ */
+public class MachingProductDto extends MachiningProduct{
+    private String unitName;
+    private String processName;
+    private String processApartment;
+    private String processContent;
+    private Integer processStep;
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    public String getProcessApartment() {
+        return processApartment;
+    }
+
+    public void setProcessApartment(String processApartment) {
+        this.processApartment = processApartment;
+    }
+
+    public String getProcessContent() {
+        return processContent;
+    }
+
+    public void setProcessContent(String processContent) {
+        this.processContent = processContent;
+    }
+
+    public Integer getProcessStep() {
+        return processStep;
+    }
+
+    public void setProcessStep(Integer processStep) {
+        this.processStep = processStep;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProduct.java

@@ -0,0 +1,558 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_alone_machining_product")
+public class MachiningProduct {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 产品编码
+     */
+    @Column(name = "product_code")
+    private String productCode;
+
+    /**
+     * 产品名称
+     */
+    @Column(name = "product_name")
+    private String productName;
+
+    /**
+     * 产品类型（坯布、尾单···）
+     */
+    @Column(name = "product_type_code")
+    private String productTypeCode;
+
+    /**
+     * 产品品种（尼龙、春亚纺···）
+     */
+    @Column(name = "product_variety_code")
+    private String productVarietyCode;
+
+    /**
+     * 面料
+     */
+    @Column(name = "shell_fabric")
+    private String shellFabric;
+
+    /**
+     * 组织
+     */
+    private String tissue;
+
+    /**
+     * 门幅
+     */
+    private Float larghezza;
+
+    /**
+     * 克重
+     */
+    private Float grammage;
+
+    /**
+     * 密度
+     */
+    private String density;
+
+    /**
+     * 规格
+     */
+    private String specification;
+
+    /**
+     * 加工方式
+     */
+    @Column(name = "processing_mode")
+    private String processingMode;
+
+    /**
+     * 产品条形码(检测条形码）
+     */
+    @Column(name = "product_bar_code")
+    private String productBarCode;
+
+    /**
+     * 样品条形码
+     */
+    @Column(name = "specimen_bar_code")
+    private String specimenBarCode;
+
+    /**
+     * 可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品）
+     */
+    @Column(name = "cloth_attr")
+    private Integer clothAttr;
+
+    /**
+     * 描述信息
+     */
+    private String description;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 关联unit表
+     */
+    @Column(name = "unit_id")
+    private Integer unitId;
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    /**
+     * 绑定公司id
+     */
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取产品编码
+     *
+     * @return product_code - 产品编码
+     */
+    public String getProductCode() {
+        return productCode;
+    }
+
+    /**
+     * 设置产品编码
+     *
+     * @param productCode 产品编码
+     */
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    /**
+     * 获取产品名称
+     *
+     * @return product_name - 产品名称
+     */
+    public String getProductName() {
+        return productName;
+    }
+
+    /**
+     * 设置产品名称
+     *
+     * @param productName 产品名称
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取产品类型（坯布、尾单···）
+     *
+     * @return product_type_code - 产品类型（坯布、尾单···）
+     */
+    public String getProductTypeCode() {
+        return productTypeCode;
+    }
+
+    /**
+     * 设置产品类型（坯布、尾单···）
+     *
+     * @param productTypeCode 产品类型（坯布、尾单···）
+     */
+    public void setProductTypeCode(String productTypeCode) {
+        this.productTypeCode = productTypeCode;
+    }
+
+    /**
+     * 获取产品品种（尼龙、春亚纺···）
+     *
+     * @return product_variety_code - 产品品种（尼龙、春亚纺···）
+     */
+    public String getProductVarietyCode() {
+        return productVarietyCode;
+    }
+
+    /**
+     * 设置产品品种（尼龙、春亚纺···）
+     *
+     * @param productVarietyCode 产品品种（尼龙、春亚纺···）
+     */
+    public void setProductVarietyCode(String productVarietyCode) {
+        this.productVarietyCode = productVarietyCode;
+    }
+
+    /**
+     * 获取面料
+     *
+     * @return shell_fabric - 面料
+     */
+    public String getShellFabric() {
+        return shellFabric;
+    }
+
+    /**
+     * 设置面料
+     *
+     * @param shellFabric 面料
+     */
+    public void setShellFabric(String shellFabric) {
+        this.shellFabric = shellFabric;
+    }
+
+    /**
+     * 获取组织
+     *
+     * @return tissue - 组织
+     */
+    public String getTissue() {
+        return tissue;
+    }
+
+    /**
+     * 设置组织
+     *
+     * @param tissue 组织
+     */
+    public void setTissue(String tissue) {
+        this.tissue = tissue;
+    }
+
+    /**
+     * 获取门幅
+     *
+     * @return larghezza - 门幅
+     */
+    public Float getLarghezza() {
+        return larghezza;
+    }
+
+    /**
+     * 设置门幅
+     *
+     * @param larghezza 门幅
+     */
+    public void setLarghezza(Float larghezza) {
+        this.larghezza = larghezza;
+    }
+
+    /**
+     * 获取克重
+     *
+     * @return grammage - 克重
+     */
+    public Float getGrammage() {
+        return grammage;
+    }
+
+    /**
+     * 设置克重
+     *
+     * @param grammage 克重
+     */
+    public void setGrammage(Float grammage) {
+        this.grammage = grammage;
+    }
+
+    /**
+     * 获取密度
+     *
+     * @return density - 密度
+     */
+    public String getDensity() {
+        return density;
+    }
+
+    /**
+     * 设置密度
+     *
+     * @param density 密度
+     */
+    public void setDensity(String density) {
+        this.density = density;
+    }
+
+    /**
+     * 获取规格
+     *
+     * @return specification - 规格
+     */
+    public String getSpecification() {
+        return specification;
+    }
+
+    /**
+     * 设置规格
+     *
+     * @param specification 规格
+     */
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    /**
+     * 获取加工方式
+     *
+     * @return processing_mode - 加工方式
+     */
+    public String getProcessingMode() {
+        return processingMode;
+    }
+
+    /**
+     * 设置加工方式
+     *
+     * @param processingMode 加工方式
+     */
+    public void setProcessingMode(String processingMode) {
+        this.processingMode = processingMode;
+    }
+
+    /**
+     * 获取产品条形码(检测条形码）
+     *
+     * @return product_bar_code - 产品条形码(检测条形码）
+     */
+    public String getProductBarCode() {
+        return productBarCode;
+    }
+
+    /**
+     * 设置产品条形码(检测条形码）
+     *
+     * @param productBarCode 产品条形码(检测条形码）
+     */
+    public void setProductBarCode(String productBarCode) {
+        this.productBarCode = productBarCode;
+    }
+
+    /**
+     * 获取样品条形码
+     *
+     * @return specimen_bar_code - 样品条形码
+     */
+    public String getSpecimenBarCode() {
+        return specimenBarCode;
+    }
+
+    /**
+     * 设置样品条形码
+     *
+     * @param specimenBarCode 样品条形码
+     */
+    public void setSpecimenBarCode(String specimenBarCode) {
+        this.specimenBarCode = specimenBarCode;
+    }
+
+    /**
+     * 获取可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品）
+     *
+     * @return cloth_attr - 可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品）
+     */
+    public Integer getClothAttr() {
+        return clothAttr;
+    }
+
+    /**
+     * 设置可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品）
+     *
+     * @param clothAttr 可以，有三个复选框，是否为原料半成品，成品（0:原材料，1：成品，2：半成品）
+     */
+    public void setClothAttr(Integer clothAttr) {
+        this.clothAttr = clothAttr;
+    }
+
+    /**
+     * 获取描述信息
+     *
+     * @return description - 描述信息
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 设置描述信息
+     *
+     * @param description 描述信息
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return note - 备注
+     */
+    public String getNote() {
+        return note;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param note 备注
+     */
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    /**
+     * 获取绑定公司id
+     *
+     * @return company_id - 绑定公司id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * 设置绑定公司id
+     *
+     * @param companyId 绑定公司id
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductHaveBom.java

@@ -0,0 +1,30 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * 有对应产品bom的产品信息对象类型，包括产品bom的id和加工总名称
+ * @Author: hy
+ * @Date: 2019/10/13 15:18
+ * @Version 1.0
+ */
+public class MachiningProductHaveBom extends MachiningProduct {
+
+    private Integer productProcessId;
+
+    private String productProcessName;
+
+    public Integer getProductProcessId() {
+        return productProcessId;
+    }
+
+    public void setProductProcessId(Integer productProcessId) {
+        this.productProcessId = productProcessId;
+    }
+
+    public String getProductProcessName() {
+        return productProcessName;
+    }
+
+    public void setProductProcessName(String productProcessName) {
+        this.productProcessName = productProcessName;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductParams.java

@@ -0,0 +1,41 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+import io.swagger.models.auth.In;
+
+/**
+* Created by  on 2019/09/09.
+*/
+public class MachiningProductParams extends QueryParams {
+
+    private String productCode;
+
+    private String productName;
+
+    private String specification;
+
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getSpecification() {
+        return specification;
+    }
+
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProductVo.java

@@ -0,0 +1,27 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: 蔡翔
+ * @Date: 2019/10/28 13:33
+ * @Version 1.0
+ */
+public class MachiningProductVo extends MachiningProduct {
+    private String specificationBom;
+    private Integer unitName;
+
+    public String getSpecificationBom() {
+        return specificationBom;
+    }
+
+    public void setSpecificationBom(String specificationBom) {
+        this.specificationBom = specificationBom;
+    }
+
+    public Integer getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(Integer unitName) {
+        this.unitName = unitName;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialInfoVo.java

@@ -0,0 +1,27 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: 蔡翔
+ * @Date: 2019/10/31 14:09
+ * @Version 1.0
+ */
+public class MaterialInfoVo extends MaterialsInfo {
+    private String specificationMaterilasBom;
+    private float dosage;
+
+    public String getSpecificationMaterilasBom() {
+        return specificationMaterilasBom;
+    }
+
+    public void setSpecificationMaterilasBom(String specificationMaterilasBom) {
+        this.specificationMaterilasBom = specificationMaterilasBom;
+    }
+
+    public float getDosage() {
+        return dosage;
+    }
+
+    public void setDosage(float dosage) {
+        this.dosage = dosage;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfo.java

@@ -0,0 +1,298 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_materials_info")
+public class MaterialsInfo {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 物料名称
+     */
+    @Column(name = "materials_name")
+    private String materialsName;
+
+    /**
+     * 父类物料
+     */
+    @Column(name = "parent_id")
+    private Integer parentId;
+
+    /**
+     * 物料编码
+     */
+    private String code;
+
+    /**
+     * 单位id
+     */
+    @Column(name = "unit_id")
+    private Integer unitId;
+
+    /**
+     * 规格
+     */
+    private String specification;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * 供应商id
+     */
+    @Column(name = "supplier_id")
+    private Integer supplierId;
+
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取物料名称
+     *
+     * @return materials_name - 物料名称
+     */
+    public String getMaterialsName() {
+        return materialsName;
+    }
+
+    /**
+     * 设置物料名称
+     *
+     * @param materialsName 物料名称
+     */
+    public void setMaterialsName(String materialsName) {
+        this.materialsName = materialsName;
+    }
+
+    /**
+     * 获取父类物料
+     *
+     * @return parent_id - 父类物料
+     */
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    /**
+     * 设置父类物料
+     *
+     * @param parentId 父类物料
+     */
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    /**
+     * 获取物料编码
+     *
+     * @return code - 物料编码
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置物料编码
+     *
+     * @param code 物料编码
+     */
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+     * 获取单位id
+     *
+     * @return unit_id - 单位id
+     */
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    /**
+     * 设置单位id
+     *
+     * @param unitId 单位id
+     */
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    /**
+     * 获取规格
+     *
+     * @return specification - 规格
+     */
+    public String getSpecification() {
+        return specification;
+    }
+
+    /**
+     * 设置规格
+     *
+     * @param specification 规格
+     */
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return memo - 备注
+     */
+    public String getMemo() {
+        return memo;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param memo 备注
+     */
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * @return supplier_id
+     */
+    public Integer getSupplierId() {
+        return supplierId;
+    }
+
+    /**
+     * @param supplierId
+     */
+    public void setSupplierId(Integer supplierId) {
+        this.supplierId = supplierId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoDto.java

@@ -0,0 +1,68 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: hy
+ * @Date: 2019/7/21 18:08
+ * @Version 1.0
+ *
+ * 物料基础信息，集成库存、公司、供应商、单位等信息
+ *
+ */
+
+
+public class MaterialsInfoDto extends MaterialsInfo{
+    private String positionName;
+    private Float quantity;
+    private String companyName;
+    private String unitName;
+    private String parentName;
+    private String supplierName;
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public String getPositionName() {
+        return positionName;
+    }
+
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public Float getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Float quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoParams.java

@@ -0,0 +1,72 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by guo on 2019/07/18.
+*/
+public class MaterialsInfoParams extends QueryParams {
+    /**
+     * 开始时间
+     */
+    private String begDate;
+
+    /**
+     * 结束时间
+     */
+    private String endDate;
+
+    /**
+     * 物料id
+     */
+    private Integer materialsId;
+
+    /**
+     * 物料名字
+     **/
+    private String materialName;
+    /**
+     * 物料code
+     **/
+    private String materialCode;
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    public String getBegDate() {
+        return begDate;
+    }
+
+    public void setBegDate(String begDate) {
+        this.begDate = begDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public Integer getMaterialsId() {
+        return materialsId;
+    }
+
+    public void setMaterialsId(Integer materialsId) {
+        this.materialsId = materialsId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoVO.java

@@ -0,0 +1,110 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: 蔡翔
+ * @Date: 2019/10/9 13:09
+ * @Version 1.0
+ */
+public class MaterialsInfoVO extends MaterialsInfo {
+    /**
+     * 操作员id
+     */
+    private Integer operatorId;
+
+    /**
+     * 工序bom 的id
+     **/
+    private Integer processBomId;
+
+    /**
+     *  物料编码
+     **/
+    private String code;
+
+    /**
+     * 规格类型
+     **/
+    private String specification;
+
+    /**
+     * 用量
+     **/
+    private float dosage;
+
+    /**
+     * 单位id
+     **/
+    private Integer unitId;
+
+    /**
+     * 备注
+     **/
+    private String memo;
+
+    @Override
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    @Override
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    public Integer getProcessBomId() {
+        return processBomId;
+    }
+
+    public void setProcessBomId(Integer processBomId) {
+        this.processBomId = processBomId;
+    }
+
+    @Override
+    public String getCode() {
+        return code;
+    }
+
+    @Override
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    @Override
+    public String getSpecification() {
+        return specification;
+    }
+
+    @Override
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    public float getDosage() {
+        return dosage;
+    }
+
+    public void setDosage(float dosage) {
+        this.dosage = dosage;
+    }
+
+    @Override
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    @Override
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    @Override
+    public String getMemo() {
+        return memo;
+    }
+
+    @Override
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLog.java

@@ -0,0 +1,277 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_materials_outgoing_log")
+public class MaterialsOutgoingLog {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 状态		0：入库，1：出库
+     */
+    private Integer type;
+
+    /**
+     * 物料id, 关联表：mt_alone_materials_info
+     */
+    @Column(name = "materials_id")
+    private Integer materialsId;
+
+    /**
+     * 物料名称
+     */
+    @Column(name = "materials_name")
+    private String materialsName;
+
+    /**
+     * 数量
+     */
+    private Float quantity;
+
+    /**
+     * 仓位名称
+     */
+    @Column(name = "position_name")
+    private String positionName;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取状态		0：入库，1：出库
+     *
+     * @return type - 状态		0：入库，1：出库
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * 设置状态		0：入库，1：出库
+     *
+     * @param type 状态		0：入库，1：出库
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * 获取物料id, 关联表：mt_alone_materials_info
+     *
+     * @return materials_id - 物料id, 关联表：mt_alone_materials_info
+     */
+    public Integer getMaterialsId() {
+        return materialsId;
+    }
+
+    /**
+     * 设置物料id, 关联表：mt_alone_materials_info
+     *
+     * @param materialsId 物料id, 关联表：mt_alone_materials_info
+     */
+    public void setMaterialsId(Integer materialsId) {
+        this.materialsId = materialsId;
+    }
+
+    /**
+     * 获取物料名称
+     *
+     * @return materials_name - 物料名称
+     */
+    public String getMaterialsName() {
+        return materialsName;
+    }
+
+    /**
+     * 设置物料名称
+     *
+     * @param materialsName 物料名称
+     */
+    public void setMaterialsName(String materialsName) {
+        this.materialsName = materialsName;
+    }
+
+    /**
+     * 获取数量
+     *
+     * @return quantity - 数量
+     */
+    public Float getQuantity() {
+        return quantity;
+    }
+
+    /**
+     * 设置数量
+     *
+     * @param quantity 数量
+     */
+    public void setQuantity(Float quantity) {
+        this.quantity = quantity;
+    }
+
+    /**
+     * 获取仓位名称
+     *
+     * @return position_name - 仓位名称
+     */
+    public String getPositionName() {
+        return positionName;
+    }
+
+    /**
+     * 设置仓位名称
+     *
+     * @param positionName 仓位名称
+     */
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return memo - 备注
+     */
+    public String getMemo() {
+        return memo;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param memo 备注
+     */
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogDto.java

@@ -0,0 +1,42 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: hy
+ * @Date: 2019/8/20 11:23
+ * @Version 1.0
+ */
+public class MaterialsOutgoingLogDto extends MaterialsOutgoingLog {
+
+    private Integer materialsId;
+
+    private String materialsName;
+
+    private Integer unitId;
+
+    @Override
+    public Integer getMaterialsId() {
+        return materialsId;
+    }
+
+    public void setMaterialsId(Integer materialsId) {
+        this.materialsId = materialsId;
+    }
+
+    @Override
+    public String getMaterialsName() {
+        return materialsName;
+    }
+
+    @Override
+    public void setMaterialsName(String materialsName) {
+        this.materialsName = materialsName;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogParams.java

@@ -0,0 +1,30 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.produce.manage.constant.ProduceManageConstant;
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by guo on 2019/07/21.
+*/
+public class MaterialsOutgoingLogParams extends QueryParams {
+
+    private Integer type = ProduceManageConstant.TYPE_IN;//默认为入库记录
+
+    private Integer materialsId;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getMaterialsId() {
+        return materialsId;
+    }
+
+    public void setMaterialsId(Integer materialsId) {
+        this.materialsId = materialsId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsOutgoingLogVo.java

@@ -0,0 +1,19 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: hy
+ * @Date: 2019/8/24 16:30
+ * @Version 1.0
+ */
+public class MaterialsOutgoingLogVo extends MaterialsOutgoingLog {
+
+    private String userName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfo.java

@@ -0,0 +1,254 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_materials_stock_info")
+public class MaterialsStockInfo {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 物料id, 关联表：mt_alone_materials_info
+     */
+    @Column(name = "materials_id")
+    private Integer materialsId;
+
+    /**
+     * 数量， 发起工序操作后数据可以为负数
+     */
+    private Float quantity;
+
+    /**
+     * 单位id, 关联单位表：unit
+     */
+    @Column(name = "unit_id")
+    private Integer unitId;
+
+    /**
+     * 仓位名称
+     */
+    @Column(name = "position_name")
+    private String positionName;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取物料id, 关联表：mt_alone_materials_info
+     *
+     * @return materials_id - 物料id, 关联表：mt_alone_materials_info
+     */
+    public Integer getMaterialsId() {
+        return materialsId;
+    }
+
+    /**
+     * 设置物料id, 关联表：mt_alone_materials_info
+     *
+     * @param materialsId 物料id, 关联表：mt_alone_materials_info
+     */
+    public void setMaterialsId(Integer materialsId) {
+        this.materialsId = materialsId;
+    }
+
+    /**
+     * 获取数量， 发起工序操作后数据可以为负数
+     *
+     * @return quantity - 数量， 发起工序操作后数据可以为负数
+     */
+    public Float getQuantity() {
+        return quantity;
+    }
+
+    /**
+     * 设置数量， 发起工序操作后数据可以为负数
+     *
+     * @param quantity 数量， 发起工序操作后数据可以为负数
+     */
+    public void setQuantity(Float quantity) {
+        this.quantity = quantity;
+    }
+
+    /**
+     * 获取单位id, 关联单位表：unit
+     *
+     * @return unit_id - 单位id, 关联单位表：unit
+     */
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    /**
+     * 设置单位id, 关联单位表：unit
+     *
+     * @param unitId 单位id, 关联单位表：unit
+     */
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    /**
+     * 获取仓位名称
+     *
+     * @return position_name - 仓位名称
+     */
+    public String getPositionName() {
+        return positionName;
+    }
+
+    /**
+     * 设置仓位名称
+     *
+     * @param positionName 仓位名称
+     */
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return memo - 备注
+     */
+    public String getMemo() {
+        return memo;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param memo 备注
+     */
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfoParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by guo on 2019/07/21.
+*/
+public class MaterialsStockInfoParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsVo.java

@@ -0,0 +1,30 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: hy
+ * @Date: 2019/7/28 15:52
+ * @Version 1.0
+ *
+ * 包含物料信息和库存信息共同属性的类，用于在一个界面上获取两个对象所有字段信息并存入数据库
+ */
+public class MaterialsVo {
+    private MaterialsInfo materialsInfo;
+
+    private MaterialsStockInfo materialsStockInfo;
+
+    public MaterialsInfo getMaterialsInfo() {
+        return materialsInfo;
+    }
+
+    public void setMaterialsInfo(MaterialsInfo materialsInfo) {
+        this.materialsInfo = materialsInfo;
+    }
+
+    public MaterialsStockInfo getMaterialsStockInfo() {
+        return materialsStockInfo;
+    }
+
+    public void setMaterialsStockInfo(MaterialsStockInfo materialsStockInfo) {
+        this.materialsStockInfo = materialsStockInfo;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcess.java

@@ -0,0 +1,637 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_process")
+public class MtAloneProcess {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 工序名称
+     */
+    @Column(name = "process_name")
+    private String processName;
+
+    /**
+     * 产品生产过程id，关联表：mt_alone_product_process
+     */
+    @Column(name = "product_process_id")
+    private Integer productProcessId;
+
+    /**
+     * 工序编码，编码规则：GX+日期
+     */
+    private String code;
+
+    /**
+     * 规格型号
+     */
+    private String specification;
+
+    /**
+     * 工序来源：0本厂加工，1外厂协作，2外购
+     */
+    @Column(name = "process_source")
+    private Integer processSource;
+
+    /**
+     * 加工价格 元
+     */
+    @Column(name = "process_price")
+    private Float processPrice;
+
+    /**
+     * 加工单价 元/米
+     */
+    @Column(name = "process_unit_price")
+    private Float processUnitPrice;
+
+    /**
+     * 原先长度，单位米
+     */
+    @Column(name = "original_len")
+    private Float originalLen;
+
+    /**
+     * 损耗%比
+     */
+    private Float loss;
+
+    /**
+     * 加工后长度，单位米
+     */
+    @Column(name = "after_len")
+    private Float afterLen;
+
+    /**
+     * 缩率%，现有检测长度/原先长度
+     */
+    private Float shrinkage;
+
+
+    /**
+     * 加工描述内容
+     */
+    @Column(name = "process_content")
+    private String processContent;
+
+    /**
+     * 加工商id，关联表供应商表：supplier_manage
+     */
+    @Column(name = "supplier_id")
+    private Integer supplierId;
+
+    /**
+     * 工序步骤，从第一步开始，依次增加
+     */
+    @Column(name = "process_step")
+    private Integer processStep;
+
+    /**
+     * 跟单员id，关联表员工表：user_info
+     */
+    @Column(name = "merchandiser_id")
+    private Integer merchandiserId;
+
+    /**
+     * 产品条形码
+     */
+    @Column(name = "product_bar_code")
+    private String productBarCode;
+
+    /**
+     * 工序bom关联id，关联工序bom表：mt_alone_process_bom
+     */
+    @Column(name = "process_bom_id")
+    private Integer processBomId;
+
+    /**
+     * 工序bom名称
+     */
+    @Column(name = "process_bom_name")
+    private String processBomName;
+
+    /**
+     * 附件code，关联附件表：mt_alone_accessory
+     */
+    @Column(name = "product_annex_code")
+    private String productAnnexCode;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取工序名称
+     *
+     * @return process_name - 工序名称
+     */
+    public String getProcessName() {
+        return processName;
+    }
+
+    /**
+     * 设置工序名称
+     *
+     * @param processName 工序名称
+     */
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    /**
+     * 获取产品生产过程id，关联表：mt_alone_product_process
+     *
+     * @return product_process_id - 产品生产过程id，关联表：mt_alone_product_process
+     */
+    public Integer getProductProcessId() {
+        return productProcessId;
+    }
+
+    /**
+     * 设置产品生产过程id，关联表：mt_alone_product_process
+     *
+     * @param productProcessId 产品生产过程id，关联表：mt_alone_product_process
+     */
+    public void setProductProcessId(Integer productProcessId) {
+        this.productProcessId = productProcessId;
+    }
+
+    /**
+     * 获取工序编码，编码规则：GX+日期
+     *
+     * @return code - 工序编码，编码规则：GX+日期
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置工序编码，编码规则：GX+日期
+     *
+     * @param code 工序编码，编码规则：GX+日期
+     */
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+     * 获取规格型号
+     *
+     * @return specification - 规格型号
+     */
+    public String getSpecification() {
+        return specification;
+    }
+
+    /**
+     * 设置规格型号
+     *
+     * @param specification 规格型号
+     */
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    /**
+     * 获取工序来源：0本厂加工，1外厂协作，2外购
+     *
+     * @return process_source - 工序来源：0本厂加工，1外厂协作，2外购
+     */
+    public Integer getProcessSource() {
+        return processSource;
+    }
+
+    /**
+     * 设置工序来源：0本厂加工，1外厂协作，2外购
+     *
+     * @param processSource 工序来源：0本厂加工，1外厂协作，2外购
+     */
+    public void setProcessSource(Integer processSource) {
+        this.processSource = processSource;
+    }
+
+    /**
+     * 获取加工价格 元
+     *
+     * @return process_price - 加工价格 元
+     */
+    public Float getProcessPrice() {
+        return processPrice;
+    }
+
+    /**
+     * 设置加工价格 元
+     *
+     * @param processPrice 加工价格 元
+     */
+    public void setProcessPrice(Float processPrice) {
+        this.processPrice = processPrice;
+    }
+
+    /**
+     * 获取加工单价 元/米
+     *
+     * @return process_unit_price - 加工单价 元/米
+     */
+    public Float getProcessUnitPrice() {
+        return processUnitPrice;
+    }
+
+    /**
+     * 设置加工单价 元/米
+     *
+     * @param processUnitPrice 加工单价 元/米
+     */
+    public void setProcessUnitPrice(Float processUnitPrice) {
+        this.processUnitPrice = processUnitPrice;
+    }
+
+    /**
+     * 获取原先长度，单位米
+     *
+     * @return original_len - 原先长度，单位米
+     */
+    public Float getOriginalLen() {
+        return originalLen;
+    }
+
+    /**
+     * 设置原先长度，单位米
+     *
+     * @param originalLen 原先长度，单位米
+     */
+    public void setOriginalLen(Float originalLen) {
+        this.originalLen = originalLen;
+    }
+
+    /**
+     * 获取损耗%比
+     *
+     * @return loss - 损耗%比
+     */
+    public Float getLoss() {
+        return loss;
+    }
+
+    /**
+     * 设置损耗%比
+     *
+     * @param loss 损耗%比
+     */
+    public void setLoss(Float loss) {
+        this.loss = loss;
+    }
+
+    /**
+     * 获取加工后长度，单位米
+     *
+     * @return after_len - 加工后长度，单位米
+     */
+    public Float getAfterLen() {
+        return afterLen;
+    }
+
+    /**
+     * 设置加工后长度，单位米
+     *
+     * @param afterLen 加工后长度，单位米
+     */
+    public void setAfterLen(Float afterLen) {
+        this.afterLen = afterLen;
+    }
+
+
+    /**
+     * 获取缩率%，现有检测长度/原先长度
+     *
+     * @return shrinkage - 缩率%，现有检测长度/原先长度
+     */
+    public Float getShrinkage() {
+        return shrinkage;
+    }
+
+    /**
+     * 设置缩率%，现有检测长度/原先长度
+     *
+     * @param shrinkage 缩率%，现有检测长度/原先长度
+     */
+    public void setShrinkage(Float shrinkage) {
+        this.shrinkage = shrinkage;
+    }
+
+    /**
+     * 获取加工描述内容
+     *
+     * @return process_content - 加工描述内容
+     */
+    public String getProcessContent() {
+        return processContent;
+    }
+
+    /**
+     * 设置加工描述内容
+     *
+     * @param processContent 加工描述内容
+     */
+    public void setProcessContent(String processContent) {
+        this.processContent = processContent;
+    }
+
+    /**
+     * 获取加工商id，关联表供应商表：supplier_manage
+     *
+     * @return supplier_id - 加工商id，关联表供应商表：supplier_manage
+     */
+    public Integer getSupplierId() {
+        return supplierId;
+    }
+
+    /**
+     * 设置加工商id，关联表供应商表：supplier_manage
+     *
+     * @param supplierId 加工商id，关联表供应商表：supplier_manage
+     */
+    public void setSupplierId(Integer supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    /**
+     * 获取工序步骤，从第一步开始，依次增加
+     *
+     * @return process_step - 工序步骤，从第一步开始，依次增加
+     */
+    public Integer getProcessStep() {
+        return processStep;
+    }
+
+    /**
+     * 设置工序步骤，从第一步开始，依次增加
+     *
+     * @param processStep 工序步骤，从第一步开始，依次增加
+     */
+    public void setProcessStep(Integer processStep) {
+        this.processStep = processStep;
+    }
+
+    /**
+     * 获取跟单员id，关联表员工表：user_info
+     *
+     * @return merchandiser_id - 跟单员id，关联表员工表：user_info
+     */
+    public Integer getMerchandiserId() {
+        return merchandiserId;
+    }
+
+    /**
+     * 设置跟单员id，关联表员工表：user_info
+     *
+     * @param merchandiserId 跟单员id，关联表员工表：user_info
+     */
+    public void setMerchandiserId(Integer merchandiserId) {
+        this.merchandiserId = merchandiserId;
+    }
+
+    /**
+     * 获取附件code，关联附件表：mt_alone_accessory
+     *
+     * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory
+     */
+    public String getProductAnnexCode() {
+        return productAnnexCode;
+    }
+
+    /**
+     * 设置附件code，关联附件表：mt_alone_accessory
+     *
+     * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory
+     */
+    public void setProductAnnexCode(String productAnnexCode) {
+        this.productAnnexCode = productAnnexCode;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return memo - 备注
+     */
+    public String getMemo() {
+        return memo;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param memo 备注
+     */
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * 获取产品条形码
+     *
+     * @return product_bar_code - 产品条形码
+     */
+    public String getProductBarCode() {
+        return productBarCode;
+    }
+
+    /**
+     * 设置产品条形码
+     *
+     * @param productBarCode 产品条形码
+     */
+    public void setProductBarCode(String productBarCode) {
+        this.productBarCode = productBarCode;
+    }
+
+    /**
+     * 获取工序bom关联id，关联工序bom表：mt_alone_process_bom
+     *
+     * @return process_bom_id - 工序bom关联id，关联工序bom表：mt_alone_process_bom
+     */
+    public Integer getProcessBomId() {
+        return processBomId;
+    }
+
+    /**
+     * 设置工序bom关联id，关联工序bom表：mt_alone_process_bom
+     *
+     * @param processBomId 工序bom关联id，关联工序bom表：mt_alone_process_bom
+     */
+    public void setProcessBomId(Integer processBomId) {
+        this.processBomId = processBomId;
+    }
+
+    /**
+     * 获取工序bom名称
+     *
+     * @return process_bom_name - 工序bom名称
+     */
+    public String getProcessBomName() {
+        return processBomName;
+    }
+
+    /**
+     * 设置工序bom名称
+     *
+     * @param processBomName 工序bom名称
+     */
+    public void setProcessBomName(String processBomName) {
+        this.processBomName = processBomName;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessMethods.java

@@ -0,0 +1,286 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_alone_process_methods")
+public class MtAloneProcessMethods {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "creator_id")
+    private Long creatorId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "updater_id")
+    private Long updaterId;
+
+    /**
+     * 版本号 默认为 1
+     */
+    private String version;
+
+    /**
+     * 状态		0处理中，1处理完成
+     */
+    private Integer status;
+
+    /**
+     * 绑定公司id
+     */
+    @Column(name = "company_id")
+    private Long companyId;
+
+    /**
+     * 加工方式编码
+     */
+    @Column(name = "process_methods_code")
+    private String processMethodsCode;
+
+    /**
+     * 加工方式名称
+     */
+    @Column(name = "process_methods_name")
+    private String processMethodsName;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取创建人id
+     *
+     * @return creator_id - 创建人id
+     */
+    public Long getCreatorId() {
+        return creatorId;
+    }
+
+    /**
+     * 设置创建人id
+     *
+     * @param creatorId 创建人id
+     */
+    public void setCreatorId(Long creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    /**
+     * 获取更新人id
+     *
+     * @return updater_id - 更新人id
+     */
+    public Long getUpdaterId() {
+        return updaterId;
+    }
+
+    /**
+     * 设置更新人id
+     *
+     * @param updaterId 更新人id
+     */
+    public void setUpdaterId(Long updaterId) {
+        this.updaterId = updaterId;
+    }
+
+    /**
+     * 获取版本号 默认为 1
+     *
+     * @return version - 版本号 默认为 1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1
+     *
+     * @param version 版本号 默认为 1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0处理中，1处理完成
+     *
+     * @return status - 状态		0处理中，1处理完成
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0处理中，1处理完成
+     *
+     * @param status 状态		0处理中，1处理完成
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取绑定公司id
+     *
+     * @return company_id - 绑定公司id
+     */
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * 设置绑定公司id
+     *
+     * @param companyId 绑定公司id
+     */
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * 获取加工方式编码
+     *
+     * @return process_methods_code - 加工方式编码
+     */
+    public String getProcessMethodsCode() {
+        return processMethodsCode;
+    }
+
+    /**
+     * 设置加工方式编码
+     *
+     * @param processMethodsCode 加工方式编码
+     */
+    public void setProcessMethodsCode(String processMethodsCode) {
+        this.processMethodsCode = processMethodsCode;
+    }
+
+    /**
+     * 获取加工方式名称
+     *
+     * @return process_methods_name - 加工方式名称
+     */
+    public String getProcessMethodsName() {
+        return processMethodsName;
+    }
+
+    /**
+     * 设置加工方式名称
+     *
+     * @param processMethodsName 加工方式名称
+     */
+    public void setProcessMethodsName(String processMethodsName) {
+        this.processMethodsName = processMethodsName;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return note - 备注
+     */
+    public String getNote() {
+        return note;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param note 备注
+     */
+    public void setNote(String note) {
+        this.note = note;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessMethodsParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by  on 2019/10/16.
+*/
+public class MtAloneProcessMethodsParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java

@@ -0,0 +1,19 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by hy on 2019/07/19.
+*/
+public class MtAloneProcessParams extends QueryParams {
+
+    private Integer productBomId;
+
+    public Integer getProductBomId() {
+        return productBomId;
+    }
+
+    public void setProductBomId(Integer productBomId) {
+        this.productBomId = productBomId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProductName.java

@@ -0,0 +1,286 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_alone_product_name")
+public class MtAloneProductName {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "creator_id")
+    private Long creatorId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "updater_id")
+    private Long updaterId;
+
+    /**
+     * 版本号 默认为 1
+     */
+    private String version;
+
+    /**
+     * 状态		0处理中，1处理完成
+     */
+    private Integer status;
+
+    /**
+     * 绑定公司id
+     */
+    @Column(name = "company_id")
+    private Long companyId;
+
+    /**
+     * 品名编码
+     */
+    @Column(name = "product_name_code")
+    private String productNameCode;
+
+    /**
+     * 品名
+     */
+    @Column(name = "product_name")
+    private String productName;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取创建人id
+     *
+     * @return creator_id - 创建人id
+     */
+    public Long getCreatorId() {
+        return creatorId;
+    }
+
+    /**
+     * 设置创建人id
+     *
+     * @param creatorId 创建人id
+     */
+    public void setCreatorId(Long creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    /**
+     * 获取更新人id
+     *
+     * @return updater_id - 更新人id
+     */
+    public Long getUpdaterId() {
+        return updaterId;
+    }
+
+    /**
+     * 设置更新人id
+     *
+     * @param updaterId 更新人id
+     */
+    public void setUpdaterId(Long updaterId) {
+        this.updaterId = updaterId;
+    }
+
+    /**
+     * 获取版本号 默认为 1
+     *
+     * @return version - 版本号 默认为 1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1
+     *
+     * @param version 版本号 默认为 1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0处理中，1处理完成
+     *
+     * @return status - 状态		0处理中，1处理完成
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0处理中，1处理完成
+     *
+     * @param status 状态		0处理中，1处理完成
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取绑定公司id
+     *
+     * @return company_id - 绑定公司id
+     */
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * 设置绑定公司id
+     *
+     * @param companyId 绑定公司id
+     */
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * 获取品名编码
+     *
+     * @return product_name_code - 品名编码
+     */
+    public String getProductNameCode() {
+        return productNameCode;
+    }
+
+    /**
+     * 设置品名编码
+     *
+     * @param productNameCode 品名编码
+     */
+    public void setProductNameCode(String productNameCode) {
+        this.productNameCode = productNameCode;
+    }
+
+    /**
+     * 获取品名
+     *
+     * @return product_name - 品名
+     */
+    public String getProductName() {
+        return productName;
+    }
+
+    /**
+     * 设置品名
+     *
+     * @param productName 品名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return note - 备注
+     */
+    public String getNote() {
+        return note;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param note 备注
+     */
+    public void setNote(String note) {
+        this.note = note;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProductNameParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by  on 2019/10/16.
+*/
+public class MtAloneProductNameParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneSerialNumber.java

@@ -0,0 +1,353 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_alone_serial_number")
+public class MtAloneSerialNumber {
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "creator_id")
+    private Long creatorId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "updater_id")
+    private Long updaterId;
+
+    /**
+     * 版本号 默认为 1
+     */
+    private String version;
+
+    /**
+     * 状态		0处理中，1处理完成
+     */
+    private Integer status;
+
+    /**
+     * 绑定公司id
+     */
+    @Column(name = "company_id")
+    private Long companyId;
+
+    /**
+     * 一级大类
+     */
+    @Column(name = "first_large_class")
+    private String firstLargeClass;
+
+    /**
+     * 品名
+     */
+    @Column(name = "product_name")
+    private String productName;
+
+    /**
+     * 分类名称
+     */
+    @Column(name = "sort_name")
+    private String sortName;
+
+    /**
+     * 计数器
+     */
+    @Column(name = "pin_counter")
+    private Integer pinCounter;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * @return id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取创建人id
+     *
+     * @return creator_id - 创建人id
+     */
+    public Long getCreatorId() {
+        return creatorId;
+    }
+
+    /**
+     * 设置创建人id
+     *
+     * @param creatorId 创建人id
+     */
+    public void setCreatorId(Long creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    /**
+     * 获取更新人id
+     *
+     * @return updater_id - 更新人id
+     */
+    public Long getUpdaterId() {
+        return updaterId;
+    }
+
+    /**
+     * 设置更新人id
+     *
+     * @param updaterId 更新人id
+     */
+    public void setUpdaterId(Long updaterId) {
+        this.updaterId = updaterId;
+    }
+
+    /**
+     * 获取版本号 默认为 1
+     *
+     * @return version - 版本号 默认为 1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1
+     *
+     * @param version 版本号 默认为 1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0处理中，1处理完成
+     *
+     * @return status - 状态		0处理中，1处理完成
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0处理中，1处理完成
+     *
+     * @param status 状态		0处理中，1处理完成
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取绑定公司id
+     *
+     * @return company_id - 绑定公司id
+     */
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * 设置绑定公司id
+     *
+     * @param companyId 绑定公司id
+     */
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * 获取一级大类
+     *
+     * @return first_large_class - 一级大类
+     */
+    public String getFirstLargeClass() {
+        return firstLargeClass;
+    }
+
+    /**
+     * 设置一级大类
+     *
+     * @param firstLargeClass 一级大类
+     */
+    public void setFirstLargeClass(String firstLargeClass) {
+        this.firstLargeClass = firstLargeClass;
+    }
+
+    /**
+     * 获取品名
+     *
+     * @return product_name - 品名
+     */
+    public String getProductName() {
+        return productName;
+    }
+
+    /**
+     * 设置品名
+     *
+     * @param productName 品名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取分类名称
+     *
+     * @return sort_name - 分类名称
+     */
+    public String getSortName() {
+        return sortName;
+    }
+
+    /**
+     * 设置分类名称
+     *
+     * @param sortName 分类名称
+     */
+    public void setSortName(String sortName) {
+        this.sortName = sortName;
+    }
+
+    /**
+     * 获取计数器
+     *
+     * @return pin_counter - 计数器
+     */
+    public Integer getPinCounter() {
+        return pinCounter;
+    }
+
+    /**
+     * 设置计数器
+     *
+     * @param pinCounter 计数器
+     */
+    public void setPinCounter(Integer pinCounter) {
+        this.pinCounter = pinCounter;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return note - 备注
+     */
+    public String getNote() {
+        return note;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param note 备注
+     */
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    @Override
+    public String toString() {
+        return "MtAloneSerialNumber{" +
+                "id=" + id +
+                ", operatorId=" + operatorId +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", creatorId=" + creatorId +
+                ", updaterId=" + updaterId +
+                ", version='" + version + '\'' +
+                ", status=" + status +
+                ", companyId=" + companyId +
+                ", firstLargeClass='" + firstLargeClass + '\'' +
+                ", productName='" + productName + '\'' +
+                ", sortName='" + sortName + '\'' +
+                ", pinCounter=" + pinCounter +
+                ", note='" + note + '\'' +
+                '}';
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneSerialNumberParams.java

@@ -0,0 +1,38 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by  on 2019/10/17.
+*/
+public class MtAloneSerialNumberParams extends QueryParams {
+    private String firstLargeClass;
+
+    private String productName;
+
+    private String sortName;
+
+    public String getFirstLargeClass() {
+        return firstLargeClass;
+    }
+
+    public void setFirstLargeClass(String firstLargeClass) {
+        this.firstLargeClass = firstLargeClass;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getSortName() {
+        return sortName;
+    }
+
+    public void setSortName(String sortName) {
+        this.sortName = sortName;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtNumberConf.java

@@ -0,0 +1,271 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_number_conf")
+public class MtNumberConf {
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "creator_id")
+    private Long creatorId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "updater_id")
+    private Long updaterId;
+
+    /**
+     * 版本号 默认为 1
+     */
+    private String version;
+
+    /**
+     * 状态		0处理中，1处理完成
+     */
+    private Integer status;
+
+    /**
+     * 绑定公司id
+     */
+    @Column(name = "company_id")
+    private Long companyId;
+
+    /**
+     * 品号序号，初始值为5000，每次增加1，然后存储
+     */
+    @Column(name = "pin_serial")
+    private Integer pinSerial;
+
+    private String remark;
+
+    /**
+     * @return id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取创建人id
+     *
+     * @return creator_id - 创建人id
+     */
+    public Long getCreatorId() {
+        return creatorId;
+    }
+
+    /**
+     * 设置创建人id
+     *
+     * @param creatorId 创建人id
+     */
+    public void setCreatorId(Long creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    /**
+     * 获取更新人id
+     *
+     * @return updater_id - 更新人id
+     */
+    public Long getUpdaterId() {
+        return updaterId;
+    }
+
+    /**
+     * 设置更新人id
+     *
+     * @param updaterId 更新人id
+     */
+    public void setUpdaterId(Long updaterId) {
+        this.updaterId = updaterId;
+    }
+
+    /**
+     * 获取版本号 默认为 1
+     *
+     * @return version - 版本号 默认为 1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1
+     *
+     * @param version 版本号 默认为 1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0处理中，1处理完成
+     *
+     * @return status - 状态		0处理中，1处理完成
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0处理中，1处理完成
+     *
+     * @param status 状态		0处理中，1处理完成
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取绑定公司id
+     *
+     * @return company_id - 绑定公司id
+     */
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * 设置绑定公司id
+     *
+     * @param companyId 绑定公司id
+     */
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * 获取品号序号，初始值为5000，每次增加1，然后存储
+     *
+     * @return pin_serial - 品号序号，初始值为5000，每次增加1，然后存储
+     */
+    public Integer getPinSerial() {
+        return pinSerial;
+    }
+
+    /**
+     * 设置品号序号，初始值为5000，每次增加1，然后存储
+     *
+     * @param pinSerial 品号序号，初始值为5000，每次增加1，然后存储
+     */
+    public void setPinSerial(Integer pinSerial) {
+        this.pinSerial = pinSerial;
+    }
+
+    /**
+     * @return remark
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * @param remark
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "MtNumberConf{" +
+                "id=" + id +
+                ", operatorId=" + operatorId +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", creatorId=" + creatorId +
+                ", updaterId=" + updaterId +
+                ", version='" + version + '\'' +
+                ", status=" + status +
+                ", companyId=" + companyId +
+                ", pinSerial=" + pinSerial +
+                ", remark='" + remark + '\'' +
+                '}';
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtNumberConfParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by  on 2019/10/17.
+*/
+public class MtNumberConfParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtStockProvendor.java

@@ -0,0 +1,489 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_stock_provendor")
+public class MtStockProvendor {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "creator_id")
+    private Long creatorId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "updater_id")
+    private Long updaterId;
+
+    /**
+     * 版本号 默认为 1
+     */
+    private String version;
+
+    /**
+     * 状态		0处理中，1处理完成
+     */
+    private Integer status;
+
+    /**
+     * 绑定公司id
+     */
+    @Column(name = "company_id")
+    private Long companyId;
+
+    /**
+     * 供应商类型，1表示公司，2个人
+     */
+    @Column(name = "provendor_type")
+    private Integer provendorType;
+
+    /**
+     * 供应商编码
+     */
+    @Column(name = "customer_code")
+    private String customerCode;
+
+    /**
+     * 供应商名称
+     */
+    @Column(name = "provendor_name")
+    private String provendorName;
+
+    /**
+     * 供货类型，一级大类下拉框
+     */
+    @Column(name = "first_large_class")
+    private String firstLargeClass;
+
+    /**
+     * 传真
+     */
+    private String fax;
+
+    /**
+     * 联系人名称
+     */
+    @Column(name = "contact_name")
+    private String contactName;
+
+    /**
+     * 联系人电话
+     */
+    private String tel;
+
+    /**
+     * 单位职务
+     */
+    private String position;
+
+    /**
+     * 性别，单选框
+     */
+    private String gender;
+
+    /**
+     * 联系地址，详细地址
+     */
+    private String address;
+
+    /**
+     * 描述信息，描述供应商一般性信息
+     */
+    private String description;
+
+    private String remark;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取创建人id
+     *
+     * @return creator_id - 创建人id
+     */
+    public Long getCreatorId() {
+        return creatorId;
+    }
+
+    /**
+     * 设置创建人id
+     *
+     * @param creatorId 创建人id
+     */
+    public void setCreatorId(Long creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    /**
+     * 获取更新人id
+     *
+     * @return updater_id - 更新人id
+     */
+    public Long getUpdaterId() {
+        return updaterId;
+    }
+
+    /**
+     * 设置更新人id
+     *
+     * @param updaterId 更新人id
+     */
+    public void setUpdaterId(Long updaterId) {
+        this.updaterId = updaterId;
+    }
+
+    /**
+     * 获取版本号 默认为 1
+     *
+     * @return version - 版本号 默认为 1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1
+     *
+     * @param version 版本号 默认为 1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0处理中，1处理完成
+     *
+     * @return status - 状态		0处理中，1处理完成
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0处理中，1处理完成
+     *
+     * @param status 状态		0处理中，1处理完成
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取绑定公司id
+     *
+     * @return company_id - 绑定公司id
+     */
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * 设置绑定公司id
+     *
+     * @param companyId 绑定公司id
+     */
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * 获取供应商类型，1表示公司，2个人
+     *
+     * @return provendor_type - 供应商类型，1表示公司，2个人
+     */
+    public Integer getProvendorType() {
+        return provendorType;
+    }
+
+    /**
+     * 设置供应商类型，1表示公司，2个人
+     *
+     * @param provendorType 供应商类型，1表示公司，2个人
+     */
+    public void setProvendorType(Integer provendorType) {
+        this.provendorType = provendorType;
+    }
+
+    /**
+     * 获取供应商编码
+     *
+     * @return customer_code - 供应商编码
+     */
+    public String getCustomerCode() {
+        return customerCode;
+    }
+
+    /**
+     * 设置供应商编码
+     *
+     * @param customerCode 供应商编码
+     */
+    public void setCustomerCode(String customerCode) {
+        this.customerCode = customerCode;
+    }
+
+    /**
+     * 获取供应商名称
+     *
+     * @return provendor_name - 供应商名称
+     */
+    public String getProvendorName() {
+        return provendorName;
+    }
+
+    /**
+     * 设置供应商名称
+     *
+     * @param provendorName 供应商名称
+     */
+    public void setProvendorName(String provendorName) {
+        this.provendorName = provendorName;
+    }
+
+    /**
+     * 获取供货类型，一级大类下拉框
+     *
+     * @return first_large_class - 供货类型，一级大类下拉框
+     */
+    public String getFirstLargeClass() {
+        return firstLargeClass;
+    }
+
+    /**
+     * 设置供货类型，一级大类下拉框
+     *
+     * @param firstLargeClass 供货类型，一级大类下拉框
+     */
+    public void setFirstLargeClass(String firstLargeClass) {
+        this.firstLargeClass = firstLargeClass;
+    }
+
+    /**
+     * 获取传真
+     *
+     * @return fax - 传真
+     */
+    public String getFax() {
+        return fax;
+    }
+
+    /**
+     * 设置传真
+     *
+     * @param fax 传真
+     */
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    /**
+     * 获取联系人名称
+     *
+     * @return contact_name - 联系人名称
+     */
+    public String getContactName() {
+        return contactName;
+    }
+
+    /**
+     * 设置联系人名称
+     *
+     * @param contactName 联系人名称
+     */
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    /**
+     * 获取联系人电话
+     *
+     * @return tel - 联系人电话
+     */
+    public String getTel() {
+        return tel;
+    }
+
+    /**
+     * 设置联系人电话
+     *
+     * @param tel 联系人电话
+     */
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    /**
+     * 获取单位职务
+     *
+     * @return position - 单位职务
+     */
+    public String getPosition() {
+        return position;
+    }
+
+    /**
+     * 设置单位职务
+     *
+     * @param position 单位职务
+     */
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    /**
+     * 获取性别，单选框
+     *
+     * @return gender - 性别，单选框
+     */
+    public String getGender() {
+        return gender;
+    }
+
+    /**
+     * 设置性别，单选框
+     *
+     * @param gender 性别，单选框
+     */
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    /**
+     * 获取联系地址，详细地址
+     *
+     * @return address - 联系地址，详细地址
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * 设置联系地址，详细地址
+     *
+     * @param address 联系地址，详细地址
+     */
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    /**
+     * 获取描述信息，描述供应商一般性信息
+     *
+     * @return description - 描述信息，描述供应商一般性信息
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 设置描述信息，描述供应商一般性信息
+     *
+     * @param description 描述信息，描述供应商一般性信息
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * @return remark
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * @param remark
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtStockProvendorParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by  on 2019/10/17.
+*/
+public class MtStockProvendorParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBatchRelat.java

@@ -0,0 +1,350 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_alone_process_batch_relat")
+public class ProcessBatchRelat {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 批次id，关联产品加工批次表：mt_alone_product_process_batch
+     */
+    @Column(name = "batch_id")
+    private Integer batchId;
+
+    /**
+     * 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    @Column(name = "process_id")
+    private Integer processId;
+
+    /**
+     * 批次号
+     */
+    @Column(name = "batch_code")
+    private String batchCode;
+
+    /**
+     * 原先提供长度，单位米
+     */
+    private Float len;
+
+    /**
+     * 配送长度，单位米
+     */
+    @Column(name = "delivery_len")
+    private Float deliveryLen;
+
+    /**
+     * 现有检测长度
+     */
+    @Column(name = "detection_len")
+    private Float detectionLen;
+
+    /**
+     * 缩率%，现有检测长度/原先长度
+     */
+    private String shrinkage;
+
+    /**
+     * 附件code，关联附件表：mt_alone_accessory
+     */
+    @Column(name = "product_annex_code")
+    private String productAnnexCode;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取批次id，关联产品加工批次表：mt_alone_product_process_batch
+     *
+     * @return batch_id - 批次id，关联产品加工批次表：mt_alone_product_process_batch
+     */
+    public Integer getBatchId() {
+        return batchId;
+    }
+
+    /**
+     * 设置批次id，关联产品加工批次表：mt_alone_product_process_batch
+     *
+     * @param batchId 批次id，关联产品加工批次表：mt_alone_product_process_batch
+     */
+    public void setBatchId(Integer batchId) {
+        this.batchId = batchId;
+    }
+
+    /**
+     * 获取工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     *
+     * @return process_id - 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    /**
+     * 设置工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     *
+     * @param processId 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    /**
+     * 获取批次号
+     *
+     * @return batch_code - 批次号
+     */
+    public String getBatchCode() {
+        return batchCode;
+    }
+
+    /**
+     * 设置批次号
+     *
+     * @param batchCode 批次号
+     */
+    public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+    /**
+     * 获取原先提供长度，单位米
+     *
+     * @return len - 原先提供长度，单位米
+     */
+    public Float getLen() {
+        return len;
+    }
+
+    /**
+     * 设置原先提供长度，单位米
+     *
+     * @param len 原先提供长度，单位米
+     */
+    public void setLen(Float len) {
+        this.len = len;
+    }
+
+    /**
+     * 获取配送长度，单位米
+     *
+     * @return delivery_len - 配送长度，单位米
+     */
+    public Float getDeliveryLen() {
+        return deliveryLen;
+    }
+
+    /**
+     * 设置配送长度，单位米
+     *
+     * @param deliveryLen 配送长度，单位米
+     */
+    public void setDeliveryLen(Float deliveryLen) {
+        this.deliveryLen = deliveryLen;
+    }
+
+    /**
+     * 获取现有检测长度
+     *
+     * @return detection_len - 现有检测长度
+     */
+    public Float getDetectionLen() {
+        return detectionLen;
+    }
+
+    /**
+     * 设置现有检测长度
+     *
+     * @param detectionLen 现有检测长度
+     */
+    public void setDetectionLen(Float detectionLen) {
+        this.detectionLen = detectionLen;
+    }
+
+    /**
+     * 获取缩率%，现有检测长度/原先长度
+     *
+     * @return shrinkage - 缩率%，现有检测长度/原先长度
+     */
+    public String getShrinkage() {
+        return shrinkage;
+    }
+
+    /**
+     * 设置缩率%，现有检测长度/原先长度
+     *
+     * @param shrinkage 缩率%，现有检测长度/原先长度
+     */
+    public void setShrinkage(String shrinkage) {
+        this.shrinkage = shrinkage;
+    }
+
+    /**
+     * 获取附件code，关联附件表：mt_alone_accessory
+     *
+     * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory
+     */
+    public String getProductAnnexCode() {
+        return productAnnexCode;
+    }
+
+    /**
+     * 设置附件code，关联附件表：mt_alone_accessory
+     *
+     * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory
+     */
+    public void setProductAnnexCode(String productAnnexCode) {
+        this.productAnnexCode = productAnnexCode;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBatchRelatParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by  on 2019/09/09.
+*/
+public class ProcessBatchRelatParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBom.java

@@ -0,0 +1,347 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_process_bom")
+public class ProcessBom {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private Integer version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 工序名称
+     */
+    @Column(name = "process_name")
+    private String processName;
+
+    /**
+     * 产品生产bom的id，关联表：mt_alone_product_process_bom
+     */
+    @Column(name = "product_process_id")
+    private Integer productProcessId;
+
+    /**
+     * 规格型号
+     */
+    private String specification;
+
+    /**
+     * 加工描述内容
+     */
+    @Column(name = "process_content")
+    private String processContent;
+
+    /**
+     * 工序步骤，从第一步开始，依次增加
+     */
+    @Column(name = "process_step")
+    private Integer processStep;
+
+    /**
+     * 附件code，关联附件表：mt_alone_accessory
+     */
+    @Column(name = "product_annex_code")
+    private String productAnnexCode;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    private String processNum;
+
+
+    private String processApartment;
+
+    public String getProcessNum() {
+        return processNum;
+    }
+
+    public void setProcessNum(String processNum) {
+        this.processNum = processNum;
+    }
+
+    public String getProcessApartment() {
+        return processApartment;
+    }
+
+    public void setProcessApartment(String processApartment) {
+        this.processApartment = processApartment;
+    }
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取工序名称
+     *
+     * @return process_name - 工序名称
+     */
+    public String getProcessName() {
+        return processName;
+    }
+
+    /**
+     * 设置工序名称
+     *
+     * @param processName 工序名称
+     */
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    /**
+     * 获取产品生产bom的id，关联表：mt_alone_product_process_bom
+     *
+     * @return product_process_id - 产品生产bom的id，关联表：mt_alone_product_process_bom
+     */
+    public Integer getProductProcessId() {
+        return productProcessId;
+    }
+
+    /**
+     * 设置产品生产bom的id，关联表：mt_alone_product_process_bom
+     *
+     * @param productProcessId 产品生产bom的id，关联表：mt_alone_product_process_bom
+     */
+    public void setProductProcessId(Integer productProcessId) {
+        this.productProcessId = productProcessId;
+    }
+
+    /**
+     * 获取规格型号
+     *
+     * @return specification - 规格型号
+     */
+    public String getSpecification() {
+        return specification;
+    }
+
+    /**
+     * 设置规格型号
+     *
+     * @param specification 规格型号
+     */
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    /**
+     * 获取加工描述内容
+     *
+     * @return process_content - 加工描述内容
+     */
+    public String getProcessContent() {
+        return processContent;
+    }
+
+    /**
+     * 设置加工描述内容
+     *
+     * @param processContent 加工描述内容
+     */
+    public void setProcessContent(String processContent) {
+        this.processContent = processContent;
+    }
+
+    /**
+     * 获取工序步骤，从第一步开始，依次增加
+     *
+     * @return process_step - 工序步骤，从第一步开始，依次增加
+     */
+    public Integer getProcessStep() {
+        return processStep;
+    }
+
+    /**
+     * 设置工序步骤，从第一步开始，依次增加
+     *
+     * @param processStep 工序步骤，从第一步开始，依次增加
+     */
+    public void setProcessStep(Integer processStep) {
+        this.processStep = processStep;
+    }
+
+    /**
+     * 获取附件code，关联附件表：mt_alone_accessory
+     *
+     * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory
+     */
+    public String getProductAnnexCode() {
+        return productAnnexCode;
+    }
+
+    /**
+     * 设置附件code，关联附件表：mt_alone_accessory
+     *
+     * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory
+     */
+    public void setProductAnnexCode(String productAnnexCode) {
+        this.productAnnexCode = productAnnexCode;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return memo - 备注
+     */
+    public String getMemo() {
+        return memo;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param memo 备注
+     */
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomDto.java

@@ -0,0 +1,53 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.List;
+
+/**
+ * @Author: hy
+ * @Date: 2019/8/25 13:01
+ * @Version 1.0
+ */
+public class ProcessBomDto extends ProcessBom{
+
+    private Integer productProcessId;
+
+    private String productProcessName;
+
+    private String companyName;
+
+    private List<ProcessMaterialsBomDto> processMaterialsBomDtoList;
+
+    public List<ProcessMaterialsBomDto> getProcessMaterialsBomDtoList() {
+        return processMaterialsBomDtoList;
+    }
+
+    public void setProcessMaterialsBomDtoList(List<ProcessMaterialsBomDto> processMaterialsBomDtoList) {
+        this.processMaterialsBomDtoList = processMaterialsBomDtoList;
+    }
+
+    @Override
+    public Integer getProductProcessId() {
+        return productProcessId;
+    }
+
+    @Override
+    public void setProductProcessId(Integer productProcessId) {
+        this.productProcessId = productProcessId;
+    }
+
+    public String getProductProcessName() {
+        return productProcessName;
+    }
+
+    public void setProductProcessName(String productProcessName) {
+        this.productProcessName = productProcessName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomParams.java

@@ -0,0 +1,189 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* Created by guo on 2019/07/18.
+*/
+public class ProcessBomParams extends QueryParams {
+    /**
+     *产品生产bom的id
+     */
+    private Integer productProcessId;
+
+    /**
+     *产品id
+     */
+    private Integer productId;
+
+    /**
+     * 产品表中的id
+     */
+    private Integer id;
+    /**
+     * 添加时间
+     */
+    private Date createTime;
+    /**
+     * 产品加工总名称
+     */
+    private String productProcessName;
+    /**
+     * 加工规格型号
+     */
+    private String specification;
+    /**
+     * 加工描述内容
+     */
+    private String processContent;
+    /**
+     * 备注
+     */
+    private String memo;
+    /**
+     * 工序步骤
+     */
+    private Integer processStep;
+    /**
+     * 工序执行部门
+     */
+    private String processApartment;
+    /**
+     * 工序名称
+     */
+    private String processName;
+
+    /**
+     * 物料bom表
+     * @return
+     */
+    private List<ProcessMaterialsBomParams> processMaterialsBomParamsList;
+
+    @Override
+    public String toString() {
+        return "ProcessBomParams{" +
+                "productProcessId=" + productProcessId +
+                ", productId=" + productId +
+                ", id=" + id +
+                ", createTime=" + createTime +
+                ", productProcessName='" + productProcessName + '\'' +
+                ", specification='" + specification + '\'' +
+                ", processContent='" + processContent + '\'' +
+                ", memo='" + memo + '\'' +
+                ", processStep=" + processStep +
+                ", processApartment='" + processApartment + '\'' +
+                ", processName='" + processName + '\'' +
+                ", processMaterialsBomParamsList=" + processMaterialsBomParamsList +
+                ", processBomVoList=" + processBomVoList +
+                '}';
+    }
+
+    public List<ProcessMaterialsBomParams> getProcessMaterialsBomParamsList() {
+        return processMaterialsBomParamsList;
+    }
+
+    public void setProcessMaterialsBomParamsList(List<ProcessMaterialsBomParams> processMaterialsBomParamsList) {
+        this.processMaterialsBomParamsList = processMaterialsBomParamsList;
+    }
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    private List<ProcessBomVo> processBomVoList;
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getProductProcessName() {
+        return productProcessName;
+    }
+
+    public void setProductProcessName(String productProcessName) {
+        this.productProcessName = productProcessName;
+    }
+
+    public String getSpecification() {
+        return specification;
+    }
+
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    public String getProcessContent() {
+        return processContent;
+    }
+
+    public void setProcessContent(String processContent) {
+        this.processContent = processContent;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Integer getProductProcessId() {
+        return productProcessId;
+    }
+
+    public Integer getProcessStep() {
+        return processStep;
+    }
+
+    public void setProcessStep(Integer processStep) {
+        this.processStep = processStep;
+    }
+
+    public String getProcessApartment() {
+        return processApartment;
+    }
+
+    public void setProcessApartment(String processApartment) {
+        this.processApartment = processApartment;
+    }
+
+    public void setProductProcessId(Integer productProcessId) {
+        this.productProcessId = productProcessId;
+    }
+
+    public List<ProcessBomVo> getProcessBomVoList() {
+        return processBomVoList;
+    }
+
+    public void setProcessBomVoList(List<ProcessBomVo> processBomVoList) {
+        this.processBomVoList = processBomVoList;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomVo.java

@@ -0,0 +1,21 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.List;
+
+/**
+ * @Author: weihongyang
+ * @Date: 2019/10/9 9:57
+ * @Version 1.0
+ */
+public class ProcessBomVo extends ProcessBom{
+
+    private List<ProcessMaterialsBom> list;
+
+    public List<ProcessMaterialsBom> getList() {
+        return list;
+    }
+
+    public void setList(List<ProcessMaterialsBom> list) {
+        this.list = list;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessDetectRelat.java

@@ -0,0 +1,232 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_process_detect_relat")
+public class ProcessDetectRelat {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    @Column(name = "process_id")
+    private Integer processId;
+
+    /**
+     * 产品条码code
+     */
+    @Column(name = "product_bar_code")
+    private String productBarCode;
+
+    /**
+     * 产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 
+     */
+    @Column(name = "product_bar_det_code")
+    private String productBarDetCode;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     *
+     * @return process_id - 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    /**
+     * 设置工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     *
+     * @param processId 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    /**
+     * 获取产品条码code
+     *
+     * @return product_bar_code - 产品条码code
+     */
+    public String getProductBarCode() {
+        return productBarCode;
+    }
+
+    /**
+     * 设置产品条码code
+     *
+     * @param productBarCode 产品条码code
+     */
+    public void setProductBarCode(String productBarCode) {
+        this.productBarCode = productBarCode;
+    }
+
+    /**
+     * 获取产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 
+     *
+     * @return product_bar_det_code - 产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 
+     */
+    public String getProductBarDetCode() {
+        return productBarDetCode;
+    }
+
+    /**
+     * 设置产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 
+     *
+     * @param productBarDetCode 产品明细code，产品明细code：product_det_code，每一卷布可能有多次检测 
+     */
+    public void setProductBarDetCode(String productBarDetCode) {
+        this.productBarDetCode = productBarDetCode;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessDetectRelatParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by guo on 2019/07/21.
+*/
+public class ProcessDetectRelatParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java

@@ -0,0 +1,372 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_process_materials")
+public class ProcessMaterials {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private Integer version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 工序id，关联工序表：mt_alone_process
+     */
+    @Column(name = "process_id")
+    private Integer processId;
+
+    /**
+     * 物料bom的id，关联物料表：mt_alone_process_materials_bom
+     */
+    @Column(name = "materials_bom_id")
+    private Integer materialsBomId;
+
+    /**
+     * 物料名称
+     */
+    @Column(name = "materials_name")
+    private String materialsName;
+
+    /**
+     * 物料编码
+     */
+    private String code;
+
+    /**
+     * 规格类型
+     */
+    private String specification;
+
+    /**
+     * 用量
+     */
+    private Float dosage;
+
+    /**
+     * 单位id
+     */
+    @Column(name = "unit_id")
+    private Integer unitId;
+
+    /**
+     * 单位名称
+     */
+    @Column(name = "unit_name")
+    private String unitName;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取工序id，关联工序表：mt_alone_process
+     *
+     * @return process_id - 工序id，关联工序表：mt_alone_process
+     */
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    /**
+     * 设置工序id，关联工序表：mt_alone_process
+     *
+     * @param processId 工序id，关联工序表：mt_alone_process
+     */
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    /**
+     * 获取物料bom的id，关联物料表：mt_alone_process_materials_bom
+     *
+     * @return materials_bom_id - 物料bom的id，关联物料表：mt_alone_process_materials_bom
+     */
+    public Integer getMaterialsBomId() {
+        return materialsBomId;
+    }
+
+    /**
+     * 设置物料bom的id，关联物料表：mt_alone_process_materials_bom
+     *
+     * @param materialsBomId 物料bom的id，关联物料表：mt_alone_process_materials_bom
+     */
+    public void setMaterialsBomId(Integer materialsBomId) {
+        this.materialsBomId = materialsBomId;
+    }
+
+    /**
+     * 获取物料名称
+     *
+     * @return materials_name - 物料名称
+     */
+    public String getMaterialsName() {
+        return materialsName;
+    }
+
+    /**
+     * 设置物料名称
+     *
+     * @param materialsName 物料名称
+     */
+    public void setMaterialsName(String materialsName) {
+        this.materialsName = materialsName;
+    }
+
+    /**
+     * 获取物料编码
+     *
+     * @return code - 物料编码
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置物料编码
+     *
+     * @param code 物料编码
+     */
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+     * 获取规格类型
+     *
+     * @return specification - 规格类型
+     */
+    public String getSpecification() {
+        return specification;
+    }
+
+    /**
+     * 设置规格类型
+     *
+     * @param specification 规格类型
+     */
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    /**
+     * 获取用量
+     *
+     * @return dosage - 用量
+     */
+    public Float getDosage() {
+        return dosage;
+    }
+
+    /**
+     * 设置用量
+     *
+     * @param dosage 用量
+     */
+    public void setDosage(Float dosage) {
+        this.dosage = dosage;
+    }
+
+    /**
+     * 获取单位id
+     *
+     * @return unit_id - 单位id
+     */
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    /**
+     * 设置单位id
+     *
+     * @param unitId 单位id
+     */
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    /**
+     * 获取单位名称
+     *
+     * @return unit_name - 单位名称
+     */
+    public String getUnitName() {
+        return unitName;
+    }
+
+    /**
+     * 设置单位名称
+     *
+     * @param unitName 单位名称
+     */
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return memo - 备注
+     */
+    public String getMemo() {
+        return memo;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param memo 备注
+     */
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBom.java

@@ -0,0 +1,324 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_process_materials_bom")
+public class ProcessMaterialsBom {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private Integer version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 工序bom的id，关联工序表：mt_alone_process_bom
+     */
+    @Column(name = "process_bom_id")
+    private Integer processBomId;
+
+    /**
+     * 物料id，关联物料表：mt_alone_materials_info
+     */
+    @Column(name = "materials_id")
+    private Integer materialsId;
+
+    /**
+     * 物料编码
+     */
+    private String code;
+
+    /**
+     * 规格类型
+     */
+    private String specification;
+
+    /**
+     * 用量
+     */
+    private Float dosage;
+
+    /**
+     * 单位id
+     */
+    @Column(name = "unit_id")
+    private Integer unitId;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取工序bom的id，关联工序表：mt_alone_process_bom
+     *
+     * @return process_bom_id - 工序bom的id，关联工序表：mt_alone_process_bom
+     */
+    public Integer getProcessBomId() {
+        return processBomId;
+    }
+
+    /**
+     * 设置工序bom的id，关联工序表：mt_alone_process_bom
+     *
+     * @param processBomId 工序bom的id，关联工序表：mt_alone_process_bom
+     */
+    public void setProcessBomId(Integer processBomId) {
+        this.processBomId = processBomId;
+    }
+
+    /**
+     * 获取物料id，关联物料表：mt_alone_materials_info
+     *
+     * @return materials_id - 物料id，关联物料表：mt_alone_materials_info
+     */
+    public Integer getMaterialsId() {
+        return materialsId;
+    }
+
+    /**
+     * 设置物料id，关联物料表：mt_alone_materials_info
+     *
+     * @param materialsId 物料id，关联物料表：mt_alone_materials_info
+     */
+    public void setMaterialsId(Integer materialsId) {
+        this.materialsId = materialsId;
+    }
+
+    /**
+     * 获取物料编码
+     *
+     * @return code - 物料编码
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * 设置物料编码
+     *
+     * @param code 物料编码
+     */
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+     * 获取规格类型
+     *
+     * @return specification - 规格类型
+     */
+    public String getSpecification() {
+        return specification;
+    }
+
+    /**
+     * 设置规格类型
+     *
+     * @param specification 规格类型
+     */
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    /**
+     * 获取用量
+     *
+     * @return dosage - 用量
+     */
+    public Float getDosage() {
+        return dosage;
+    }
+
+    /**
+     * 设置用量
+     *
+     * @param dosage 用量
+     */
+    public void setDosage(Float dosage) {
+        this.dosage = dosage;
+    }
+
+    /**
+     * 获取单位id
+     *
+     * @return unit_id - 单位id
+     */
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    /**
+     * 设置单位id
+     *
+     * @param unitId 单位id
+     */
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return memo - 备注
+     */
+    public String getMemo() {
+        return memo;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param memo 备注
+     */
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomDto.java

@@ -0,0 +1,69 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author: hy
+ * @Date: 2019/8/25 13:05
+ * @Version 1.0
+ */
+public class ProcessMaterialsBomDto extends ProcessMaterialsBom {
+
+    private Integer productProcessId;
+
+    private String productProcessName;
+
+    private Integer processId;
+
+    private String processName;
+
+    private String materialsName;
+
+    private String companyName;
+
+    public Integer getProductProcessId() {
+        return productProcessId;
+    }
+
+    public void setProductProcessId(Integer productProcessId) {
+        this.productProcessId = productProcessId;
+    }
+
+    public String getProductProcessName() {
+        return productProcessName;
+    }
+
+    public void setProductProcessName(String productProcessName) {
+        this.productProcessName = productProcessName;
+    }
+
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getMaterialsName() {
+        return materialsName;
+    }
+
+    public void setMaterialsName(String materialsName) {
+        this.materialsName = materialsName;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomParams.java

@@ -0,0 +1,126 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+ * 通过产品或者产品bom的id查询
+* Created by hy on 2019/07/19.
+*/
+public class ProcessMaterialsBomParams extends QueryParams {
+
+    /**
+     * ID
+     *
+     */
+    private Integer id;
+    /**
+     * 工序bom的id
+     */
+    private Integer processBomId;
+
+    private Integer productId;
+
+    private Integer productBomId;
+
+    /**
+     * 物料id
+     * @return
+     */
+    private Integer materialsId;
+
+    /**
+     * 物料编码
+     * @return
+     */
+    private String code;
+
+    /**
+     * 规格类型
+     * @return
+     */
+    private String specification;
+
+    /**
+     * 用量
+     * @return
+     */
+    private Double dosage;
+
+    @Override
+    public String toString() {
+        return "ProcessMaterialsBomParams{" +
+                "id=" + id +
+                ", processBomId=" + processBomId +
+                ", productId=" + productId +
+                ", productBomId=" + productBomId +
+                ", materialsId=" + materialsId +
+                ", code='" + code + '\'' +
+                ", specification='" + specification + '\'' +
+                ", dosage=" + dosage +
+                '}';
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getSpecification() {
+        return specification;
+    }
+
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+
+    public Double getDosage() {
+        return dosage;
+    }
+
+    public void setDosage(Double dosage) {
+        this.dosage = dosage;
+    }
+
+    public Integer getMaterialsId() {
+        return materialsId;
+    }
+
+    public void setMaterialsId(Integer materialsId) {
+        this.materialsId = materialsId;
+    }
+
+    public Integer getProcessBomId() {
+        return processBomId;
+    }
+
+    public void setProcessBomId(Integer processBomId) {
+        this.processBomId = processBomId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getProductBomId() {
+        return productBomId;
+    }
+
+    public void setProductBomId(Integer productBomId) {
+        this.productBomId = productBomId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomVo.java

@@ -0,0 +1,83 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * 新建加工单时下方展示的材料信息，
+ * 涉及mt_alone_materials_info，mt_alone_materials_stock_info，
+ * mt_alone_process_bom，mt_alone_process_materials_bom
+ * @Author: hy
+ * @Date: 2019/10/7 12:25
+ * @Version 1.0
+ */
+public class ProcessMaterialsBomVo extends ProcessMaterialsBom {
+    private String processName;//工序名称
+
+    private Integer processStep;//工序步骤
+
+    private String unitName;//单位名称
+
+    private String materialsName;//物料名称
+
+    private Float quantity;//库存数量
+
+    private Float stockDeduct;//库存抵扣数量
+
+    private Float remain;//剩余数量
+
+
+
+    public String getProcessName() {
+        return processName;
+    }
+
+    public void setProcessName(String processName) {
+        this.processName = processName;
+    }
+
+    public Integer getProcessStep() {
+        return processStep;
+    }
+
+    public void setProcessStep(Integer processStep) {
+        this.processStep = processStep;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public String getMaterialsName() {
+        return materialsName;
+    }
+
+    public void setMaterialsName(String materialsName) {
+        this.materialsName = materialsName;
+    }
+
+    public Float getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(Float quantity) {
+        this.quantity = quantity;
+    }
+
+    public Float getStockDeduct() {
+        return stockDeduct;
+    }
+
+    public void setStockDeduct(Float stockDeduct) {
+        this.stockDeduct = stockDeduct;
+    }
+
+    public Float getRemain() {
+        return remain;
+    }
+
+    public void setRemain(Float remain) {
+        this.remain = remain;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by hy on 2019/07/19.
+*/
+public class ProcessMaterialsParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by hy on 2019/07/19.
+*/
+public class ProcessParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessQualityInfo.java

@@ -0,0 +1,303 @@
+package com.deer.wms.produce.manage.model;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Table(name = "mt_alone_process_quality_info")
+public class ProcessQualityInfo {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private Integer version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 工序id，关联工序表：mt_alone_process
+     */
+    @Column(name = "process_id")
+    private Integer processId;
+
+    /**
+     * 完成百分比，%
+     */
+    @Column(name = "complete_ratio")
+    private String completeRatio;
+
+    /**
+     * 质量信息描述
+     */
+    @Column(name = "quality_info")
+    private String qualityInfo;
+
+    /**
+     * 完成匹数
+     */
+    @Column(name = "completed_num")
+    private Integer completedNum;
+
+    /**
+     * 附件code，关联附件表：mt_alone_accessory
+     */
+    @Column(name = "product_annex_code")
+    private String productAnnexCode;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取工序id，关联工序表：mt_alone_process
+     *
+     * @return process_id - 工序id，关联工序表：mt_alone_process
+     */
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    /**
+     * 设置工序id，关联工序表：mt_alone_process
+     *
+     * @param processId 工序id，关联工序表：mt_alone_process
+     */
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    /**
+     * 获取完成百分比，%
+     *
+     * @return complete_ratio - 完成百分比，%
+     */
+    public String getCompleteRatio() {
+        return completeRatio;
+    }
+
+    /**
+     * 设置完成百分比，%
+     *
+     * @param completeRatio 完成百分比，%
+     */
+    public void setCompleteRatio(String completeRatio) {
+        this.completeRatio = completeRatio;
+    }
+
+    /**
+     * 获取质量信息描述
+     *
+     * @return quality_info - 质量信息描述
+     */
+    public String getQualityInfo() {
+        return qualityInfo;
+    }
+
+    /**
+     * 设置质量信息描述
+     *
+     * @param qualityInfo 质量信息描述
+     */
+    public void setQualityInfo(String qualityInfo) {
+        this.qualityInfo = qualityInfo;
+    }
+
+    /**
+     * 获取完成匹数
+     *
+     * @return completed_num - 完成匹数
+     */
+    public Integer getCompletedNum() {
+        return completedNum;
+    }
+
+    /**
+     * 设置完成匹数
+     *
+     * @param completedNum 完成匹数
+     */
+    public void setCompletedNum(Integer completedNum) {
+        this.completedNum = completedNum;
+    }
+
+    /**
+     * 获取附件code，关联附件表：mt_alone_accessory
+     *
+     * @return product_annex_code - 附件code，关联附件表：mt_alone_accessory
+     */
+    public String getProductAnnexCode() {
+        return productAnnexCode;
+    }
+
+    /**
+     * 设置附件code，关联附件表：mt_alone_accessory
+     *
+     * @param productAnnexCode 附件code，关联附件表：mt_alone_accessory
+     */
+    public void setProductAnnexCode(String productAnnexCode) {
+        this.productAnnexCode = productAnnexCode;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return memo - 备注
+     */
+    public String getMemo() {
+        return memo;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param memo 备注
+     */
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessQualityInfoParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by hy on 2019/07/19.
+*/
+public class ProcessQualityInfoParams extends QueryParams {
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetect.java

@@ -0,0 +1,279 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_alone_product_batch_detect")
+public class ProductBatchDetect {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    @Column(name = "process_id")
+    private Integer processId;
+
+    /**
+     * 卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det
+     */
+    @Column(name = "batch_det_code")
+    private String batchDetCode;
+
+    /**
+     * 明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成
+     */
+    @Column(name = "product_det_barcode")
+    private String productDetBarcode;
+
+    /**
+     * 等级，1为一等品，2：二等品，3：等品。。。
+     */
+    private Integer grade;
+
+    /**
+     * 打卷机id，关联表：mt_alone_winding_machine
+     */
+    @Column(name = "winding_machine_id")
+    private Integer windingMachineId;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     *
+     * @return process_id - 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    /**
+     * 设置工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     *
+     * @param processId 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    /**
+     * 获取卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det
+     *
+     * @return batch_det_code - 卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det
+     */
+    public String getBatchDetCode() {
+        return batchDetCode;
+    }
+
+    /**
+     * 设置卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det
+     *
+     * @param batchDetCode 卷码code，作为扫描编码，关联表：mt_alone_product_process_batch_det
+     */
+    public void setBatchDetCode(String batchDetCode) {
+        this.batchDetCode = batchDetCode;
+    }
+
+    /**
+     * 获取明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成
+     *
+     * @return product_det_barcode - 明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成
+     */
+    public String getProductDetBarcode() {
+        return productDetBarcode;
+    }
+
+    /**
+     * 设置明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成
+     *
+     * @param productDetBarcode 明细编码，对应产品卷布编码，不同工序布卷不同编码，根据不同情况系统自行生成
+     */
+    public void setProductDetBarcode(String productDetBarcode) {
+        this.productDetBarcode = productDetBarcode;
+    }
+
+    /**
+     * 获取等级，1为一等品，2：二等品，3：等品。。。
+     *
+     * @return grade - 等级，1为一等品，2：二等品，3：等品。。。
+     */
+    public Integer getGrade() {
+        return grade;
+    }
+
+    /**
+     * 设置等级，1为一等品，2：二等品，3：等品。。。
+     *
+     * @param grade 等级，1为一等品，2：二等品，3：等品。。。
+     */
+    public void setGrade(Integer grade) {
+        this.grade = grade;
+    }
+
+    /**
+     * 获取打卷机id，关联表：mt_alone_winding_machine
+     *
+     * @return winding_machine_id - 打卷机id，关联表：mt_alone_winding_machine
+     */
+    public Integer getWindingMachineId() {
+        return windingMachineId;
+    }
+
+    /**
+     * 设置打卷机id，关联表：mt_alone_winding_machine
+     *
+     * @param windingMachineId 打卷机id，关联表：mt_alone_winding_machine
+     */
+    public void setWindingMachineId(Integer windingMachineId) {
+        this.windingMachineId = windingMachineId;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDet.java

@@ -0,0 +1,279 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "mt_alone_product_batch_detect_det")
+public class ProductBatchDetectDet {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /**
+     * 操作员id
+     */
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    /**
+     * 添加时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 版本号 默认为 1.1
+     */
+    private String version;
+
+    /**
+     * 状态		0使用，1禁用
+     */
+    private Integer status;
+
+    /**
+     * 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    @Column(name = "process_id")
+    private Integer processId;
+
+    /**
+     * 卷码code，作为扫描编码
+     */
+    @Column(name = "product_det_barcode")
+    private String productDetBarcode;
+
+    /**
+     * 检测位置
+     */
+    private Float position;
+
+    /**
+     * 检测瑕疵点id，关联表：mt_alone_fabric_defect
+     */
+    @Column(name = "defect_id")
+    private Integer defectId;
+
+    /**
+     * 瑕疵点名称
+     */
+    @Column(name = "defect_name")
+    private String defectName;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取操作员id
+     *
+     * @return operator_id - 操作员id
+     */
+    public Integer getOperatorId() {
+        return operatorId;
+    }
+
+    /**
+     * 设置操作员id
+     *
+     * @param operatorId 操作员id
+     */
+    public void setOperatorId(Integer operatorId) {
+        this.operatorId = operatorId;
+    }
+
+    /**
+     * 获取添加时间
+     *
+     * @return create_time - 添加时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置添加时间
+     *
+     * @param createTime 添加时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取修改时间
+     *
+     * @return update_time - 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置修改时间
+     *
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取版本号 默认为 1.1
+     *
+     * @return version - 版本号 默认为 1.1
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号 默认为 1.1
+     *
+     * @param version 版本号 默认为 1.1
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取状态		0使用，1禁用
+     *
+     * @return status - 状态		0使用，1禁用
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态		0使用，1禁用
+     *
+     * @param status 状态		0使用，1禁用
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     *
+     * @return process_id - 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    public Integer getProcessId() {
+        return processId;
+    }
+
+    /**
+     * 设置工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     *
+     * @param processId 工序id，关联工序表：mt_alone_process，每个工序都有可能检测
+     */
+    public void setProcessId(Integer processId) {
+        this.processId = processId;
+    }
+
+    /**
+     * 获取卷码code，作为扫描编码
+     *
+     * @return product_det_barcode - 卷码code，作为扫描编码
+     */
+    public String getProductDetBarcode() {
+        return productDetBarcode;
+    }
+
+    /**
+     * 设置卷码code，作为扫描编码
+     *
+     * @param productDetBarcode 卷码code，作为扫描编码
+     */
+    public void setProductDetBarcode(String productDetBarcode) {
+        this.productDetBarcode = productDetBarcode;
+    }
+
+    /**
+     * 获取检测位置
+     *
+     * @return position - 检测位置
+     */
+    public Float getPosition() {
+        return position;
+    }
+
+    /**
+     * 设置检测位置
+     *
+     * @param position 检测位置
+     */
+    public void setPosition(Float position) {
+        this.position = position;
+    }
+
+    /**
+     * 获取检测瑕疵点id，关联表：mt_alone_fabric_defect
+     *
+     * @return defect_id - 检测瑕疵点id，关联表：mt_alone_fabric_defect
+     */
+    public Integer getDefectId() {
+        return defectId;
+    }
+
+    /**
+     * 设置检测瑕疵点id，关联表：mt_alone_fabric_defect
+     *
+     * @param defectId 检测瑕疵点id，关联表：mt_alone_fabric_defect
+     */
+    public void setDefectId(Integer defectId) {
+        this.defectId = defectId;
+    }
+
+    /**
+     * 获取瑕疵点名称
+     *
+     * @return defect_name - 瑕疵点名称
+     */
+    public String getDefectName() {
+        return defectName;
+    }
+
+    /**
+     * 设置瑕疵点名称
+     *
+     * @param defectName 瑕疵点名称
+     */
+    public void setDefectName(String defectName) {
+        this.defectName = defectName;
+    }
+
+    /**
+     * @return company_id
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * @param companyId
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductBatchDetectDetParams.java

@@ -0,0 +1,9 @@
+package com.deer.wms.produce.manage.model;
+
+import com.deer.wms.project.seed.core.service.QueryParams;
+
+/**
+* Created by  on 2019/09/09.
+*/
+public class ProductBatchDetectDetParams extends QueryParams {
+}