From cf72f14140e41ac9532e8e1d4956131f1e07de38 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期六, 12 三月 2022 13:38:04 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 ++------------ src/main/java/com/zy/asrs/entity/WrkMast.java | 19 +++++++++++++++++++ src/main/resources/mapper/WrkMastMapper.xml | 1 + 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java index 3438b83..6f5652b 100644 --- a/src/main/java/com/zy/asrs/entity/WrkMast.java +++ b/src/main/java/com/zy/asrs/entity/WrkMast.java @@ -74,6 +74,13 @@ @TableField("ste_no") private Integer steNo; + /** + * 杈圭紭搴撲綅 + */ + @ApiModelProperty(value= "杈圭紭搴撲綅") + @TableField("out_most") + private Integer outMost; + @ApiModelProperty(value= "") @TableField("sheet_no") private String sheetNo; @@ -491,4 +498,16 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime); } + public String getOutMost$() { + if (null == this.outMost){ return null; } + switch (this.outMost){ + case 1: + return "杈圭紭搴撲綅"; + case 0: + return "鍐呰仈搴撲綅"; + default: + return String.valueOf(this.outMost); + } + } + } diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 73eb1f1..4f4aedc 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -8,7 +8,6 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.mapper.BasCrnErrorMapper; -import com.zy.asrs.mapper.WaitPakinMapper; import com.zy.asrs.mapper.WrkMastMapper; import com.zy.asrs.service.*; import com.zy.asrs.utils.Utils; @@ -16,7 +15,6 @@ import com.zy.common.model.MatDto; import com.zy.common.model.SearchLocParam; import com.zy.common.model.StartupDto; -import com.zy.common.service.CommonService; import com.zy.common.utils.CollectionUtils; import com.zy.common.utils.HttpHandler; import com.zy.core.CrnThread; @@ -58,18 +56,14 @@ @Transactional public class MainServiceImpl { - public static final long COMMAND_TIMEOUT = 5 * 1000; - - @Autowired - private CommonService commonService; + @Value("${wms.url}") + private String wmsUrl; @Autowired private SlaveProperties slaveProperties; @Autowired private WrkMastMapper wrkMastMapper; @Autowired private WrkDetlService wrkDetlService; - @Autowired - private WaitPakinMapper waitPakinMapper; @Autowired private LocMastService locMastService; @Autowired @@ -79,15 +73,11 @@ @Autowired private BasDevpService basDevpService; @Autowired - private LocDetlService locDetlService; - @Autowired private BasErrLogService basErrLogService; @Autowired private BasCrnErrorMapper basCrnErrorMapper; @Autowired private BasSteService basSteService; - @Value("${wms.url}") - private String wmsUrl; /** * 缁勬墭 diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml index af628ec..ad9ca2e 100644 --- a/src/main/resources/mapper/WrkMastMapper.xml +++ b/src/main/resources/mapper/WrkMastMapper.xml @@ -13,6 +13,7 @@ <result column="io_type" property="ioType" /> <result column="crn_no" property="crnNo" /> <result column="ste_no" property="steNo" /> + <result column="out_most" property="outMost" /> <result column="sheet_no" property="sheetNo" /> <result column="io_pri" property="ioPri" /> <result column="wrk_date" property="wrkDate" /> -- Gitblit v1.9.1