#

18516761980

2022-08-13 68009c0f0cd4c1d896f8369da6bf3d3524f0513e

#

 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 = "输送设备数据修改")

 src/main/java/com/zy/asrs/domain/vo/LocDetailVo.java

New file
@@ -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;
}

 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);
//    }

}

 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} + '%'