From ea12b685190254228d88a0de261b1e399fcbf15b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 25 十二月 2025 15:11:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shzhjxydwcs_cs20251105' into shzhjxydwcs_cs20251105

---
 src/main/java/com/zy/asrs/entity/param/BasCrnpWmsParam.java |   91 ++++++++++++++++-----------------------------
 1 files changed, 33 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/BasCrnpWmsParam.java b/src/main/java/com/zy/asrs/entity/param/BasCrnpWmsParam.java
index a130d5d..4ddd087 100644
--- a/src/main/java/com/zy/asrs/entity/param/BasCrnpWmsParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/BasCrnpWmsParam.java
@@ -60,66 +60,41 @@
      */
     private String toLocno;
 
-    /**
-     * 鍒涘缓鑰�
-     */
-    private Long appeUser;
-
-    /**
-     * 鍒涘缓鏃堕棿
-     */
-    private Date appeTime;
-
-    /**
-     * 淇敼浜哄憳
-     */
-    private Long modiUser;
-
-    /**
-     * 淇敼鏃堕棿
-     */
-    private Date modiTime;
-
-    private String hpMk;
-
-    private String retrieveMk;
-
-    private String ctlHp;
-
-    private String ctlRest;
-
-    private String empIn;
-
-    private Integer tankQty;
-
-    private Integer tankQty1;
+//    /**
+//     * 鍒涘缓鑰�
+//     */
+//    private Long appeUser;
+//
+//    /**
+//     * 鍒涘缓鏃堕棿
+//     */
+//    private Date appeTime;
+//
+//    /**
+//     * 淇敼浜哄憳
+//     */
+//    private Long modiUser;
+//
+//    /**
+//     * 淇敼鏃堕棿
+//     */
+//    private Date modiTime;
+//
+//    private String hpMk;
+//
+//    private String retrieveMk;
+//
+//    private String ctlHp;
+//
+//    private String ctlRest;
+//
+//    private String empIn;
+//
+//    private Integer tankQty;
+//
+//    private Integer tankQty1;
 
     public BasCrnpWmsParam() {}
-
-    public BasCrnpWmsParam(Integer crnNo, Integer crnNoH, String inEnable, String outEnable, Integer crnSts, Integer wrkNo, Long crnErr, String frmLocno, Integer frmSta, Integer toSta, String toLocno, Long appeUser, Date appeTime, Long modiUser, Date modiTime, String hpMk, String retrieveMk, String ctlHp, String ctlRest, String empIn, Integer tankQty, Integer tankQty1) {
-        this.crnNo = crnNo;
-        this.crnNoH = crnNoH;
-        this.inEnable = inEnable;
-        this.outEnable = outEnable;
-        this.crnSts = crnSts;
-        this.wrkNo = wrkNo;
-        this.crnErr = crnErr;
-        this.frmLocno = frmLocno;
-        this.frmSta = frmSta;
-        this.toSta = toSta;
-        this.toLocno = toLocno;
-        this.appeUser = appeUser;
-        this.appeTime = appeTime;
-        this.modiUser = modiUser;
-        this.modiTime = modiTime;
-        this.hpMk = hpMk;
-        this.retrieveMk = retrieveMk;
-        this.ctlHp = ctlHp;
-        this.ctlRest = ctlRest;
-        this.empIn = empIn;
-        this.tankQty = tankQty;
-        this.tankQty1 = tankQty1;
-    }
 
     public void sync(Object source) {
         Synchro.Copy(source, this);

--
Gitblit v1.9.1