zy-asrs.git - Gitblit

parent: 0d4ef718 | 补丁 | 提交 | ignore whitespace

lsh

2024-12-25 d33a10970ca14424fa8b594027f8434adaffc5b6

6个文件已修改

	src/main/java/com/zy/asrs/entity/LocDetl.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/entity/OrderDetl.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/entity/OrderDetlPakin.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/entity/OrderDetlPakout.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/entity/WaitPakin.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/entity/WaitPakinLog.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -4,8 +4,11 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.LocOwnerService;
import com.zy.common.utils.Synchro;
@@ -334,4 +337,22 @@
        }
    }

    public String getBoxType1$(){
        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(processProcedures)){
            return String.valueOf(processProcedures.getBoxSpecs());
        }
        return this.boxType1;
    }

    public String getBoxType2$(){
        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(basQualityTesting)){
            return String.valueOf(basQualityTesting.getBoxSpecs());
        }
        return this.boxType1;
    }

}

 src/main/java/com/zy/asrs/entity/OrderDetl.java

@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -607,6 +609,23 @@
        }
    }

    public String getBoxType1$(){
        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(processProcedures)){
            return String.valueOf(processProcedures.getBoxSpecs());
        }
        return this.boxType1;
    }

    public String getBoxType2$(){
        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(basQualityTesting)){
            return String.valueOf(basQualityTesting.getBoxSpecs());
        }
        return this.boxType1;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);

 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java

@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -525,6 +528,24 @@
        return "未完成";
    }

    public String getBoxType1$(){
        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(processProcedures)){
            return String.valueOf(processProcedures.getBoxSpecs());
        }
        return this.boxType1;
    }

    public String getBoxType2$(){
        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(basQualityTesting)){
            return String.valueOf(basQualityTesting.getBoxSpecs());
        }
        return this.boxType1;
    }

    public boolean beSimilar(OrderDetlPakin orderDetlPakin){
        return (
                this.orderNo.equals(orderDetlPakin.getOrderNo())

 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java

@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -526,6 +529,24 @@
        return "未完成";
    }

    public String getBoxType1$(){
        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(processProcedures)){
            return String.valueOf(processProcedures.getBoxSpecs());
        }
        return this.boxType1;
    }

    public String getBoxType2$(){
        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(basQualityTesting)){
            return String.valueOf(basQualityTesting.getBoxSpecs());
        }
        return this.boxType1;
    }

    public boolean beSimilar(OrderDetlPakout orderDetlPakout){
        return (
                this.orderNo.equals(orderDetlPakout.getOrderNo())

 src/main/java/com/zy/asrs/entity/WaitPakin.java

@@ -2,7 +2,11 @@

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -255,6 +259,24 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getBoxType1$(){
        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(processProcedures)){
            return String.valueOf(processProcedures.getBoxSpecs());
        }
        return this.boxType1;
    }

    public String getBoxType2$(){
        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(basQualityTesting)){
            return String.valueOf(basQualityTesting.getBoxSpecs());
        }
        return this.boxType1;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -2,7 +2,11 @@

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -254,4 +258,22 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getBoxType1$(){
        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(processProcedures)){
            return String.valueOf(processProcedures.getBoxSpecs());
        }
        return this.boxType1;
    }

    public String getBoxType2$(){
        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(basQualityTesting)){
            return String.valueOf(basQualityTesting.getBoxSpecs());
        }
        return this.boxType1;
    }

}

			@@ -4,8 +4,11 @@
			import com.alibaba.excel.annotation.ExcelProperty;
			import com.baomidou.mybatisplus.annotations.TableField;
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.core.common.Cools;
			import com.core.common.SpringUtils;
			import com.zy.asrs.service.BasProcessProceduresService;
			import com.zy.asrs.service.BasQualityTestingService;
			import com.zy.asrs.service.LocMastService;
			import com.zy.asrs.service.LocOwnerService;
			import com.zy.common.utils.Synchro;
			@@ -334,4 +337,22 @@
			}
			}

			public String getBoxType1$(){
			BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
			BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
			if (!Cools.isEmpty(processProcedures)){
			return String.valueOf(processProcedures.getBoxSpecs());
			}
			return this.boxType1;
			}

			public String getBoxType2$(){
			BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
			BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
			if (!Cools.isEmpty(basQualityTesting)){
			return String.valueOf(basQualityTesting.getBoxSpecs());
			}
			return this.boxType1;
			}

			}

			@@ -4,10 +4,12 @@
			import com.baomidou.mybatisplus.annotations.TableId;
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.enums.IdType;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.core.common.Cools;
			import com.core.common.SpringUtils;
			import com.zy.asrs.service.BasProcessProceduresService;
			import com.zy.asrs.service.BasQualityTestingService;
			import com.zy.asrs.service.OrderService;
			import com.zy.common.model.DetlDto;
			import com.zy.common.utils.Synchro;
			import com.zy.system.entity.User;
			import com.zy.system.service.UserService;
			@@ -607,6 +609,23 @@
			}
			}

			public String getBoxType1$(){
			BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
			BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
			if (!Cools.isEmpty(processProcedures)){
			return String.valueOf(processProcedures.getBoxSpecs());
			}
			return this.boxType1;
			}

			public String getBoxType2$(){
			BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
			BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
			if (!Cools.isEmpty(basQualityTesting)){
			return String.valueOf(basQualityTesting.getBoxSpecs());
			}
			return this.boxType1;
			}

			public void sync(Object source) {
			Synchro.Copy(source, this);

			@@ -2,7 +2,11 @@

			import com.baomidou.mybatisplus.annotations.TableField;
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.core.common.Cools;
			import com.core.common.SpringUtils;
			import com.zy.asrs.service.BasProcessProceduresService;
			import com.zy.asrs.service.BasQualityTestingService;
			import com.zy.common.utils.Synchro;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -255,6 +259,24 @@
			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
			}

			public String getBoxType1$(){
			BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
			BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
			if (!Cools.isEmpty(processProcedures)){
			return String.valueOf(processProcedures.getBoxSpecs());
			}
			return this.boxType1;
			}

			public String getBoxType2$(){
			BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
			BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
			if (!Cools.isEmpty(basQualityTesting)){
			return String.valueOf(basQualityTesting.getBoxSpecs());
			}
			return this.boxType1;
			}

			public void sync(Object source) {
			Synchro.Copy(source, this);
			}