#
Junjie
2025-07-30 862f5e1e3830b47f18c07636cdb3b9605110c98b
#
4个文件已修改
5个文件已添加
108 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/KcztMap.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/WrkDetl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/KcztMapMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/KcztMapService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/KcztMapServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/model/MatDto.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/KcztMapMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WrkDetlMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/KcztMap.java
New file
@@ -0,0 +1,42 @@
package com.zy.asrs.entity;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
@Data
@TableName("erp_kczt_map")
public class KcztMap implements Serializable {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty(value= "")
    @TableId(value = "cstateid", type = IdType.INPUT)
    private String cstateid;
    @ApiModelProperty(value= "")
    private String vcode;
    @ApiModelProperty(value= "")
    private String vname;
    public KcztMap() {}
    public KcztMap(String cstateid,String vcode,String vname) {
        this.cstateid = cstateid;
        this.vcode = vcode;
        this.vname = vname;
    }
//    KcztMap kcztMap = new KcztMap(
//            null,    // [非空]
//            null,    //
//            null    //
//    );
}
src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -2,8 +2,10 @@
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.KcztMapService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -330,6 +332,9 @@
    @TableField("stock_num2")
    private Double stockNum2;
    @TableField("cstateid")
    private Integer cstateid;
    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";
@@ -419,6 +424,15 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }
    public String getCstateid$() {
        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
        if (!Cools.isEmpty(kcztMap)){
            return String.valueOf(kcztMap.getVname());
        }
        return String.valueOf(this.cstateid);
    }
    public void sync(Object source) {
        Synchro.Copy(source, this);
    }
src/main/java/com/zy/asrs/mapper/KcztMapMapper.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.mapper;
import com.zy.asrs.entity.KcztMap;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface KcztMapMapper extends BaseMapper<KcztMap> {
}
src/main/java/com/zy/asrs/service/KcztMapService.java
New file
@@ -0,0 +1,8 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.KcztMap;
import com.baomidou.mybatisplus.service.IService;
public interface KcztMapService extends IService<KcztMap> {
}
src/main/java/com/zy/asrs/service/impl/KcztMapServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.service.impl;
import com.zy.asrs.mapper.KcztMapMapper;
import com.zy.asrs.entity.KcztMap;
import com.zy.asrs.service.KcztMapService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("kcztMapService")
public class KcztMapServiceImpl extends ServiceImpl<KcztMapMapper, KcztMap> implements KcztMapService {
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2076,6 +2076,7 @@
                            , wrkDetl.getSupp()
                            , wrkDetl.getKpCstmrName()
                            , wrkDetl.getOrderNo()
                            , wrkDetl.getCstateid$()
                    )));
                }
                commands.add(ledCommand);
src/main/java/com/zy/common/model/MatDto.java
@@ -49,10 +49,12 @@
    //单号
    private String orderNo;
    private String cstateid;
    public MatDto() {
    }
    public MatDto(String matNo, String maktx, Double count, Double weight, Double total, Double totalWeight, String specs, String sku, String barcode, String model, String supp, String kpCstmrName, String orderNo) {
    public MatDto(String matNo, String maktx, Double count, Double weight, Double total, Double totalWeight, String specs, String sku, String barcode, String model, String supp, String kpCstmrName, String orderNo, String cstateid) {
        this.matnr = matNo;
        this.maktx = maktx;
        this.maknx = maktx;
@@ -67,5 +69,6 @@
        this.supp = supp;
        this.kpCstmrName = kpCstmrName;
        this.orderNo = orderNo;
        this.cstateid = cstateid;
    }
}
src/main/resources/mapper/KcztMapMapper.xml
New file
@@ -0,0 +1,13 @@
<?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.zy.asrs.mapper.KcztMapMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.KcztMap">
        <result column="cstateid" property="cstateid" />
        <result column="vcode" property="vcode" />
        <result column="vname" property="vname" />
    </resultMap>
</mapper>
src/main/resources/mapper/WrkDetlMapper.xml
@@ -54,6 +54,7 @@
        <result column="stock_num" property="stockNum" />
        <result column="kp_cstmr_name" property="kpCstmrName" />
        <result column="stock_num2" property="stockNum2" />
        <result column="cstateid" property="cstateid" />
    </resultMap>
    <select id="findByWorkNo" resultMap="BaseResultMap">