From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJieyangEntity.java |  323 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 323 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJieyangEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJieyangEntity.java
new file mode 100644
index 0000000..6cd553f
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJieyangEntity.java
@@ -0,0 +1,323 @@
+package jnpf.limsEntity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎺ユ牱瀹炰綋绫�
+ */
+@Data
+@TableName("lims_jieyang")
+public class LimsJieyangEntity {
+
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    private String id;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    /** 璇烽獙鍗旾D */
+    @TableField("qingyandan_id")
+    private String qingyandanId;
+
+    /** 璇烽獙绫诲瀷 */
+    @TableField("biz_type")
+    private String bizType;
+
+    /** 浜у搧鍚嶇О */
+    @TableField("chanpin_mingcheng")
+    private String chanpinMingcheng;
+
+    /** 浜у搧缂栫爜 */
+    @TableField("chanpin_bianma")
+    private String chanpinBianma;
+
+    /** 鐢熶骇鍘傚晢锛堝師杈呭寘涓撶敤锛屼粠 lims_quyang 澶嶅埗鑰屾潵锛� */
+    @TableField("shengchan_changshang")
+    private String shengchanChangshang;
+
+    /** 璐у彿锛堝師杈呭寘涓撶敤锛屼粠 lims_quyang 澶嶅埗鑰屾潵锛� */
+    @TableField("huohao")
+    private String huohao;
+
+    /** 鍘熷巶鎵瑰彿锛堝師杈呭寘涓撶敤锛屼粠 lims_quyang 澶嶅埗鑰屾潵锛� */
+    @TableField("pihao_yuanchang")
+    private String pihaoYuanchang;
+
+    /** CAS鍙凤紙鍘熻緟鍖呬笓鐢紝浠� lims_quyang 澶嶅埗鑰屾潵锛� */
+    @TableField("cas_hao")
+    private String casHao;
+
+    /** 鎵瑰彿 */
+    @TableField("pihao")
+    private String pihao;
+
+    /** 瑙勬牸 */
+    @TableField("guige")
+    private String guige;
+
+    /** 鎵归噺 */
+    @TableField("piliang")
+    private String piliang;
+
+    /** 鐢熶骇鏃ユ湡 */
+    @TableField("shengchan_riqi")
+    private Date shengchanRiqi;
+
+    /** 鏈夋晥鏈熻嚦锛堝瓧绗︿覆锛屽父瑙佹牸寮� YYYY-MM 鎴� YYYY-MM-DD锛涘師杈呭寘鍏佽骞�-鏈堬級 */
+    @TableField("youxiaoqi")
+    private String youxiaoqi;
+
+    /** 鍙栨牱鍦扮偣 */
+    @TableField("quyang_didian")
+    private String quyangDidian;
+
+    /** 鍙栨牱浜� */
+    @TableField("quyangren")
+    private String quyangren;
+
+    /** 鍙栨牱鏃ユ湡 */
+    @TableField("quyang_riqi")
+    private Date quyangRiqi;
+
+    /** 鍙栨牱閲� */
+    @TableField("quyangliang")
+    private String quyangliang;
+
+    /** 鍙栨牱鍗曚綅 */
+    @TableField("quyang_danwei")
+    private String quyangDanwei;
+
+    /** 瀹為檯鍙栨牱閲� */
+    @TableField("quyang_liang_shiji")
+    private String quyangLiangShiji;
+
+    /** 妫�娴嬬暀鏍烽噺 */
+    @TableField("jiance_liuyang_liang")
+    private String jianceLiuyangLiang;
+
+    /** 瀹為檯妫�娴嬬暀鏍烽噺 */
+    @TableField("jiance_liuyang_liang_shiji")
+    private String jianceLiuyangLiangShiji;
+
+    /** 鍌ㄥ瓨鏉′欢 */
+    @TableField("chucun_tiaojian")
+    private String chucunTiaojian;
+
+    /** 妫�娴嬫柟寮� */
+    @TableField("jiance_fangshi")
+    private String jianceFangshi;
+
+    /** 妫�楠屾爣鍑� */
+    @TableField("jianyan_biaozhun")
+    private String jianyanBiaozhun;
+
+    /** 鏄惁鍚敤鍞竴璇嗗埆鐮� */
+    @TableField("weiyi_shibiema_enabled")
+    private String weiyiShibiemaEnabled;
+
+    /** 鍞竴璇嗗埆鐮� */
+    @TableField("weiyi_shibiema")
+    private String weiyiShibiema;
+
+    /** 妫�娴嬮」鐩� */
+    @TableField("jiance_xiangmu")
+    @JsonDeserialize(using = StringOrArrayDeserializer.class)
+    private String jianceXiangmu;
+
+    /** 璇烽獙澶囨敞 */
+    @TableField("beizhu")
+    private String beizhu;
+
+    /** 閫佹牱浜� */
+    @TableField("songyangren")
+    private String songyangren;
+
+    /** 閫佹牱鏃ユ湡 */
+    @TableField("songyang_riqi")
+    private Date songyangRiqi;
+
+    /** 鎺ユ敹浜� */
+    @TableField("jieshouren")
+    private String jieshouren;
+
+    /** 鎺ユ敹鏃ユ湡 */
+    @TableField("jieshou_riqi")
+    private Date jieshouRiqi;
+
+    /** 鎺ユ敹鏁伴噺锛堢函鏁板瓧瀛楃涓诧級 */
+    @TableField("jieshou_shuliang")
+    private String jieshouShuliang;
+
+    /** 鎺ユ敹鏁伴噺鍗曚綅 */
+    @TableField("jieshou_shuliang_danwei")
+    private String jieshouShuliangDanwei;
+
+    /** 浜у搧id */
+    @TableField("chanpin_id")
+    private String chanpinId;
+
+    /** 鐘舵�� */
+    @TableField("biz_status")
+    private String bizStatus;
+
+    /** 鐢靛瓙绛惧悕 */
+    @TableField("biz_sign")
+    private String bizSign;
+
+    /** 閫�鍥炲師鍥� */
+    @TableField("tuihui_yuanyin")
+    private String tuihuiYuanyin;
+
+    // ======================== 鏉ヨ嚜璐ㄩ噺鏍囧噯 / 鍙栨牱鍗曠殑妫�楠岄噺閰嶇疆 ========================
+
+    /** 鏄惁鏈夋椂鏁堟�ф娴嬭姹� yes/no */
+    @TableField("shifou_shixiaoxing_yaoqiu")
+    private String shifouShixiaoxingYaoqiu;
+
+    /** 鏃舵晥鎬ф娴嬪憳 */
+    @TableField("shixiaoxing_jianceyuan")
+    private String shixiaoxingJianceyuan;
+
+    /** 鎵归噺鍗曚綅 */
+    @TableField("piliang_danwei")
+    private String piliangDanwei;
+
+    /** 鐞嗗寲妫�楠岄噺 */
+    @TableField("lihua_jianyanliang")
+    private String lihuaJianyanliang;
+
+    /** 瀹為檯鐞嗗寲妫�楠岄噺 */
+    @TableField("lihua_jianyanliang_shiji")
+    private String lihuaJianyanliangShiji;
+
+    /** 鐞嗗寲鐝粍 */
+    @TableField("lihua_banzu")
+    private String lihuaBanzu;
+
+    /** 寰敓鐗╂楠岄噺 */
+    @TableField("weishengwu_jianyanliang")
+    private String weishengwuJianyanliang;
+
+    /** 瀹為檯寰敓鐗╂楠岄噺 */
+    @TableField("weishengwu_jianyanliang_shiji")
+    private String weishengwuJianyanliangShiji;
+
+    /** 寰敓鐗╃彮缁� */
+    @TableField("weishengwu_banzu")
+    private String weishengwuBanzu;
+
+    /** 妫�楠屽浠介噺 */
+    @TableField("jianyan_beifenliang")
+    private String jianyanBeifenliang;
+
+    /** 瀹為檯妫�楠屽浠介噺 */
+    @TableField("jianyan_beifenliang_shiji")
+    private String jianyanBeifenliangShiji;
+
+    /** 閫佹閲� */
+    @TableField("songjianliang")
+    private String songjianliang;
+
+    /** 瀹為檯閫佹閲� */
+    @TableField("songjianliang_shiji")
+    private String songjianliangShiji;
+
+    /** 鐣欐牱閲� */
+    @TableField("liuyang_liang")
+    private String liuyangLiang;
+
+    /** 瀹為檯鐣欐牱閲� */
+    @TableField("liuyang_liang_shiji")
+    private String liuyangLiangShiji;
+
+    /** 鐣欐牱鑰冨療鍗曚綅 */
+    @TableField("liuyang_kaocha_danwei")
+    private String liuyangKaochaDanwei;
+
+    // ======================== 绯荤粺瀛楁 ========================
+
+    /** 妫�楠屾祦姘村彿 */
+    @TableField("jianyan_liushuihao")
+    private String jianyanLiushuihao;
+
+    /** 娴佺▼id */
+    @TableField("f_flow_id")
+    private String flowId;
+
+    /** 涔愯閿� */
+    @TableField("f_version")
+    private Integer version;
+
+    /** 娴佺▼浠诲姟涓婚敭 */
+    @TableField("f_flow_task_id")
+    private String flowTaskId;
+
+    /** 娴佺▼浠诲姟鐘舵�� */
+    @TableField("f_flow_state")
+    private Integer flowState;
+
+    /** 鍒犻櫎鏍囧織 */
+    @TableField("f_delete_mark")
+    private Integer deleteMark;
+
+    /** 鍒犻櫎鏃堕棿 */
+    @TableField("f_delete_time")
+    private Date deleteTime;
+
+    /** 鍒犻櫎鐢ㄦ埛 */
+    @TableField("f_delete_user_id")
+    private String deleteUserId;
+
+    /** 鍒涘缓鐢ㄦ埛 */
+    @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT)
+    private String creatorUserId;
+
+    /** 鍒涘缓鏃堕棿 */
+    @TableField(value = "f_creator_time", fill = FieldFill.INSERT)
+    private Date creatorTime;
+
+    /** 淇敼鐢ㄦ埛 */
+    @TableField(value = "f_last_modify_user_id", fill = FieldFill.UPDATE)
+    private String lastModifyUserId;
+
+    /** 淇敼鏃堕棿 */
+    @TableField(value = "f_last_modify_time", fill = FieldFill.UPDATE)
+    private Date lastModifyTime;
+
+    // ============================================================
+    // 鐩村啓璺緞锛圥OST /lims/biz/jieyang/edit-direct锛変笓鐢ㄥ叆鍙傚瓧娈�
+    // ============================================================
+    // 浠ヤ笅 5 涓� fenjian_* 瀛楁涓嶅湪 lims_jieyang 琛ㄤ笂锛屼粎浣滀负鎺ユ牱鐩村啓鎺ュ彛
+    // 鐨勪紶杈撹浇浣擄紱鏈�缁堣澶嶅埗鍒扮敓鎴愮殑姣忔潯 lims_jianyan_xiang 琛屼笂銆�
+    // 鑰佹帴鍙� /jieyang/edit 涓嶈鍙栬繖浜涘瓧娈碉紝鍗充娇鍓嶇浼犱簡涔熸棤鍓綔鐢�
+    // 锛圱ableField exist=false锛寀pdate 鏃朵笉浼氳惤 jieyang 琛級銆�
+
+    /** 鍒嗘閲� 鈫� 鍐欏叆 lims_jianyan_xiang.fenjian_liang */
+    @TableField(exist = false)
+    private String fenjianLiang;
+
+    /** 鍒嗘鍗曚綅 鈫� 鍐欏叆 lims_jianyan_xiang.fenjian_danwei */
+    @TableField(exist = false)
+    private String fenjianDanwei;
+
+    /** 鍒嗚瀹瑰櫒 鈫� 鍐欏叆 lims_jianyan_xiang.fenjian_fenzhuang_rongqi */
+    @TableField(exist = false)
+    private String fenjianFenzhuangRongqi;
+
+    /** 鍒嗘淇濆瓨鏉′欢 鈫� 鍐欏叆 lims_jianyan_xiang.fenjian_baocun_tiaojian */
+    @TableField(exist = false)
+    private String fenjianBaocunTiaojian;
+
+    /** 鍒嗘鐜 鈫� 鍐欏叆 lims_jianyan_xiang.fenjian_huanjing */
+    @TableField(exist = false)
+    private String fenjianHuanjing;
+}

--
Gitblit v1.8.0