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/LimsQingyandanEntity.java |  408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 408 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsQingyandanEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsQingyandanEntity.java
new file mode 100644
index 0000000..44bc1e5
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsQingyandanEntity.java
@@ -0,0 +1,408 @@
+package jnpf.limsEntity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎴愬搧璇烽獙鍗曞疄浣撶被銆�
+ *
+ * <p>涓夋祦绋嬪悎骞跺悗杩欏紶琛ㄦ槸璇烽獙/鍙栨牱/鎺ユ牱鐨勫崟涓�杞戒綋锛氳楠屽崟鎻愪氦鍚庯紝鍙栨牱銆佹帴鏍锋暟鎹�
+ * 鍦ㄥ悓涓�琛屼笂鎸� {@code biz_status} / {@code quyang_status} / {@code jieyang_status} 娴佽浆锛�
+ * 涓嶅啀澶嶅埗鍒扮嫭绔嬬殑 lims_quyang / lims_jieyang 琛ㄣ��
+ */
+@Data
+@TableName("lims_qingyandan")
+public class LimsQingyandanEntity {
+
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    @JsonAlias("id")
+    private String id;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    /** 璇烽獙绫诲瀷 */
+    @TableField("biz_type")
+    private String bizType;
+
+    /** 浜у搧鍚嶇О */
+    @TableField("chanpin_mingcheng")
+    private String chanpinMingcheng;
+
+    /** 浜у搧缂栫爜 */
+    @TableField("chanpin_bianma")
+    private String chanpinBianma;
+
+    /** 鐢熶骇鍘傚晢锛堝師杈呭寘涓撶敤锛� */
+    @TableField("shengchan_changshang")
+    private String shengchanChangshang;
+
+    /** 璐у彿锛堝師杈呭寘涓撶敤锛� */
+    @TableField("huohao")
+    private String huohao;
+
+    /** 鍘熷巶鎵瑰彿锛堝師杈呭寘涓撶敤锛� */
+    @TableField("pihao_yuanchang")
+    private String pihaoYuanchang;
+
+    /** CAS鍙凤紙鍘熻緟鍖呬笓鐢級 */
+    @TableField("cas_hao")
+    private String casHao;
+
+    /** 鍘熻緟鍖呯墿鏂欑被鍨� */
+    @TableField("wuliao_leixing")
+    private String wuliaoLeixing;
+
+    /** 鍘熻緟鍖呮楠岀被鍨� */
+    @TableField("jianyan_leixing")
+    private String jianyanLeixing;
+
+    /** 鏉ユ簮缂栫爜锛堟姤鍛婃墦鍗扮敤锛� */
+    @TableField("laiyuan_bianma")
+    private String laiyuanBianma;
+
+    /** 鎵瑰彿 */
+    @TableField("pihao")
+    private String pihao;
+
+    /** 瑙勬牸 */
+    @TableField("guige")
+    private String guige;
+
+    /** 鍖呰瑙勬牸 */
+    @TableField("baozhuang_guige")
+    private String baozhuangGuige;
+
+    /** 鎵归噺 */
+    @TableField("piliang")
+    private String piliang;
+
+    /** 鎵归噺鍗曚綅 */
+    @TableField("piliang_danwei")
+    private String piliangDanwei;
+
+    /** 鐢熶骇鏃ユ湡 */
+    @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;
+
+    /** 妫�楠岄噺锛堣楠屽崟鍒涘缓鏃朵粠璐ㄩ噺鏍囧噯 jiance_liang 澶嶅埗锛� */
+    @TableField("jianyan_liang")
+    private String jianyanLiang;
+
+    /** 瀹為檯妫�楠岄噺锛堝彇鏍� / 鎺ユ牱闃舵褰曞叆锛� */
+    @TableField("jianyan_liang_shiji")
+    private String jianyanLiangShiji;
+
+    /** 鍙栨牱鍗曚綅锛堣楠屽崟鍒涘缓鏃朵粠璐ㄩ噺鏍囧噯 quyang_danwei 澶嶅埗锛� */
+    @TableField("quyang_danwei")
+    private String quyangDanwei;
+
+    /** 妫�娴嬬暀鏍烽噺锛堣楠屽崟鍒涘缓鏃朵粠璐ㄩ噺鏍囧噯 jiance_liuyang_liang 澶嶅埗锛� */
+    @TableField("jiance_liuyang_liang")
+    private String jianceLiuyangLiang;
+
+    /** 瀹為檯妫�娴嬬暀鏍烽噺锛堝彇鏍� / 鎺ユ牱闃舵褰曞叆锛� */
+    @TableField("jiance_liuyang_liang_shiji")
+    private String jianceLiuyangLiangShiji;
+
+    /** 鐣欐牱閲忥紙璇烽獙鍗曞垱寤烘椂浠庤川閲忔爣鍑� liuyang_liang 澶嶅埗锛� */
+    @TableField("liuyang_liang")
+    private String liuyangLiang;
+
+    /** 瀹為檯鐣欐牱閲忥紙鍙栨牱 / 鎺ユ牱闃舵褰曞叆锛� */
+    @TableField("liuyang_liang_shiji")
+    private String liuyangLiangShiji;
+
+    /** 鐣欐牱鍗曚綅锛堣楠屽崟鍒涘缓鏃朵粠璐ㄩ噺鏍囧噯 liuyang_kaocha_danwei 澶嶅埗锛� */
+    @TableField("liuyang_danwei")
+    private String liuyangDanwei;
+
+    /** 瀛樻斁浣嶇疆锛堟帴鏍烽樁娈靛綍鍏ワ級 */
+    @TableField("cunfang_weizhi")
+    private String cunfangWeizhi;
+
+    /** 鎺ユ敹鏁伴噺锛堟帴鏍烽樁娈靛綍鍏ワ級 */
+    @TableField("jieshou_shuliang")
+    private String jieshouShuliang;
+
+    /** 鎺ユ敹鏁伴噺鍗曚綅锛堟帴鏍烽樁娈靛綍鍏ワ級 */
+    @TableField("jieshou_shuliang_danwei")
+    private String jieshouShuliangDanwei;
+
+    /** 搴撳瓨鏁伴噺 */
+    @TableField("kucun_shuliang")
+    private String kucunShuliang;
+
+    /** 鏄惁鏈夋椂鏁堟�ф娴嬭姹傦紙璇烽獙鍗曞垱寤烘椂浠庤川閲忔爣鍑� shifou_shixiaoxing_yaoqiu 澶嶅埗锛� */
+    @TableField("shifou_shixiaoxing_yaoqiu")
+    private String shifouShixiaoxingYaoqiu;
+
+    /** 鏃舵晥鎬ф娴嬪憳锛堟帴鏍烽樁娈靛綍鍏ワ級 */
+    @TableField("shixiaoxing_jianceyuan")
+    private String shixiaoxingJianceyuan;
+
+    /** 鍌ㄥ瓨鏉′欢 */
+    @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("qingyan_ren")
+    private String qingyanRen;
+
+    /** 璇烽獙鏃ユ湡 */
+    @TableField("qingyan_riqi")
+    private Date qingyanRiqi;
+
+    /** 璇烽獙澶囨敞 */
+    @TableField("qingyan_beizhu")
+    private String qingyanBeizhu;
+
+    /** 鍙栨牱澶囨敞 */
+    @TableField("quyang_beizhu")
+    private String quyangBeizhu;
+
+    /** 鎺ユ牱澶囨敞 */
+    @TableField("jieyang_beizhu")
+    private String jieyangBeizhu;
+
+    /** 鎺ユ敹浜� */
+    @TableField("jieshouren")
+    private String jieshouren;
+
+    /** 鎺ユ敹鏃ユ湡 */
+    @TableField("jieshou_riqi")
+    private Date jieshouRiqi;
+
+    /** 娴佺▼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;
+
+    /** 浜у搧id */
+    @TableField("chanpin_id")
+    private String chanpinId;
+
+    /** 璇烽獙鍗曠姸鎬�(created|confirmed|cancelled|deleted) */
+    @TableField("biz_status")
+    private String bizStatus;
+
+    /** 鍙栨牱鐘舵�侊紙鍙栨牱閫�鍥炴椂娓呯┖涓虹┖涓诧紝updateStrategy=ALWAYS 淇濊瘉绌轰覆鑳藉啓鍏ワ級 */
+    @TableField(value = "quyang_status", updateStrategy = FieldStrategy.ALWAYS)
+    private String quyangStatus;
+
+    /** 鎺ユ牱鐘舵�侊紙鎺ユ牱閫�鍥炴椂娓呯┖涓虹┖涓诧紝updateStrategy=ALWAYS 淇濊瘉绌轰覆鑳藉啓鍏ワ級 */
+    @TableField(value = "jieyang_status", updateStrategy = FieldStrategy.ALWAYS)
+    private String jieyangStatus;
+
+    // ===== 鎶ュ憡闃舵瀛楁锛堢敱 lims_qingyandan_report 鍚堝苟鑰屾潵锛屾姤鍛婇樁娈靛綍鍏�/娴佽浆锛� =====
+
+    /** 鎶ュ憡涔︾紪鍙凤紝瑙勫垯 {chanpin_bianma}-{yyyyDDD}A{NN}锛堟姤鍛婄敓鎴愭椂鍐欏叆锛� */
+    @TableField("baogao_bianhao")
+    private String baogaoBianhao;
+
+    /** 鎶ュ憡澶囨敞 */
+    @TableField("baogao_beizhu")
+    private String baogaoBeizhu;
+
+    /** 鎶ュ憡鐘舵�侊紙BaogaoStatus锛泂ubmit 鍒涘缓鏃跺垵濮嬩负绌轰覆锛� */
+    @TableField("baogao_zhuangtai")
+    private String baogaoZhuangtai;
+
+    /** 鎶ュ憡鏄惁鍚堟牸锛堝墠绔瓧鍏哥爜锛� */
+    @TableField("baogao_shifou_hege")
+    private String baogaoShifouHege;
+
+    /** 鎶ュ憡浜猴紙鎻愪氦鎶ュ憡鏃跺啓鍏� userId锛� */
+    @TableField("baogao_ren")
+    private String baogaoRen;
+
+    /** 鎶ュ憡鏃ユ湡锛堟彁浜ゆ姤鍛婃椂鍐欏叆锛� */
+    @TableField("baogao_riqi")
+    private Date baogaoRiqi;
+
+    /** 鎶ュ憡瀹℃牳浜猴紙瀹℃牳鎶ュ憡鏃跺啓鍏� userId锛� */
+    @TableField("baogao_shenhe_ren")
+    private String baogaoShenheRen;
+
+    /** 鎶ュ憡瀹℃牳鏃ユ湡锛堝鏍告姤鍛婃椂鍐欏叆锛� */
+    @TableField("baogao_shenhe_riqi")
+    private Date baogaoShenheRiqi;
+
+    /** 鎶ュ憡鎵瑰噯浜猴紙鎵瑰噯鎶ュ憡鏃跺啓鍏� userId锛� */
+    @TableField("baogao_pizhun_ren")
+    private String baogaoPizhunRen;
+
+    /** 鎶ュ憡鎵瑰噯鏃ユ湡锛堟壒鍑嗘姤鍛婃椂鍐欏叆锛� */
+    @TableField("baogao_pizhun_riqi")
+    private Date baogaoPizhunRiqi;
+
+    /** 鎶ュ憡閫�鍥炲師鍥狅紙鎶ュ憡閫�鍥炴椂鍐欏叆锛涢噸鏂扮敓鎴愭椂娓呯┖锛� */
+    @TableField(value = "baogao_tuihui_yuanyin", updateStrategy = FieldStrategy.ALWAYS)
+    private String baogaoTuihuiYuanyin;
+
+    /** 鎶ュ憡閫�鍥炰汉锛堟姤鍛婇��鍥炴椂鍐欏叆 userId锛涢噸鏂扮敓鎴愭椂娓呯┖锛� */
+    @TableField(value = "baogao_tuihui_ren", updateStrategy = FieldStrategy.ALWAYS)
+    private String baogaoTuihuiRen;
+
+    /** 鎶ュ憡閫�鍥炴棩鏈燂紙鎶ュ憡閫�鍥炴椂鍐欏叆锛涢噸鏂扮敓鎴愭椂娓呯┖锛� */
+    @TableField(value = "baogao_tuihui_riqi", updateStrategy = FieldStrategy.ALWAYS)
+    private Date baogaoTuihuiRiqi;
+
+    /** 鐣欐牱璁板綍 ID */
+    @TableField(value = "liuyang_jilu_id", updateStrategy = FieldStrategy.ALWAYS)
+    private String liuyangJiluId;
+
+    /** 绋冲畾鎬ц�冨療璁″垝 ID */
+    @TableField("wendingxing_jilu_id")
+    private String wendingxingJiluId;
+
+    /** 璇烽獙鍒嗙被锛堢ǔ瀹氭�ц楠屽浐瀹氫负 wendingxing锛� */
+    @TableField("qingyan_fenlei")
+    private String qingyanFenlei;
+
+    /** 绋冲畾鎬ц�冨療鍛ㄦ湡 */
+    @TableField("zhouqi")
+    private String zhouqi;
+
+    /** 绋冲畾鎬ц�冨療鍛ㄦ湡鍗曚綅 */
+    @TableField("zhouqi_danwei")
+    private String zhouqiDanwei;
+
+    /** 鍒犻櫎鏍囧織 */
+    @TableField("f_delete_mark")
+    private Integer deleteMark;
+
+    /** 鍒犻櫎鏃堕棿 */
+    @TableField("f_delete_time")
+    private Date deleteTime;
+
+    /** 鍒犻櫎鐢ㄦ埛 */
+    @TableField("f_delete_user_id")
+    private String deleteUserId;
+
+    /** 妫�楠屾祦姘村彿 */
+    @TableField("jianyan_liushuihao")
+    private String jianyanLiushuihao;
+
+    /** 鑷姩鐢熸垚鏈楠屽崟鐨勬按绯荤粺鍙栨牱璁″垝浠诲姟涓婚敭 */
+    @TableField("laiyuan_renwu_id")
+    private String laiyuanRenwuId;
+
+    /** 鐢熸垚璇烽獙鍗曟椂閲囩敤鐨勪换鍔¤仛鍚堝揩鐓HA-256鍝堝笇 */
+    @TableField("renwu_kuaizhao_haxi")
+    private String renwuKuaizhaoHaxi;
+
+    /** 鐢靛瓙绛惧悕 */
+    @TableField("biz_sign")
+    private String bizSign;
+
+    /** 鍙栨牱閫�鍥炲師鍥� */
+    @TableField("quyang_tuihui_yuanyin")
+    private String quyangTuihuiYuanyin;
+
+    /** 鍙栨牱閫�鍥炰汉 */
+    @TableField("quyang_tuihui_ren")
+    private String quyangTuihuiRen;
+
+    /** 鍙栨牱閫�鍥炴棩鏈� */
+    @TableField("quyang_tuihui_riqi")
+    private Date quyangTuihuiRiqi;
+
+    /** 鎺ユ牱閫�鍥炲師鍥� */
+    @TableField("jieyang_tuihui_yuanyin")
+    private String jieyangTuihuiYuanyin;
+
+    /** 鎺ユ牱閫�鍥炰汉 */
+    @TableField("jieyang_tuihui_ren")
+    private String jieyangTuihuiRen;
+
+    /** 鎺ユ牱閫�鍥炴棩鏈� */
+    @TableField("jieyang_tuihui_riqi")
+    private Date jieyangTuihuiRiqi;
+
+    /** 鍒涘缓鐢ㄦ埛 */
+    @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;
+
+    /** 绋冲畾鎬у懆鏈� ID */
+    @TableField("wendingxing_zhouqi_id")
+    private String wendingxingZhouqiId;
+
+    /** 绋冲畾鎬х紪鍙� */
+    @TableField("wendingxing_bianhao")
+    private String wendingxingBianhao;
+
+    /** 闀挎湡鏀剧疆鏉′欢 */
+    @TableField("changqi_fangzhi_tiaojian")
+    private String changqiFangzhiTiaojian;
+}

--
Gitblit v1.8.0