原材料

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/MMeterialMapper.java

@@ -0,0 +1,19 @@
+package com.github.zuihou.business.productionReadyCenter.dao;
+
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * Mapper 接口
+ * 托板
+ * </p>
+ *
+ * @author YaZhong Quan
+ * @date 2021/8/16 8:54
+ */
+@Repository
+public interface MMeterialMapper extends SuperMapper<MMeterial> {
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/MMeterialReceiveLogMapper.java

@@ -0,0 +1,19 @@
+package com.github.zuihou.business.productionReadyCenter.dao;
+
+import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * Mapper 接口
+ * 托板
+ * </p>
+ *
+ * @author YaZhong Quan
+ * @date 2021/8/16 8:54
+ */
+@Repository
+public interface MMeterialReceiveLogMapper extends SuperMapper<MMeterialReceiveLog> {
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/MMeterialReceiveLogService.java

@@ -0,0 +1,18 @@
+package com.github.zuihou.business.productionReadyCenter.service;
+
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
+
+/**
+ * <p>
+ * 业务接口
+ * bom工艺版本信息表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-14
+ */
+public interface MMeterialReceiveLogService extends SuperService<MMeterialReceiveLog> {
+
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/MMeterialService.java

@@ -0,0 +1,31 @@
+package com.github.zuihou.business.productionReadyCenter.service;
+
+import com.github.zuihou.base.service.SuperService;
+import com.github.zuihou.business.productionReadyCenter.dto.AutoNodeSaveDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.MMeterialSaveDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.MMeterialUpdateDTO;
+import com.github.zuihou.business.productionReadyCenter.entity.AutoNode;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
+
+/**
+ * <p>
+ * 业务接口
+ * bom工艺版本信息表
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-14
+ */
+public interface MMeterialService extends SuperService<MMeterial> {
+
+    MMeterial save(MMeterialSaveDTO data);
+
+
+    MMeterial update(MMeterialUpdateDTO data);
+
+
+    public Boolean delete(MMeterial model);
+
+
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BBomServiceImpl.java

@@ -118,29 +118,29 @@ public class BBomServiceImpl extends SuperServiceImpl<BBomMapper, BBom> implemen
                 sql+= joinSqlMap.get(f);
             }
 
-            sql+= " where a.parent_id=0 " ;
+            sql+= " where 1=1 " ;
             sql+=genCustSearchParam(map);
             sql+= " order by a.create_time desc limit "+current+","+size+" ";
             list = custMapper.selectSql(sql);
 
-            //所有的子级
-            sql = custService.getSelectFixSQL(BizConstant.DYNFORM_BIZ_TYPE_BOM)+fields+",(case when a.audit_status='0' then '新增' " +
-                    " when a.audit_status='1' then '待审核' when a.audit_status='2' then '审核通过' " +
-                    " when a.audit_status='3' then '审核不通过' end) audit_status from "+tableName+" a " ;
-            //循环拼下拉SQL
-            for(String f:joinSqlMap.keySet()){
-                sql+= joinSqlMap.get(f);
-            }
-            sql+= " where a.parent_id !=0  " ;
-            sql+=genCustSearchParam(map);
-            sql+=  " order by a.create_time desc ";
-            List<Map> childrenList = custMapper.selectSql(sql);
-
-            for(Map parentMap:list){
-                parentMap.put("children",findChildren(parentMap,childrenList));
-            }
+            //所有的子级取消子集
+//            sql = custService.getSelectFixSQL(BizConstant.DYNFORM_BIZ_TYPE_BOM)+fields+",(case when a.audit_status='0' then '新增' " +
+//                    " when a.audit_status='1' then '待审核' when a.audit_status='2' then '审核通过' " +
+//                    " when a.audit_status='3' then '审核不通过' end) audit_status from "+tableName+" a " ;
+//            //循环拼下拉SQL
+//            for(String f:joinSqlMap.keySet()){
+//                sql+= joinSqlMap.get(f);
+//            }
+//            sql+= " where a.parent_id !=0  " ;
+//            sql+=genCustSearchParam(map);
+//            sql+=  " order by a.create_time desc ";
+//            List<Map> childrenList = custMapper.selectSql(sql);
+//
+//            for(Map parentMap:list){
+//                parentMap.put("children",findChildren(parentMap,childrenList));
+//            }
 
-            sql = "select count(1) count from "+tableName+" a  where parent_id = 0 ";
+            sql = "select count(1) count from "+tableName+" a  where 1=1 ";
             sql+=genCustSearchParam(map);
             countlist = custMapper.selectSql(sql);
             count = Integer.parseInt(countlist.get(0).get("count").toString());

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MMeterialReceiveLogServiceImpl.java

@@ -0,0 +1,27 @@
+package com.github.zuihou.business.productionReadyCenter.service.impl;
+
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.productionReadyCenter.dao.MMeterialReceiveLogMapper;
+import com.github.zuihou.business.productionReadyCenter.dao.PlateMapper;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
+import com.github.zuihou.business.productionReadyCenter.entity.Plate;
+import com.github.zuihou.business.productionReadyCenter.service.MMeterialReceiveLogService;
+import com.github.zuihou.business.productionReadyCenter.service.PlateService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 业务实现类
+ * 托盘
+ * </p>
+ *
+ * @author Yazhong Quan
+ * @date 2020-12-12
+ */
+@Slf4j
+@Service
+public class MMeterialReceiveLogServiceImpl extends SuperServiceImpl<MMeterialReceiveLogMapper, MMeterialReceiveLog> implements MMeterialReceiveLogService {
+
+   
+}

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MMeterialServiceImpl.java

@@ -0,0 +1,58 @@
+package com.github.zuihou.business.productionReadyCenter.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.service.SuperServiceImpl;
+import com.github.zuihou.business.productionReadyCenter.dao.MMeterialMapper;
+import com.github.zuihou.business.productionReadyCenter.dao.PlateMapper;
+import com.github.zuihou.business.productionReadyCenter.dto.MMeterialSaveDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.MMeterialUpdateDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.PlateSaveDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.PlateUpdateDTO;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
+import com.github.zuihou.business.productionReadyCenter.entity.Plate;
+import com.github.zuihou.business.productionReadyCenter.service.MMeterialService;
+import com.github.zuihou.business.productionReadyCenter.service.PlateService;
+import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
+import com.github.zuihou.common.constant.CodeRuleModule;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.injection.annonation.InjectionResult;
+import com.github.zuihou.tenant.service.CodeRuleService;
+import com.github.zuihou.utils.BeanPlusUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ * 业务实现类
+ * 托盘
+ * </p>
+ *
+ * @author yaoyunqing
+ * @date 2020-12-12
+ */
+@Slf4j
+@Service
+public class MMeterialServiceImpl extends SuperServiceImpl<MMeterialMapper, MMeterial> implements MMeterialService {
+    @Override
+    public MMeterial save(MMeterialSaveDTO data) {
+        MMeterial module = BeanPlusUtil.toBean(data, MMeterial.class);
+        save(module);
+        return module;
+    }
+
+
+    @Override
+    public MMeterial update(MMeterialUpdateDTO data) {
+        MMeterial module = BeanPlusUtil.toBean(data, MMeterial.class);
+        updateById(module);
+        return module;
+    }
+
+    @Override
+    public Boolean delete(MMeterial model) {
+        return removeById(model);
+    }
+}

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MMeterialMapper.xml

@@ -0,0 +1,27 @@
+<?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.github.zuihou.business.productionReadyCenter.dao.MMeterialMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.productionReadyCenter.entity.MMeterial">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="create_user" jdbcType="BIGINT" property="createUser"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
+        <result column="meterial_code" jdbcType="VARCHAR" property="meterialCode"/>
+        <result column="equipment_name" jdbcType="VARCHAR" property="equipmentName"/>
+        <result column="trade_mark" jdbcType="VARCHAR" property="tradeMark"/>
+        <result column="specification" jdbcType="VARCHAR" property="specification"/>
+        <result column="handle_status" jdbcType="VARCHAR" property="handleStatus"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="num" jdbcType="INTEGER" property="num"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_time,create_user,update_time,update_user,
+        meterial_code, equipment_name, trade_mark, specification, handle_status, status, num
+    </sql>
+
+</mapper>

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MMeterialReceiveLogMapper.xml

@@ -0,0 +1,27 @@
+<?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.github.zuihou.business.productionReadyCenter.dao.MMeterialReceiveLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="create_user" jdbcType="BIGINT" property="createUser"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_user" jdbcType="BIGINT" property="updateUser"/>
+        <result column="meterial_id" jdbcType="BIGINT" property="meterialId"/>
+        <result column="furnace_batch_no" jdbcType="VARCHAR" property="furnaceBatchNo"/>
+        <result column="bom_batch_no" jdbcType="VARCHAR" property="bomBatchNo"/>
+        <result column="batch_stand" jdbcType="INTEGER" property="batchStand"/>
+        <result column="factory" jdbcType="VARCHAR" property="factory"/>
+        <result column="meterial_batch_no" jdbcType="VARCHAR" property="meterialBatchNo"/>
+        <result column="factory_date" jdbcType="DATE" property="factoryDate"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,create_time,create_user,update_time,update_user,
+        meterial_id, furnace_batch_no, bom_batch_no, batch_stand, factory, meterial_batch_no, factory_date
+    </sql>
+
+</mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/MMeterialController.java

@@ -0,0 +1,78 @@
+package com.github.zuihou.business.controller.productionReadyCenter;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.R;
+import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.productionReadyCenter.dto.*;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.Tray;
+import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
+import com.github.zuihou.business.productionReadyCenter.service.MMeterialService;
+import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
+import com.github.zuihou.business.productionReadyCenter.service.TrayService;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 前端控制器
+ * 原材料
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-12
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/meterial")
+@Api(value = "meterial", tags = "原材料")
+public class MMeterialController extends SuperController<MMeterialService, Long, MMeterial, MMeterialPageDTO, MMeterialSaveDTO, MMeterialUpdateDTO> {
+
+
+    @ApiOperation(value = "查询原材料", notes = "查询原材料")
+    @PostMapping("/all")
+    public R<List<MMeterial>> list() {
+        return success(baseService.list());
+    }
+
+    @Override
+    public R<MMeterial> handlerSave(MMeterialSaveDTO model) {
+        MMeterial meterial = baseService.save(model);
+        return success(meterial);
+    }
+
+    @ApiOperation(value = "删除原材料管理", notes = "删除原材料管理")
+    @PostMapping("/delete")
+    public R<Boolean> delete(@RequestBody MMeterial model) {
+        // 这个操作相当的危险，请谨慎操作！！!
+        return success(baseService.delete(model));
+    }
+
+    @ApiOperation(value = "修改原材料管理", notes = "修改原材料管理")
+    @PostMapping("/update")
+    public R<MMeterial> update(@RequestBody MMeterialUpdateDTO model) {
+        MMeterial MMeterial  = baseService.update(model);
+        return success(MMeterial);
+    }
+
+}

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/MMeterialReceiveLogController.java

@@ -0,0 +1,121 @@
+package com.github.zuihou.business.controller.productionReadyCenter;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.zuihou.base.R;
+import com.github.zuihou.base.controller.SuperController;
+import com.github.zuihou.base.request.PageParams;
+import com.github.zuihou.business.productionReadyCenter.dto.TrayPageDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.TraySaveDTO;
+import com.github.zuihou.business.productionReadyCenter.dto.TrayUpdateDTO;
+import com.github.zuihou.business.productionReadyCenter.entity.Tray;
+import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
+import com.github.zuihou.business.productionReadyCenter.service.TrayPositionService;
+import com.github.zuihou.business.productionReadyCenter.service.TrayService;
+import com.github.zuihou.database.mybatis.conditions.Wraps;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
+import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 前端控制器
+ * 托盘
+ * </p>
+ *
+ * @author imcs
+ * @date 2020-12-12
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/tray")
+@Api(value = "Tray", tags = "托盘")
+public class MMeterialReceiveLogController extends SuperController<TrayService, Long, Tray, TrayPageDTO, TraySaveDTO, TrayUpdateDTO> {
+    @Autowired
+    private TrayPositionService trayPositionService;
+
+    @Override
+    public void query(PageParams<TrayPageDTO> params, IPage<Tray> page, Long defSize) {
+        TrayPageDTO data = params.getModel();
+        QueryWrap<Tray> wrap = handlerWrapper(null, params);
+        LbqWrapper<Tray> wrapper = wrap.lambda();
+        Tray tray = BeanUtil.toBean(data, Tray.class);
+
+        wrapper.like(Tray::getName, tray.getName())
+                .like(Tray::getSpecification, tray.getSpecification())
+                .eq(Tray::getBrand,tray.getBrand());
+
+        IPage<Tray> list= baseService.pageList(page, wrapper);
+        //取出分页里面得数据
+        List<Tray> l = list.getRecords();
+        //取出IDList
+        List<Long> idList = l.stream().map(p -> p.getId()).collect(Collectors.toList());
+        //根据IDList取出明细
+        List<TrayPosition> detailList = trayPositionService.list(Wraps.<TrayPosition>lbQ().in(TrayPosition::getTrayId, idList));
+        Map<Long,List<TrayPosition>>map = new HashMap<Long,List<TrayPosition>>();
+        for(TrayPosition ms:detailList){
+            if(map.containsKey(ms.getTrayId())){
+                map.get(ms.getTrayId()).add(ms);
+            }else{
+                List a = new ArrayList<TrayPosition>();
+                a.add(ms);
+                map.put(ms.getTrayId(),a);
+            }
+        }
+        for(Tray m:l){
+            if(map.containsKey(m.getId())){
+                m.setPositionList(map.get(m.getId()));
+            }
+        }
+
+    }
+
+    @ApiOperation(value = "查询托盘", notes = "查询托盘")
+    @PostMapping("/all")
+    public R<List<Tray>> list() {
+        return success(baseService.list());
+    }
+
+    @Override
+    public R<Tray> handlerSave(TraySaveDTO model) {
+        Tray tray = baseService.save(model);
+        return success(tray);
+    }
+
+    @ApiOperation(value = "删除托盘管理", notes = "删除托盘管理")
+    @PostMapping("/delete")
+    public R<Boolean> delete(@RequestBody Tray model) {
+        // 这个操作相当的危险，请谨慎操作！！!
+        return success(baseService.delete(model));
+    }
+
+    @ApiOperation(value = "修改托盘管理", notes = "修改托盘管理")
+    @PostMapping("/update")
+    public R<Tray> update(@RequestBody TrayUpdateDTO model) {
+        Tray tray  = baseService.update(model);
+        return success(tray);
+    }
+
+    @ApiOperation(value = "修改状态", notes = "修改状态")
+    @PostMapping("/updateStatus")
+    public R<Tray> updateStatus(@RequestBody TrayUpdateDTO model) {
+        Tray tray  = baseService.updateStatus(model);
+        return success(tray);
+    }
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MMeterialPageDTO.java

@@ -0,0 +1,85 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-02-22
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "MMeterialPageDTO", description = "")
+public class MMeterialPageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    @Length(max = 64, message = "物料编码长度不能超过64")
+    private String meterialCode;
+    /**
+     * 器材名称
+     */
+    @ApiModelProperty(value = "器材名称")
+    @Length(max = 256, message = "器材名称长度不能超过256")
+    private String equipmentName;
+    /**
+     * 材料牌号
+     */
+    @ApiModelProperty(value = "材料牌号")
+    @Length(max = 64, message = "材料牌号长度不能超过64")
+    private String tradeMark;
+    /**
+     * 规格型号
+     */
+    @ApiModelProperty(value = "规格型号")
+    @Length(max = 128, message = "规格型号长度不能超过128")
+    private String specification;
+    /**
+     * 处理状态
+     */
+    @ApiModelProperty(value = "处理状态")
+    @Length(max = 128, message = "处理状态长度不能超过128")
+    private String handleStatus;
+    /**
+     * 状态（1-启用0-冻结）
+     */
+    @ApiModelProperty(value = "状态（1-启用0-冻结）")
+    @Length(max = 10, message = "状态（1-启用0-冻结）长度不能超过10")
+    private String status;
+    @ApiModelProperty(value = "")
+    private Integer num;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MMeterialReceiveLogPageDTO.java

@@ -0,0 +1,87 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-02-22
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "MMeterialReceiveLogPageDTO", description = "")
+public class MMeterialReceiveLogPageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 原材料ID
+     */
+    @ApiModelProperty(value = "原材料ID")
+    private Long meterialId;
+    /**
+     * 原料炉批号
+     */
+    @ApiModelProperty(value = "原料炉批号")
+    @Length(max = 64, message = "原料炉批号长度不能超过64")
+    private String furnaceBatchNo;
+    /**
+     * 零件批号
+     */
+    @ApiModelProperty(value = "零件批号")
+    @Length(max = 64, message = "零件批号长度不能超过64")
+    private String bomBatchNo;
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "批量标准")
+    private Integer batchStand;
+    /**
+     * 毛坯生产厂
+     */
+    @ApiModelProperty(value = "毛坯生产厂")
+    @Length(max = 128, message = "毛坯生产厂长度不能超过128")
+    private String factory;
+    /**
+     * 毛坯批号
+     */
+    @ApiModelProperty(value = "毛坯批号")
+    @Length(max = 64, message = "毛坯批号长度不能超过64")
+    private String meterialBatchNo;
+    /**
+     * 入厂日期
+     */
+    @ApiModelProperty(value = "入厂日期")
+    private LocalDate factoryDate;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MMeterialReceiveLogSaveDTO.java

@@ -0,0 +1,86 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-02-22
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "MMeterialReceiveLogSaveDTO", description = "")
+public class MMeterialReceiveLogSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 原材料ID
+     */
+    @ApiModelProperty(value = "原材料ID")
+    private Long meterialId;
+    /**
+     * 原料炉批号
+     */
+    @ApiModelProperty(value = "原料炉批号")
+    @Length(max = 64, message = "原料炉批号长度不能超过64")
+    private String furnaceBatchNo;
+    /**
+     * 零件批号
+     */
+    @ApiModelProperty(value = "零件批号")
+    @Length(max = 64, message = "零件批号长度不能超过64")
+    private String bomBatchNo;
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "批量标准")
+    private Integer batchStand;
+    /**
+     * 毛坯生产厂
+     */
+    @ApiModelProperty(value = "毛坯生产厂")
+    @Length(max = 128, message = "毛坯生产厂长度不能超过128")
+    private String factory;
+    /**
+     * 毛坯批号
+     */
+    @ApiModelProperty(value = "毛坯批号")
+    @Length(max = 64, message = "毛坯批号长度不能超过64")
+    private String meterialBatchNo;
+    /**
+     * 入厂日期
+     */
+    @ApiModelProperty(value = "入厂日期")
+    private LocalDate factoryDate;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MMeterialReceiveLogUpdateDTO.java

@@ -0,0 +1,90 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import com.github.zuihou.base.entity.SuperEntity;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-02-22
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "MMeterialReceiveLogUpdateDTO", description = "")
+public class MMeterialReceiveLogUpdateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "id不能为空", groups = SuperEntity.Update.class)
+    private Long id;
+
+    /**
+     * 原材料ID
+     */
+    @ApiModelProperty(value = "原材料ID")
+    private Long meterialId;
+    /**
+     * 原料炉批号
+     */
+    @ApiModelProperty(value = "原料炉批号")
+    @Length(max = 64, message = "原料炉批号长度不能超过64")
+    private String furnaceBatchNo;
+    /**
+     * 零件批号
+     */
+    @ApiModelProperty(value = "零件批号")
+    @Length(max = 64, message = "零件批号长度不能超过64")
+    private String bomBatchNo;
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "批量标准")
+    private Integer batchStand;
+    /**
+     * 毛坯生产厂
+     */
+    @ApiModelProperty(value = "毛坯生产厂")
+    @Length(max = 128, message = "毛坯生产厂长度不能超过128")
+    private String factory;
+    /**
+     * 毛坯批号
+     */
+    @ApiModelProperty(value = "毛坯批号")
+    @Length(max = 64, message = "毛坯批号长度不能超过64")
+    private String meterialBatchNo;
+    /**
+     * 入厂日期
+     */
+    @ApiModelProperty(value = "入厂日期")
+    private LocalDate factoryDate;
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MMeterialSaveDTO.java

@@ -0,0 +1,84 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-02-22
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "MMeterialSaveDTO", description = "")
+public class MMeterialSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    @Length(max = 64, message = "物料编码长度不能超过64")
+    private String meterialCode;
+    /**
+     * 器材名称
+     */
+    @ApiModelProperty(value = "器材名称")
+    @Length(max = 256, message = "器材名称长度不能超过256")
+    private String equipmentName;
+    /**
+     * 材料牌号
+     */
+    @ApiModelProperty(value = "材料牌号")
+    @Length(max = 64, message = "材料牌号长度不能超过64")
+    private String tradeMark;
+    /**
+     * 规格型号
+     */
+    @ApiModelProperty(value = "规格型号")
+    @Length(max = 128, message = "规格型号长度不能超过128")
+    private String specification;
+    /**
+     * 处理状态
+     */
+    @ApiModelProperty(value = "处理状态")
+    @Length(max = 128, message = "处理状态长度不能超过128")
+    private String handleStatus;
+    /**
+     * 状态（1-启用0-冻结）
+     */
+    @ApiModelProperty(value = "状态（1-启用0-冻结）")
+    @Length(max = 10, message = "状态（1-启用0-冻结）长度不能超过10")
+    private String status;
+    @ApiModelProperty(value = "")
+    private Integer num;
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/MMeterialUpdateDTO.java

@@ -0,0 +1,88 @@
+package com.github.zuihou.business.productionReadyCenter.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import com.github.zuihou.base.entity.SuperEntity;
+import lombok.Data;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-02-22
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@ApiModel(value = "MMeterialUpdateDTO", description = "")
+public class MMeterialUpdateDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @NotNull(message = "id不能为空", groups = SuperEntity.Update.class)
+    private Long id;
+
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    @Length(max = 64, message = "物料编码长度不能超过64")
+    private String meterialCode;
+    /**
+     * 器材名称
+     */
+    @ApiModelProperty(value = "器材名称")
+    @Length(max = 256, message = "器材名称长度不能超过256")
+    private String equipmentName;
+    /**
+     * 材料牌号
+     */
+    @ApiModelProperty(value = "材料牌号")
+    @Length(max = 64, message = "材料牌号长度不能超过64")
+    private String tradeMark;
+    /**
+     * 规格型号
+     */
+    @ApiModelProperty(value = "规格型号")
+    @Length(max = 128, message = "规格型号长度不能超过128")
+    private String specification;
+    /**
+     * 处理状态
+     */
+    @ApiModelProperty(value = "处理状态")
+    @Length(max = 128, message = "处理状态长度不能超过128")
+    private String handleStatus;
+    /**
+     * 状态（1-启用0-冻结）
+     */
+    @ApiModelProperty(value = "状态（1-启用0-冻结）")
+    @Length(max = 10, message = "状态（1-启用0-冻结）长度不能超过10")
+    private String status;
+    @ApiModelProperty(value = "")
+    private Integer num;
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MMeterial.java

@@ -0,0 +1,128 @@
+package com.github.zuihou.business.productionReadyCenter.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import static com.github.zuihou.utils.DateUtils.DEFAULT_DATE_TIME_FORMAT;
+
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-02-22
+ */
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("imcs_m_meterial")
+@ApiModel(value = "MMeterial", description = "")
+@AllArgsConstructor
+public class MMeterial extends Entity<Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    @Length(max = 64, message = "物料编码长度不能超过64")
+    @TableField(value = "meterial_code", condition = LIKE)
+    @Excel(name = "物料编码")
+    private String meterialCode;
+
+    /**
+     * 器材名称
+     */
+    @ApiModelProperty(value = "器材名称")
+    @Length(max = 256, message = "器材名称长度不能超过256")
+    @TableField(value = "equipment_name", condition = LIKE)
+    @Excel(name = "器材名称")
+    private String equipmentName;
+
+    /**
+     * 材料牌号
+     */
+    @ApiModelProperty(value = "材料牌号")
+    @Length(max = 64, message = "材料牌号长度不能超过64")
+    @TableField(value = "trade_mark", condition = LIKE)
+    @Excel(name = "材料牌号")
+    private String tradeMark;
+
+    /**
+     * 规格型号
+     */
+    @ApiModelProperty(value = "规格型号")
+    @Length(max = 128, message = "规格型号长度不能超过128")
+    @TableField(value = "specification", condition = LIKE)
+    @Excel(name = "规格型号")
+    private String specification;
+
+    /**
+     * 处理状态
+     */
+    @ApiModelProperty(value = "处理状态")
+    @Length(max = 128, message = "处理状态长度不能超过128")
+    @TableField(value = "handle_status", condition = LIKE)
+    @Excel(name = "处理状态")
+    private String handleStatus;
+
+    /**
+     * 状态（1-启用0-冻结）
+     */
+    @ApiModelProperty(value = "状态（1-启用0-冻结）")
+    @Length(max = 10, message = "状态（1-启用0-冻结）长度不能超过10")
+    @TableField(value = "status", condition = LIKE)
+    @Excel(name = "状态（1-启用0-冻结）")
+    private String status;
+
+    @ApiModelProperty(value = "")
+    @TableField("num")
+    @Excel(name = "")
+    private Integer num;
+
+
+    @Builder
+    public MMeterial(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
+                    String meterialCode, String equipmentName, String tradeMark, String specification, String handleStatus, 
+                    String status, Integer num) {
+        this.id = id;
+        this.createTime = createTime;
+        this.createUser = createUser;
+        this.updateTime = updateTime;
+        this.updateUser = updateUser;
+        this.meterialCode = meterialCode;
+        this.equipmentName = equipmentName;
+        this.tradeMark = tradeMark;
+        this.specification = specification;
+        this.handleStatus = handleStatus;
+        this.status = status;
+        this.num = num;
+    }
+
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MMeterialReceiveLog.java

@@ -0,0 +1,130 @@
+package com.github.zuihou.business.productionReadyCenter.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.zuihou.base.entity.Entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import com.github.zuihou.common.constant.DictionaryType;
+import static com.github.zuihou.utils.DateUtils.DEFAULT_DATE_TIME_FORMAT;
+
+import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
+
+/**
+ * <p>
+ * 实体类
+ * 
+ * </p>
+ *
+ * @author imcs_
+ * @since 2022-02-22
+ */
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("imcs_m_meterial_receive_log")
+@ApiModel(value = "MMeterialReceiveLog", description = "")
+@AllArgsConstructor
+public class MMeterialReceiveLog extends Entity<Long> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 原材料ID
+     */
+    @ApiModelProperty(value = "原材料ID")
+    @TableField("meterial_id")
+    @Excel(name = "原材料ID")
+    private Long meterialId;
+
+    /**
+     * 原料炉批号
+     */
+    @ApiModelProperty(value = "原料炉批号")
+    @Length(max = 64, message = "原料炉批号长度不能超过64")
+    @TableField(value = "furnace_batch_no", condition = LIKE)
+    @Excel(name = "原料炉批号")
+    private String furnaceBatchNo;
+
+    /**
+     * 零件批号
+     */
+    @ApiModelProperty(value = "零件批号")
+    @Length(max = 64, message = "零件批号长度不能超过64")
+    @TableField(value = "bom_batch_no", condition = LIKE)
+    @Excel(name = "零件批号")
+    private String bomBatchNo;
+
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "批量标准")
+    @TableField("batch_stand")
+    @Excel(name = "批量标准")
+    private Integer batchStand;
+
+    /**
+     * 毛坯生产厂
+     */
+    @ApiModelProperty(value = "毛坯生产厂")
+    @Length(max = 128, message = "毛坯生产厂长度不能超过128")
+    @TableField(value = "factory", condition = LIKE)
+    @Excel(name = "毛坯生产厂")
+    private String factory;
+
+    /**
+     * 毛坯批号
+     */
+    @ApiModelProperty(value = "毛坯批号")
+    @Length(max = 64, message = "毛坯批号长度不能超过64")
+    @TableField(value = "meterial_batch_no", condition = LIKE)
+    @Excel(name = "毛坯批号")
+    private String meterialBatchNo;
+
+    /**
+     * 入厂日期
+     */
+    @ApiModelProperty(value = "入厂日期")
+    @TableField("factory_date")
+    @Excel(name = "入厂日期", format = DEFAULT_DATE_TIME_FORMAT, width = 20)
+    private LocalDate factoryDate;
+
+
+    @Builder
+    public MMeterialReceiveLog(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
+                    Long meterialId, String furnaceBatchNo, String bomBatchNo, Integer batchStand, String factory, 
+                    String meterialBatchNo, LocalDate factoryDate) {
+        this.id = id;
+        this.createTime = createTime;
+        this.createUser = createUser;
+        this.updateTime = updateTime;
+        this.updateUser = updateUser;
+        this.meterialId = meterialId;
+        this.furnaceBatchNo = furnaceBatchNo;
+        this.bomBatchNo = bomBatchNo;
+        this.batchStand = batchStand;
+        this.factory = factory;
+        this.meterialBatchNo = meterialBatchNo;
+        this.factoryDate = factoryDate;
+    }
+
+}