From 862f5e1e3830b47f18c07636cdb3b9605110c98b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 30 七月 2025 14:42:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/KcztMapServiceImpl.java | 12 ++++++
src/main/java/com/zy/common/model/MatDto.java | 5 ++
src/main/java/com/zy/asrs/entity/KcztMap.java | 42 +++++++++++++++++++++
src/main/resources/mapper/WrkDetlMapper.xml | 1
src/main/java/com/zy/asrs/mapper/KcztMapMapper.java | 12 ++++++
src/main/java/com/zy/asrs/service/KcztMapService.java | 8 ++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1
src/main/java/com/zy/asrs/entity/WrkDetl.java | 14 +++++++
src/main/resources/mapper/KcztMapMapper.xml | 13 ++++++
9 files changed, 107 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/KcztMap.java b/src/main/java/com/zy/asrs/entity/KcztMap.java
new file mode 100644
index 0000000..e506dc5
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/KcztMap.java
@@ -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 //
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 671c8c3..89a059a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/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);
}
diff --git a/src/main/java/com/zy/asrs/mapper/KcztMapMapper.java b/src/main/java/com/zy/asrs/mapper/KcztMapMapper.java
new file mode 100644
index 0000000..31cfd78
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/KcztMapMapper.java
@@ -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> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/KcztMapService.java b/src/main/java/com/zy/asrs/service/KcztMapService.java
new file mode 100644
index 0000000..3ee4edf
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/KcztMapService.java
@@ -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> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/KcztMapServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/KcztMapServiceImpl.java
new file mode 100644
index 0000000..71565b0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/KcztMapServiceImpl.java
@@ -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 {
+
+}
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 686be44..1aa1668 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/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);
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 2c8cf7c..02eb13c 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/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;
}
}
diff --git a/src/main/resources/mapper/KcztMapMapper.xml b/src/main/resources/mapper/KcztMapMapper.xml
new file mode 100644
index 0000000..5c6f802
--- /dev/null
+++ b/src/main/resources/mapper/KcztMapMapper.xml
@@ -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>
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 5920ba9..60f34f2 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/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">
--
Gitblit v1.9.1