From 68009c0f0cd4c1d896f8369da6bf3d3524f0513e Mon Sep 17 00:00:00 2001 From: 18516761980 <56479841@qq.com> Date: 星期六, 13 八月 2022 14:38:35 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/ConsoleController.java | 33 ++++ src/main/java/com/zy/asrs/entity/LocDetl.java | 237 +++++++++++++++++++++++++++------------ src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java | 30 +++++ src/main/resources/mapper/LocDetlMapper.xml | 53 ++++++-- 4 files changed, 261 insertions(+), 92 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java index 45e755f..ddcd109 100644 --- a/src/main/java/com/zy/asrs/controller/ConsoleController.java +++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java @@ -13,13 +13,11 @@ import com.zy.asrs.domain.enums.SiteStatusType; import com.zy.asrs.domain.param.SystemSwitchParam; import com.zy.asrs.domain.vo.*; -import com.zy.asrs.entity.BasCrnError; -import com.zy.asrs.entity.BasDevp; -import com.zy.asrs.entity.LocMast; -import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.entity.*; import com.zy.asrs.mapper.BasCrnErrorMapper; import com.zy.asrs.mapper.LocMastMapper; import com.zy.asrs.service.BasDevpService; +import com.zy.asrs.service.LocDetlService; import com.zy.asrs.service.LocMastService; import com.zy.asrs.service.WrkMastService; import com.zy.common.CodeRes; @@ -64,6 +62,10 @@ private LocMastMapper locMastMapper; @Autowired private BasCrnErrorMapper basCrnErrorMapper; + @Autowired + private LocMastService locMastService; + @Autowired + private LocDetlService locDetlService; @PostMapping("/system/running/status") @ManagerAuth(memo = "绯荤粺杩愯鐘舵��") @@ -297,6 +299,29 @@ return R.error(); } + @PostMapping("/loc/detail") + @ManagerAuth(memo = "搴撲綅鏁版嵁璇︽儏") + public R locDetail(@RequestParam String locNo) { + if (Cools.isEmpty(locNo)) { + return R.parse(CodeRes.EMPTY); + } + LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",locNo)); + if(null == locMast || !locMast.getLocSts().equals("F")){ + return R.error("搴撲綅涓虹┖鎴栭潪鍦ㄥ簱鐘舵��"); + } + LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locNo)); + if (null != locDetl){ + LocDetailVo vo = new LocDetailVo(); + vo.setLocNo(locDetl.getLocNo()); + vo.setLocSts(locMast.getLocSts()); + vo.setMatnr(locDetl.getMatnr()); + vo.setZpallet(locDetl.getZpallet()); + vo.setPackStatus(PackStatusType.process(locMast.getLocSts(),locMast.getPackStatus(),locMast.getFireStatus())); + return R.ok().add(vo); + } + return R.error(); + } + @Deprecated @PostMapping("/site/update") @ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�") diff --git a/src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java b/src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java new file mode 100644 index 0000000..53c3518 --- /dev/null +++ b/src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java @@ -0,0 +1,30 @@ +package com.zy.asrs.domain.vo; + +import com.zy.asrs.domain.enums.PackStatusType; +import lombok.Data; + +/** + * 搴撲綅璇︽儏瑙嗗浘瀵硅薄 + * Created by vincent on 2020-06-03 + */ +@Data +public class LocDetailVo { + // 搴撲綅鍙� + private String locNo; + + // 搴撲綅鐘舵�� + private String locSts; + + // PACK鐘舵�� + private PackStatusType packStatus; + + /* + 浜у搧鍨嬪彿 + */ + private String matnr; + + /* + PACK鐮� + */ + private String zpallet; +} diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index 9899b48..dccf175 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -1,14 +1,13 @@ package com.zy.asrs.entity; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.core.common.Cools; +import com.core.common.SpringUtils; import com.zy.asrs.service.LocMastService; import com.zy.system.entity.User; import com.zy.system.service.UserService; -import com.core.common.Cools; -import com.core.common.SpringUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,57 +21,119 @@ private static final long serialVersionUID = 1L; - @ApiModelProperty(value= "搴撲綅鍙�") - @TableId(value = "loc_no", type = IdType.INPUT) @TableField("loc_no") private String locNo; - - @ApiModelProperty(value= "浜у搧缂栫爜") - @TableId(value = "mat_no", type = IdType.INPUT) - @TableField("mat_no") - private String matNo; - - @ApiModelProperty(value= "浜у搧鍚嶇О") - @TableId(value = "mat_name") - @TableField("mat_name") - private String matName; - - @ApiModelProperty(value= "瑙勬牸") - private String specs; - - @ApiModelProperty(value= "灏哄") - private String size; - - @ApiModelProperty(value= "棰滆壊") - private String color; - - @ApiModelProperty(value= "鍗曢噸") - private Double weight; - - @ApiModelProperty(value= "渚涘簲鍟�") - private String supplier; - - @ApiModelProperty(value= "浠撳簱") - private String warehouse; - - @ApiModelProperty(value= "鍝佺墝") - private String brand; - - @ApiModelProperty(value= "鏁伴噺") - private Double qty; - - @ApiModelProperty(value= "鍗曚綅") - private String unit; @ApiModelProperty(value= "鎵樼洏鏉$爜") private String zpallet; - @ApiModelProperty(value= "鐢ㄦ埛ID") - private String bname; + @ApiModelProperty(value= "鏁伴噺") + @ExcelProperty("鏁伴噺") + private Double anfme; - @ApiModelProperty(value= "澶囨敞") - private String memo; + @ApiModelProperty(value= "鍟嗗搧缂栧彿") + @ExcelProperty("鍟嗗搧缂栧彿") + private String matnr; + + @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + @ExcelProperty("鍟嗗搧鍚嶇О") + private String maktx; + + @ApiModelProperty(value= "鎵瑰彿") + @ExcelProperty("鎵瑰彿") + private String batch; + + @ApiModelProperty(value= "鍗曟嵁缂栧彿") + @ExcelProperty("鍗曟嵁缂栧彿") + @TableField("order_no") + private String orderNo; + + @ApiModelProperty(value= "瑙勬牸") + private String specs; + + @ApiModelProperty(value= "鍨嬪彿") + private String model; + + @ApiModelProperty(value= "棰滆壊") + private String color; + + @ApiModelProperty(value= "鍝佺墝") + private String brand; + + @ApiModelProperty(value= "鍗曚綅") + private String unit; + + @ApiModelProperty(value= "鍗曚环") + private Double price; + + @ApiModelProperty(value= "sku") + private String sku; + + @ApiModelProperty(value= "鍗曚綅閲�") + private Double units; + + @ApiModelProperty(value= "鏉$爜") + private String barcode; + + @ApiModelProperty(value= "浜у湴") + private String origin; + + @ApiModelProperty(value= "鍘傚") + private String manu; + + @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @TableField("manu_date") + private String manuDate; + + @ApiModelProperty(value= "鍝侀」鏁�") + @TableField("item_num") + private String itemNum; + + @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�") + @TableField("safe_qty") + private Double safeQty; + + @ApiModelProperty(value= "閲嶉噺") + private Double weight; + + @ApiModelProperty(value= "闀垮害") + private Double length; + + @ApiModelProperty(value= "浣撶Н") + private Double volume; + + @ApiModelProperty(value= "涓夋柟缂栫爜") + @TableField("three_code") + private String threeCode; + + @ApiModelProperty(value= "渚涘簲鍟�") + private String supp; + + @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�") + @TableField("supp_code") + private String suppCode; + + @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ") + @TableField("be_batch") + private Integer beBatch; + + @ApiModelProperty(value= "淇濊川鏈�") + @TableField("dead_time") + private String deadTime; + + @ApiModelProperty(value= "棰勮澶╂暟") + @TableField("dead_warn") + private Integer deadWarn; + + @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ") + private Integer source; + + @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") + private Integer inspect; + + @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") + private Integer danger; @ApiModelProperty(value= "淇敼浜哄憳") @TableField("modi_user") @@ -90,30 +151,8 @@ @TableField("appe_time") private Date appeTime; - @TableField("bill_no") - private String billNo; - - @TableField("seq_no") - private int seqNo; - - @TableField("bill_type") - private int billType; - - @TableField("object_id") - private String objectId; - - @TableField("object_name") - private String objectName; - - @TableField("det_id") - private int detId; - - @TableId(value = "Item_batch", type = IdType.INPUT) - @TableField("Item_batch") - private String itemBatch; - - @TableField("order_no") - private String orderNo; + @ApiModelProperty(value= "澶囨敞") + private String memo; public String getLocNo$(){ LocMastService service = SpringUtils.getBean(LocMastService.class); @@ -122,6 +161,56 @@ return String.valueOf(locMast.getLocNo()); } return null; + } + + public String getBeBatch$(){ + if (null == this.beBatch){ return null; } + switch (this.beBatch){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.beBatch); + } + } + + public String getSource$(){ + if (null == this.source){ return null; } + switch (this.source){ + case 1: + return "鍒堕��"; + case 2: + return "閲囪喘"; + case 3: + return "澶栧崗"; + default: + return String.valueOf(this.source); + } + } + + public String getInspect$(){ + if (null == this.inspect){ return null; } + switch (this.inspect){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.inspect); + } + } + + public String getDanger$(){ + if (null == this.danger){ return null; } + switch (this.danger){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.danger); + } } public String getModiUser$(){ @@ -140,7 +229,6 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime); } - public String getAppeUser$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.appeUser); @@ -156,4 +244,9 @@ } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } + +// public void sync(Object source) { +// Synchro.Copy(source, this); +// } + } diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index d66d35c..f8b1ae0 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -5,35 +5,56 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl"> <result column="loc_no" property="locNo" /> - <result column="mat_no" property="matNo" /> - <result column="mat_name" property="matName" /> - <result column="specs" property="specs" /> - <result column="size" property="size" /> - <result column="color" property="color" /> - <result column="weight" property="weight" /> - <result column="supplier" property="supplier" /> - <result column="warehouse" property="warehouse" /> - <result column="brand" property="brand" /> - <result column="qty" property="qty" /> - <result column="unit" property="unit" /> <result column="zpallet" property="zpallet" /> - <result column="bname" property="bname" /> - <result column="memo" property="memo" /> + <result column="anfme" property="anfme" /> + <result column="matnr" property="matnr" /> + <result column="maktx" property="maktx" /> + <result column="batch" property="batch" /> + <result column="order_no" property="orderNo" /> + + <result column="specs" property="specs" /> + <result column="model" property="model" /> + <result column="color" property="color" /> + <result column="brand" property="brand" /> + <result column="unit" property="unit" /> + <result column="price" property="price" /> + <result column="sku" property="sku" /> + <result column="units" property="units" /> + <result column="barcode" property="barcode" /> + <result column="origin" property="origin" /> + <result column="manu" property="manu" /> + <result column="manu_date" property="manuDate" /> + <result column="item_num" property="itemNum" /> + <result column="safe_qty" property="safeQty" /> + <result column="weight" property="weight" /> + <result column="length" property="length" /> + <result column="volume" property="volume" /> + <result column="three_code" property="threeCode" /> + <result column="supp" property="supp" /> + <result column="supp_code" property="suppCode" /> + <result column="be_batch" property="beBatch" /> + <result column="dead_time" property="deadTime" /> + <result column="dead_warn" property="deadWarn" /> + <result column="source" property="source" /> + <result column="inspect" property="inspect" /> + <result column="danger" property="danger" /> + <result column="modi_user" property="modiUser" /> <result column="modi_time" property="modiTime" /> <result column="appe_user" property="appeUser" /> <result column="appe_time" property="appeTime" /> + <result column="memo" property="memo" /> </resultMap> <sql id="stockOutCondition"> <if test="loc_no!=null and loc_no!='' "> and a.loc_no like '%' + #{loc_no} + '%' </if> - <if test="matNo!=null and matNo!='' "> - and a.mat_no like '%' + #{matNo} + '%' + <if test="matnr!=null and matnr!='' "> + and a.matnr like '%' + #{matNo} + '%' </if> <if test="matName!=null and matName!='' "> - and a.mat_name like '%' + #{matName} + '%' + and a.maktx like '%' + #{matName} + '%' </if> <if test="anfme!=null and anfme!='' "> and a.anfme like '%' + #{anfme} + '%' -- Gitblit v1.9.1