before release

DNLight/dnwms.cs

@@ -1797,7 +1797,7 @@ namespace elelab
             int dot_station = Convert.ToByte(comment[6] & 0x0f);
             int begin_address = (Convert.ToByte(comment[6] & 0xF0) >> 4) & 0x07;
             int dot = dot_station - begin_address;
-            int num = Convert.ToInt32(dis_dat.receive_count);
+            int num =  Convert.ToInt16(dis_dat.receive_count);
             int dot_before, dot_after;
             if (dot == 1)
             {

DeinuPageControl/Pager.cs

@@ -198,7 +198,7 @@ namespace DeiNiu.Controls.pager
                 
                 }
                 */
-                for (int i = 1000; i <= 5000; i += 1000)
+                for (int i = 1000; i <= 9000; i += 1000)
                 {
                     comPagesize.Items.Add(i.ToString());
                 }

DeinuPageControl/Pager.designer.cs

@@ -59,6 +59,7 @@
             this.bindingNavigator1.CountItemFormat = "";
             this.bindingNavigator1.DeleteItem = null;
             this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.bindingNavigator1.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.bindingNavigator1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripLabel2,
             this.btnFirst,
@@ -77,23 +78,24 @@
             this.lblMaxPage,
             this.comPagesize});
             this.bindingNavigator1.Location = new System.Drawing.Point(0, 1);
-            this.bindingNavigator1.Margin = new System.Windows.Forms.Padding(0, 0, 33, 0);
+            this.bindingNavigator1.Margin = new System.Windows.Forms.Padding(0, 0, 50, 0);
             this.bindingNavigator1.MoveFirstItem = null;
             this.bindingNavigator1.MoveLastItem = null;
             this.bindingNavigator1.MoveNextItem = null;
             this.bindingNavigator1.MovePreviousItem = null;
             this.bindingNavigator1.Name = "bindingNavigator1";
+            this.bindingNavigator1.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.bindingNavigator1.PositionItem = null;
             this.bindingNavigator1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
             this.bindingNavigator1.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.bindingNavigator1.Size = new System.Drawing.Size(816, 25);
+            this.bindingNavigator1.Size = new System.Drawing.Size(1224, 38);
             this.bindingNavigator1.TabIndex = 3;
             this.bindingNavigator1.Text = "bindingNavigator1";
             // 
             // toolStripLabel2
             // 
             this.toolStripLabel2.Name = "toolStripLabel2";
-            this.toolStripLabel2.Size = new System.Drawing.Size(20, 22);
+            this.toolStripLabel2.Size = new System.Drawing.Size(25, 33);
             this.toolStripLabel2.Text = "   ";
             // 
             // btnFirst
@@ -102,7 +104,7 @@
             this.btnFirst.Image = ((System.Drawing.Image)(resources.GetObject("btnFirst.Image")));
             this.btnFirst.Name = "btnFirst";
             this.btnFirst.RightToLeftAutoMirrorImage = true;
-            this.btnFirst.Size = new System.Drawing.Size(23, 22);
+            this.btnFirst.Size = new System.Drawing.Size(34, 33);
             this.btnFirst.Text = "首页";
             this.btnFirst.Click += new System.EventHandler(this.btnFirst_Click);
             // 
@@ -112,14 +114,14 @@
             this.btnPrev.Image = ((System.Drawing.Image)(resources.GetObject("btnPrev.Image")));
             this.btnPrev.Name = "btnPrev";
             this.btnPrev.RightToLeftAutoMirrorImage = true;
-            this.btnPrev.Size = new System.Drawing.Size(23, 22);
+            this.btnPrev.Size = new System.Drawing.Size(34, 33);
             this.btnPrev.Text = "上一页";
             this.btnPrev.Click += new System.EventHandler(this.btnPrev_Click);
             // 
             // bindingNavigatorSeparator
             // 
             this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
-            this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
+            this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 38);
             // 
             // lblcurentpage
             // 
@@ -128,14 +130,14 @@
             this.lblcurentpage.Font = new System.Drawing.Font("宋体", 9F);
             this.lblcurentpage.Margin = new System.Windows.Forms.Padding(1, 1, 1, 0);
             this.lblcurentpage.Name = "lblcurentpage";
-            this.lblcurentpage.Size = new System.Drawing.Size(60, 21);
+            this.lblcurentpage.Size = new System.Drawing.Size(88, 28);
             this.lblcurentpage.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.lblcurentpage.ToolTipText = "Location";
             // 
             // bindingNavigatorSeparator1
             // 
             this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
-            this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
+            this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 38);
             // 
             // btnNext
             // 
@@ -143,7 +145,7 @@
             this.btnNext.Image = ((System.Drawing.Image)(resources.GetObject("btnNext.Image")));
             this.btnNext.Name = "btnNext";
             this.btnNext.RightToLeftAutoMirrorImage = true;
-            this.btnNext.Size = new System.Drawing.Size(23, 22);
+            this.btnNext.Size = new System.Drawing.Size(34, 33);
             this.btnNext.Text = "下一页";
             this.btnNext.Click += new System.EventHandler(this.btnNext_Click);
             // 
@@ -153,14 +155,14 @@
             this.btnLast.Image = ((System.Drawing.Image)(resources.GetObject("btnLast.Image")));
             this.btnLast.Name = "btnLast";
             this.btnLast.RightToLeftAutoMirrorImage = true;
-            this.btnLast.Size = new System.Drawing.Size(23, 22);
+            this.btnLast.Size = new System.Drawing.Size(34, 33);
             this.btnLast.Text = "末页";
             this.btnLast.Click += new System.EventHandler(this.btnLast_Click);
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 38);
             // 
             // lblRecordCount
             // 
@@ -174,7 +176,7 @@
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 38);
             // 
             // toolStripLabel1
             // 
@@ -190,17 +192,17 @@
             this.cmbPagecount.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbPagecount.Font = new System.Drawing.Font("宋体", 9F);
             this.cmbPagecount.Name = "cmbPagecount";
-            this.cmbPagecount.Size = new System.Drawing.Size(40, 20);
+            this.cmbPagecount.Size = new System.Drawing.Size(58, 26);
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 38);
             // 
             // lblMaxPage
             // 
             this.lblMaxPage.Name = "lblMaxPage";
-            this.lblMaxPage.Size = new System.Drawing.Size(0, 22);
+            this.lblMaxPage.Size = new System.Drawing.Size(0, 33);
             // 
             // comPagesize
             // 
@@ -208,16 +210,17 @@
             this.comPagesize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comPagesize.Font = new System.Drawing.Font("宋体", 9F);
             this.comPagesize.Name = "comPagesize";
-            this.comPagesize.Size = new System.Drawing.Size(60, 20);
+            this.comPagesize.Size = new System.Drawing.Size(88, 26);
             this.comPagesize.ToolTipText = "页大小";
             // 
             // Pager
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.bindingNavigator1);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Pager";
-            this.Size = new System.Drawing.Size(816, 26);
+            this.Size = new System.Drawing.Size(1224, 39);
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit();
             this.bindingNavigator1.ResumeLayout(false);

DeinuPageControl/Pager.resx

@@ -126,45 +126,42 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnFirst.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAASpJREFUOE9jGDyg
-        cNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+
-        ///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0v3f1BxRFoa33wJpb1wFt7/z73yX/AG4D
-        Apsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvgUXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF
-        7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbAIu/O/9T+11gVGSSd+C+b9vW/bvA83AYY
-        Zt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPulf8gBXgVDULAwAAA8HbAq6XlmnAAAAAA
-        SUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABKklEQVQ4T2MYPKBw1vP/TQue/8+c+Pg/
+        VAgDhLc/wCnHkDvz2f9VR97/x6UovvvB/+CGa7gNyJjy9P/CfR+wKorvefh/6f7///2rL+A2IKHnyf9p
+        W95jKIpovw/WnDnr/3+v0hO4DYjsevS/d/UHFEWhrffAmlvXAW3v/PvfJf8AbgMCmx/+r5v/Dq4ouOXu
+        /0V7///vAGrOmPPzv13dz//2GdtxG+BRdf9//rQ3KIrsim//T5/z+79/17f/OoXv/lskrMdtgH3p3f/Z
+        k19jKNJPOf/fpOjFf5WsT/+NI5fhNsAi787/1P7XWBUZJJ34L5v29b9u8DzcBhhm3f4f1vISpyL91Mv/
+        NXyn4TZAJ+3Gf7/qh3gVqXhMwG2AU+6V/yAFeBUNQsDAAADwdsCrpeWacAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnPrev.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAALZJREFUOE9jGDog
-        vP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3v
-        kn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6fPuf3f/+ub/91Ct/9t0hYT3oY6Kec/29S
-        9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+08g3AARUPCZQZsBgBQwMANAUYJgEulBV
-        AAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAtklEQVQ4T2MYOiC8/cF/KJN0EN/94H9w
+        wzXyDIjvefh/6f7///2rL5BuQET7fbDmzFn//3uVniDNgNDWe2DNreuAtnf+/e+Sf4B4A4Jb7v5ftPf/
+        /w6g5ow5P//b1f38b5+xnTQX2BXf/p8+5/d//65v/3UK3/23SFhPehjop5z/b1L04r9K1qf/xpHLSDcA
+        BAySTvyXTfv6Xzd4HnkGgIB+6uX/Gr7TyDcABFQ8JlBmwGAFDAwA0BRgmAS6UFUAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnNext.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAKNJREFUOE9jGHyg
-        cNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78n73v1//OrX//u5VeJt2QyK5H/6ds+/W/
-        ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuIN8Sj6v7/krnv4JoVXXpIc4F96d3/gS3P
-        yNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5foAc0QjgAAAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAo0lEQVQ4T2MYfKBw1vP/UCZ5IHfms/8J
+        3ffINyRjytP/8/b//p/QdYc8QxJ6nvyfve/X/86tf/+7lV4m3ZDIrkf/p2z79b9k6d//CdP//rfJPUua
+        IYHND/+3rn0P1mxc8uW/dPS1/8aRy4g3xKPq/v+Sue/gmhVdekhzgX3p3f+BLc/I0wwCFnl3/tsUXCFP
+        MwgYZt0mXzMI6KTdIF/zUAQMDACgfl+gBzRCOAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnLast.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAASxJREFUOE9jGFyg
-        cNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9
-        H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30BtwGRXY/+T9n263/J0r//E6b//W+Texau
-        GCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYAkqub/+6/S/4B3AZ4VN3/XzL3HVyzoksP
-        XDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwGWOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3G
-        qhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq98l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAA
-        AABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLElEQVQ4T2MYXKBw1vP/UCYGAMk1LXj+
+        P3PiY5xqGHJnPvuf0H0PqwKQ3Koj7/+Htz/AbUDGlKf/5+3//T+h6w6GIpDcwn0f/gc3XMNtQELPk/+z
+        9/3637n173+30ssoCkFy07a8/+9ffQG3AZFdj/5P2fbrf8nSv/8Tpv/9b5N7Fq4YJNe7+sN/r9ITuA0I
+        bH74v3Xte7Bm45Iv/6Wjr/03jlwG1gCSq5v/7r9L/gHcBnhU3f9fMvcdXLOiSw9cMUguf9qb//YZ23Eb
+        YF96939gyzMMzSAAksue/Pq/RcJ63AZY5N35b1NwBUMzCIDkUvtfw72EFRhm3caqGQRAcmEtL//rBs/D
+        bYBO2g2ckiA5v+qH/zV8p+E2AB9wyr3yX8VjAhhDhQYFYGAAAL7Rv7O5DE6cAAAAAElFTkSuQmCC
 </value>
   </data>
 </root>

Logical/LAuthority.cs

@@ -239,6 +239,7 @@ namespace DeiNiu.wms.Logical
                 em.em_passwd = "";
                 em.AuthForms = getAuthObjLst(em.ID, "移动设备");
                 em.AuthSpecials = getAuthObjLst(em.ID, "细分权限");
+               
             }
             return em;
            

Logical/Logical.csproj

@@ -80,6 +80,7 @@
   <ItemGroup>
     <Compile Include="LAuthority.cs" />
     <Compile Include="lbase.cs" />
+    <Compile Include="lCharts.cs" />
     <Compile Include="lNode.cs" />
     <Compile Include="LProject.cs">
       <SubType>Code</SubType>

Logical/lCharts.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using DeiNiu.wms.Data.Model;
+
+namespace DeiNiu.wms.Logical
+{
+    [Serializable]
+    public class lCharts : lbase
+    {
+
+        private WmsFlow wmsFlow = new WmsFlow();
+
+        public DataSet getDailyKanBanData()
+        {
+            return wmsFlow.getTodayKanban();
+        }
+
+        public DataSet getErpOderData()
+        {
+            return new Erp_sale().getKanBanOrdersByState();
+        }
+
+
+ 
+    }
+}

Model/base/BaseModel.cs

@@ -205,7 +205,7 @@ namespace DeiNiu.Data.BaseObject
         }
 
 
-        protected string getCondition(string querystr)
+        public string getCondition(string querystr)
         {
             string condition = "";
             //   querystr = filtRiskChar(querystr);

Model/platform/tables/Employee.cs

@@ -52,6 +52,7 @@ namespace DeiNiu.wms.Data.Model
 
         private List<Authority> _authForms =new List<Authority>();
         private List<Authority> _authSpecials = new List<Authority>();
+        private Dictionary<string,List<Authority>> _authMap  ; 
         public List<Authority> AuthForms
         {
             get
@@ -74,6 +75,67 @@ namespace DeiNiu.wms.Data.Model
                 _authSpecials = value;
             }
         }
+
+        public Dictionary<string, List<Authority>> AuthMap { get
+            {
+                if( _authMap == null)
+                {
+                    _authMap = new Dictionary<string, List<Authority>>();
+
+
+                    string key200 = WmsConstants.PDA_MENU_UTILS;
+                    string key300 = WmsConstants.PDA_MENU_STK_IN;
+                    string key400 = WmsConstants.PDA_MENU_STK_OUT;
+                    string key500 = WmsConstants.PDA_MENU_PLATE;
+
+                 
+                        if (!_authMap.ContainsKey(key200))
+                        {
+                             _authMap.Add(key200, new List<Authority>());
+                        }
+                        if (!_authMap.ContainsKey(key300))
+                        {
+                            _authMap.Add(key300, new List<Authority>());
+                        }
+                        if (!_authMap.ContainsKey(key400))
+                        {
+                            _authMap.Add(key400, new List<Authority>());
+                        }
+                        if (!_authMap.ContainsKey(key500))
+                        {
+                            _authMap.Add(key500, new List<Authority>());
+                        }
+                  
+                      foreach (Authority au in AuthForms)
+                        {
+                            if (au.auth_order <= 200)
+                            {
+                                _authMap[key200].Add(au);
+                            }
+                            else if (au.auth_order < 400)
+                            {  
+                                  _authMap[key300].Add(au);
+                             }
+                            else if (au.auth_order < 500)
+                            {
+                            _authMap[key400].Add(au);
+                         
+                            }
+                            else
+                            {
+                            _authMap[key500].Add(au);
+                         
+                            }
+
+                        }
+                    }
+
+ 
+                return _authMap;
+            }
+            
+            set => _authMap = value; }
+
         public DataTable GetActivedEmplyeesByDept(int deptId)
         {
             cmdParameters[0] = deptId;

Model/wms/data/Erp_purch_Imp.cs

@@ -79,18 +79,35 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[1]);
                     break;
 
+                case 120:  //by vender pinyin
+                    _strSql = "SELECT distinct vender, venderName,contact,phone,orderType FROM v_purch WHERE vender=@vender and wms_state=@state";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@pinyin", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[1]);
+                    break;
+                case 121:  //by vender pinyin
+                    _strSql = "SELECT distinct vender, venderName,contact,phone,orderType FROM v_purch_rt WHERE vender=@vender  and wms_state=@state";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@pinyin", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[1]);
+                    break;
+
+
 
                 case 200:  //get detail by orderno
 
 
 
-                    _strSql = "SELECT * FROM v_purch_d_noPre WHERE pur_order = @pur_order";
+                  _strSql = "SELECT * FROM v_purch_d_noPre WHERE pur_order = @pur_order";
+                    //_strSql = "SELECT * FROM t_erp_purch_d WHERE pur_order = @pur_order";
+                   // _strSql = "SELECT * FROM v_purch_d WHERE pur_order = @pur_order";
+
                     if (Convert.ToInt32(mObj.CmdParameters[1]) > 0)
                     {
                         _strSql += " and wms_state =@wms_state";
                         sqlCmd.Parameters.AddWithValue("@wms_state", mObj.CmdParameters[1]);
                     }
-                   // _strSql += " and preInOrderNo IS NOT NULL"; 
+                 
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@pur_order", mObj.CmdParameters[0]);
                     break;
@@ -236,12 +253,28 @@ namespace DeiNiu.wms.Data.Model
 
                 case 1500:  //get by vender
 
-                    _strSql = "SELECT top 1000 *  FROM t_erp_purch where erp_state =@status order by createtime desc";
-                    sqlCmd.Parameters.AddWithValue("@vender", mObj.CmdParameters[0]);
+                    _strSql = "SELECT top 100 *  FROM t_erp_purch where erp_state =@status  or (wms_state>=3 and erp_state=0) order by createtime desc";
+                    sqlCmd.Parameters.AddWithValue("@status", mObj.CmdParameters[0]);
                     sqlCmd.CommandText = _strSql;
 
                     break;
 
+                     
+                case 1600:  //get all 4 valid in custs.
+
+                    _strSql = "  SELECT distinct vender  FROM t_erp_purch where wms_state=0;";
+                
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
+                case 1700:  //get valid result
+
+                    _strSql = "SELECT   *  FROM [v_stockInRequestValidDetailSum] where [preInOrder] =@preInNo";
+                    sqlCmd.Parameters.AddWithValue("@preInNo", mObj.CmdParameters[0]);
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
 
             }
         }

Model/wms/data/Erp_purch_receive_pre_Imp.cs

@@ -70,7 +70,13 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]); 
                     break;
-                 case 401:  //by purch order and detail id to get record
+                case 410:  //by purch order and detail id to get record
+                    _strSql = "SELECT * FROM v_purch_d_receive_wince_sum WHERE  [预到号码]=@orderNo";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    break;
+
+                case 401:  //by purch order and detail id to get record
                     _strSql = "SELECT * FROM v_purch_d  WHERE   preInOrderNo=@orderNo order by wms_state";
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
@@ -146,11 +152,28 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@state",(int) enumInStockOrderStatus.完验);
                     sqlCmd.Parameters.AddWithValue("@operId", mObj.CmdParameters[1]);
                     break;
-                case 900:  // 所有待入库
-                    _strSql = "SELECT * FROM v_purch_d_arrive_preSum  WHERE newCount4Valid >0";
+                case 900:  // 所有待验收入库
+                    _strSql = "SELECT * FROM v_purch_d_arrive_preSum   WHERE newCount4Valid >0 and storetype=@storeType and prestate<10";
+                    sqlCmd.Parameters.AddWithValue("@storeType", mObj.CmdParameters[0]);
                     sqlCmd.CommandText = _strSql;
                 
                     break;
+                case 910:  // 所有待验收入库
+                    _strSql = "SELECT * FROM v_purch_d_arrive_preSum   WHERE preInOrderNo= @preInOrderNo  and storetype=@storeType";
+                    sqlCmd.Parameters.AddWithValue("@preInOrderNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@storeType", mObj.CmdParameters[1]);
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+                case 1000:   
+                    _strSql = "SELECT distinct pur_order FROM t_erp_purch_receive_pre   WHERE   preInOrderNo  =@orderNo";
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
+            
+
             }
         }
     }

Model/wms/data/Erp_sale_Imp.cs

@@ -94,6 +94,57 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]); 
 
                     break;
+
+
+                case 600:  // 取明细
+                    _strSql = " select * from t_erp_sale_d d where exists (select 1 from t_erp_sale where sale_order =d.sale_order and  pickOrder = @pickOrder)";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@pickOrder", mObj.CmdParameters[0]);
+                    break;
+
+                case 700:  //by name
+                    _strSql = "SELECT * FROM t_erp_sale WHERE erp_state = @state  or (wms_state>=@wmsState and erp_state=0) ";
+                   
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@wmsState", mObj.CmdParameters[1]);
+                    break;
+
+                case 800:  //query out details
+                    string tmp_strSql = "SELECT *, ceiling([pickCount]/minOperateCount) as boxcnt,ROW_NUMBER() OVER (ORDER BY custor_id DESC) as sortNo  FROM dbo.[v_stockOutDetail4Report] WHERE erp_state = 1 " + mObj.CmdParameters[0].ToString() ;
+                    _strSql = "SELECT * FROM (" + tmp_strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END order by createtime";
+                    _strSql += "; SELECT COUNT(*) FROM v_stockOutDetail4Report  WHERE erp_state = 1 " + mObj.CmdParameters[0].ToString();
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
+                    sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);
+
+                    break;
+
+                case 900:  //query sum out by goodsId  
+             
+                      tmp_strSql = "SELECT   [goods_id] ,[goodsName] ,[minOperateCount] ,[minOperateUnit] ,[unit] ,[spec],sum([pickCount]) as pickCount ,ceiling(sum([pickCount])/minOperateCount) as boxcnt " +
+                        " ,ROW_NUMBER() OVER (ORDER BY goods_id DESC) as sortNo FROM [v_stockOutDetail4Report] where erp_state =1 " + mObj.CmdParameters[0].ToString() + " group by   [goods_id] ,[goodsName]  ,[minOperateCount] ,[minOperateUnit],[unit],[spec] ";
+                    _strSql = "SELECT * FROM (" + tmp_strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END order by goods_id";
+                    _strSql += "; SELECT COUNT(*) FROM("+ tmp_strSql + ")a  " ;  
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
+                    sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);
+ 
+                    break;
+
+
+                case 1000:  // out in kanban data
+                    _strSql = "  select * from [v_kanbanPh] ";//今日入库
+                             
+                    _strSql += ";  select * from [v_kanbanSh]  ";   //今日出库
+                      
+                    _strSql += "; SELECT *  FROM  [v_kanbanSd_day] ";  //销售记录明细条数
+                    _strSql += "; SELECT *  FROM  [v_kanbanPd_day] "; //采购入库明细条数
+
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
             }
         }
     }

Model/wms/data/TmsStock_Imp.cs

@@ -60,10 +60,15 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@custId", mObj.CmdParameters[0]);
                     break;
-                case 301:  //get public 整货集货货位 
+                case 301:  //get public  集货货位 
                     _strSql = "  SELECT top 1 locationId FROM t_wmsLocation where isnull(transLine,0) =0 and  volType = 6   ";
                     sqlCmd.CommandText = _strSql; 
                     break;
+                case 302:  //get public  集货货位 
+                    _strSql = "  SELECT top 1 locationId FROM t_wmsLocation where isnull(transLine,0) =0 and  volType = 10   ";
+                    sqlCmd.CommandText = _strSql;
+                    break;
+
                 case 400:  //get 零货集货信息
                     _strSql = "  SELECT * from  v_tmsPickRequestBulks where pickOrderNo =@pickOrderNo and (volType = 4 or volType =5)  ";
                    // _strSql = "  SELECT * from  v_tmsPickRequestBulksNoRealLocation where pickOrderNo =@pickOrderNo   ";

Model/wms/data/TmsTranRequest_Imp.cs

@@ -117,6 +117,13 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@pickOrderNo", mObj.CmdParameters[0]);                     
                     break;
+
+                case 900:  //取最新的装车订单
+                    _strSql = "select * from [v_tmsPickRequest] t where exists( SELECT top 1 * FROM  [t_tmsTranRequest] " +
+                        " where viechleNo= @plateid and transNo =t.transNo  order by createtime desc ) order by lineorder ";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateid", mObj.CmdParameters[0]);
+                    break;
             }
         }
     }

Model/wms/data/WmsFlow_Imp.cs

@@ -39,17 +39,33 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]); 
                     break;
-                case 250:  //by flowNo and orderNo
-                    _strSql = "SELECT * FROM t_wmsFlow WHERE task = @task and orderNo =@orderNo";
+                case 250:  //by flowNo and orderNo,status
+                    _strSql = "SELECT * FROM t_wmsFlow WHERE flowNo = @flowNo and orderNo =@orderNo and state =@state";
                     sqlCmd.CommandText = _strSql;
-                    sqlCmd.Parameters.AddWithValue("@task", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[1]);
+                    sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[2]);
                     break;
-                case 260:  //by flowNo and orderNo
+
+                case 260:  //by  orderNo
                     _strSql = "SELECT * FROM t_wmsFlow WHERE task = @task ";
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@task", mObj.CmdParameters[0]); 
                     break;
+                case 270:  //by flowNo and orderNo 
+                    _strSql = "SELECT * FROM t_wmsFlow WHERE flowNo = @flowNo and orderNo =@orderNo  ";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[1]);  
+                    break;
+                case 280:  //query count by owner and type 
+                    _strSql = "SELECT count(1) FROM t_wmsFlow WHERE owner = @owner and type =@type and finishedCnt <taskCnt and (CAST(createtime AS date)  = CAST(GETDATE()   AS date))";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@owner", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@type", mObj.CmdParameters[1]);
+
+                    break;
+
                 case 300:  //by flowNo  
                     _strSql = "SELECT * FROM v_wmsFlow WHERE [流水号] = @flowNo";
                     sqlCmd.CommandText = _strSql;
@@ -128,7 +144,17 @@ namespace DeiNiu.wms.Data.Model
                     break;
 
                 case 1000:  // 开始 jobs
-                    _strSql = "update t_wmsFlow set orderNo=@orderNo ,state =@state where flowNo =@flowNo";
+                    _strSql = "update t_wmsFlow set state =@state where flowNo =@flowNo and orderNo=@orderNo and state=@preState";
+                    sqlCmd.CommandText = _strSql;
+
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[1]);
+                    sqlCmd.Parameters.AddWithValue("@state", (int)enumFlowTaskStatus.进行中);
+                    sqlCmd.Parameters.AddWithValue("@preState", (int)enumFlowTaskStatus.未开始);
+                    break;
+
+                case 1100:  // 查询job 状态
+                    _strSql = "select 1 from t_wmsFlow where  orderNo=@orderNo and state =@state and flowNo =@flowNo";
                     sqlCmd.CommandText = _strSql;
 
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
@@ -136,6 +162,44 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@state", (int)enumFlowTaskStatus.进行中);
                     break;
 
+                case 1200:  // 开始 jobs
+                    _strSql = "update t_wmsFlow set state =@state where  orderNo=@orderNo and state=@preState";
+                    sqlCmd.CommandText = _strSql;
+
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]); 
+                    sqlCmd.Parameters.AddWithValue("@state", (int)enumFlowTaskStatus.进行中);
+                    sqlCmd.Parameters.AddWithValue("@preState", (int)enumFlowTaskStatus.未开始);
+                    break;
+
+ 
+
+                case 1300:  // 查询 task 状态
+                    _strSql = "select * from [v_flowTaskTodaySum] order by taskCnt";
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
+                case 1400:  // 查询 emp task 
+                    _strSql = " SELECT  [operater] ,[taskCnt] ,isnull([em_name],operater) as emName FROM [v_flowTasksDetailTodaySum] order by taskCnt";
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+                case 1500:  // 查询 location percent
+                    _strSql = " SELECT   [volType]  ,[usedCnt]  ,[totalCnt] FROM [wmsuzhou2].[dbo].[v_locationPercentDailySum] where voltype is not null order by totalCnt";
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+  
+                case 1600:  // 查询 看板
+                    _strSql = "select * from [v_flowTaskTodaySum] order by taskCnt"; //分类任务
+                    _strSql += "; SELECT  [operater] ,[taskCnt] ,isnull([em_name],operater) as emName FROM [v_flowTasksDetailTodaySum] order by taskCnt"; //今日绩效
+                    _strSql += "; SELECT   [volType] ,[usedCnt]  ,[totalCnt] ,[usedPercent] FROM  [v_locationPercentDailySum] where voltype is not null order by usedPercent desc"; //货位使用
+                    _strSql += "; SELECT  * FROM  [v_flowTaskTodaySumByState]  "; //任务汇总
+
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
             }
         }
     }

Model/wms/data/WmsInRequestDetail_Imp.cs

@@ -40,6 +40,12 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@preInOrder", mObj.CmdParameters[0]);
                     break;
+                case 500:  //test, to get 直通 收货流水号
+                    _strSql = " SELECT distinct flowNo from t_wmsInRequestDetail where whtype = 2 "
+                             +" and seedoutcnt<validcount  and  (CAST(createtime AS date) > CAST(GETDATE()-1   AS date))";
+                    sqlCmd.CommandText = _strSql; 
+                    break;
+                   
             }
         }
     }

Model/wms/data/WmsInRequest_Imp.cs

@@ -42,7 +42,7 @@ namespace DeiNiu.wms.Data.Model
                     _strSql += " truncate table t_wmsflow;   	";
                     _strSql += " truncate table t_wmsWave;";
                     _strSql += " truncate table t_wmsOrderRequest;   	";
-                    _strSql += " truncate table t_wmsOrderDetail;"; 
+                    _strSql += " truncate table t_wmsOrderDetail;";
                     _strSql += " update [custErp].[dbo].[t_erp_sale] set wms_state =0;";
                     _strSql += "update [custErp].[dbo].[t_erp_purch] set wms_state =0;";
                     _strSql += " update [custErp].[dbo].[t_erp_purch_d] set wms_state =0,receiveCount =0,rejectCount =0,validCount =0,arriveCount=0;";
@@ -51,67 +51,77 @@ namespace DeiNiu.wms.Data.Model
                     _strSql += " truncate table  [custErp].[dbo].t_erp_purch_receive_pre;";
                     _strSql += "  update [custErp].[dbo].[t_erp_sale] set dueDate =GETDATE()+2,orderDate = getdate()-2;";
                     _strSql += "  update [custErp].[dbo].[t_erp_purch] set [deliveryDate] =GETDATE()-2, [shipDate]  = getdate()+2, [endDate]  = getdate()+10;";
-                    _strSql  = "";
+                    _strSql = "";
                     sqlCmd.CommandText = _strSql;
-                 
+
                     break;
                 case 99:  //query orders 
-                   _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM t_wmsInRequest WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
-                   _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END";
-                   _strSql += ";SELECT COUNT(*) FROM t_wmsInRequest WHERE DR = 1  " + mObj.CmdParameters[0].ToString();
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
-                   sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);
+                    _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM t_wmsInRequest WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
+                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END";
+                    _strSql += ";SELECT COUNT(*) FROM t_wmsInRequest WHERE DR = 1  " + mObj.CmdParameters[0].ToString();
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
+                    sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);
 
-                   break;
+                    break;
+                case 991:  //query sum in by goods 
+                    string tmp_strSql = "SELECT goodsId, goodsName, SUM(validCount) AS validCount, goodsTypeName, spec, unit, bigCount, manufacturer," +
+                        " ROW_NUMBER() OVER (ORDER BY GOODSID DESC) as sortNo  FROM dbo.v_stockInRequestDetail_wms WHERE whType = 0 " + mObj.CmdParameters[0].ToString() + " GROUP BY goodsId, goodsName, goodsTypeName, spec, unit, bigCount, manufacturer ";
+                    _strSql = "SELECT * FROM (" + tmp_strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END";
+                    _strSql += ";SELECT COUNT(*) FROM ("+ tmp_strSql + ")a  " ;
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
+                    sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);
+
+                    break;
                 case 100:  //by name
                     _strSql = "SELECT * FROM t_wmsInRequest WHERE NAME = @NAME";
-                    sqlCmd.CommandText = _strSql; 
-                     sqlCmd.Parameters.AddWithValue("@NAME",   mObj.CmdParameters[0]  );
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@NAME", mObj.CmdParameters[0]);
                     break;
                 case 110:  //initial by goodsid,batch,locationid
                     _strSql = "SELECT * FROM t_wmsInRequest WHERE preInOrder =@ORDERNO";
                     sqlCmd.CommandText = _strSql;
-                    sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]); 
+                    sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
                     break;
                 case 200: //initial in stock requests
-                    // _strSql  = "INSER INTO  t_wmsInRequestDetail VALUES SELECT * FROM V_STOCKINREQUESTDETAIL A WHERE EXISTS(SELECT 1 FROM  V_STOCKINREQUEST B  "
-                    //           + "  WHERE ORDERDATE >= @START AND  ORDERDATE <= @END AND A.ORDERNO = B.ORDERNO)";
-                    //_strSql  += "INSER INTO  t_wmsInRequest VALUES SELECT * FROM V_STOCKINREQUEST WHERE ORDERDATE >= @START AND  ORDERDATE <= @END";
-                    //sqlCmd.Parameters.AddWithValue("@START", mObj.CmdParameters[0]);
-                    //sqlCmd.Parameters.AddWithValue("@END",   mObj.CmdParameters[0]);
+                          // _strSql  = "INSER INTO  t_wmsInRequestDetail VALUES SELECT * FROM V_STOCKINREQUESTDETAIL A WHERE EXISTS(SELECT 1 FROM  V_STOCKINREQUEST B  "
+                          //           + "  WHERE ORDERDATE >= @START AND  ORDERDATE <= @END AND A.ORDERNO = B.ORDERNO)";
+                          //_strSql  += "INSER INTO  t_wmsInRequest VALUES SELECT * FROM V_STOCKINREQUEST WHERE ORDERDATE >= @START AND  ORDERDATE <= @END";
+                          //sqlCmd.Parameters.AddWithValue("@START", mObj.CmdParameters[0]);
+                          //sqlCmd.Parameters.AddWithValue("@END",   mObj.CmdParameters[0]);
 
-                  //  string v_detailAvalable = WmsConstants.IN_STOCK_RECEIVE_VALID
-                  //      ?"v_stockInRequestDetail_Available"
-                  //      :"v_stockInRequestDetail_Available_noReceiveValid";
+                    //  string v_detailAvalable = WmsConstants.IN_STOCK_RECEIVE_VALID
+                    //      ?"v_stockInRequestDetail_Available"
+                    //      :"v_stockInRequestDetail_Available_noReceiveValid";
 
-                    string v_detailAvalable ="v_stockInRequestDetail_Available_noReceiveValid";
+                    string v_detailAvalable = "v_stockInRequestDetail_Available_noReceiveValid";
 
                     _strSql = "INSERT INTO  t_wmsInRequestDetail (ORDERNO,GOODSID,VALIDCOUNT,PRODUCTDATE,BATCH,BARCODE,VALIDDATE,REGEDITCODE,MANUFACTURER,whType,validbyAccount1,validbyAccount ) "
-                                + "SELECT  ORDERNO,GOODSID, COUNT,PRODUCTDATE,BATCH,BARCODE,VALIDDATE,REGEDITCODE,MANUFACTURER ,validResult,validbyAccount1,validbyAccount  FROM "+ v_detailAvalable ;
- 
-                               // A WHERE EXISTS(SELECT 1 FROM  V_STOCKINREQUEST_AVAILABLE B  "
-                              // + "  WHERE STATE =0 AND A.ORDERNO = B.ORDERNO);";
-                    _strSql += "; INSERT INTO  t_wmsInRequest (preInOrder,STATE,ORDERTYPENAME,ORDERDATE,VENDER,OWNER,DESCRIPTION) SELECT  ORDERNO,STATE,ORDERTYPENAME,ORDERDATE,VENDER,OWNER, DESCRIPTION "
-                                 + " FROM V_STOCKINREQUEST_AVAILABLE" ;// WHERE STATE =0 ";
-                    sqlCmd.CommandText = _strSql;
-                  
-                    
-                   break;
+                                + "SELECT  ORDERNO,GOODSID, COUNT,PRODUCTDATE,BATCH,BARCODE,VALIDDATE,REGEDITCODE,MANUFACTURER ,validResult,validbyAccount1,validbyAccount  FROM " + v_detailAvalable;
+
+                    // A WHERE EXISTS(SELECT 1 FROM  V_STOCKINREQUEST_AVAILABLE B  "
+                    // + "  WHERE STATE =0 AND A.ORDERNO = B.ORDERNO);";
+                    _strSql += "; INSERT INTO  t_wmsInRequest (preInOrder,STATE,ORDERTYPENAME,ORDERDATE,VENDER,OWNER,DESCRIPTION) SELECT  ORDERNO,STATE,ORDERTYPENAME,ORDERDATE,VENDER,OWNER, DESCRIPTION "
+                                 + " FROM V_STOCKINREQUEST_AVAILABLE";// WHERE STATE =0 ";
+                    sqlCmd.CommandText = _strSql;
+
+
+                    break;
+
 
-      
                 case 400:  //query order detail by orderNo, 
 
-                   _strSql = "SELECT * FROM V_STOCKINREQUESTDETAIL_WMS WHERE preInOrder =@ORDERNO"
-                            + " ORDER BY GOODSID,BATCH";  //同药品，按批次排序，便于分配货位。
-                   
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
+                    _strSql = "SELECT * FROM V_STOCKINREQUESTDETAIL_WMS WHERE preInOrder =@ORDERNO"
+                             + " ORDER BY GOODSID,BATCH";  //同药品，按批次排序，便于分配货位。
 
-                   break;
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
+
+                    break;
 
                 case 500:  //query order detail by orderNo, 
-                   
+
                     /*if (WmsConstants.IN_STOCK_PDA_SCAN)
                    { 
                        _strSql = "SELECT * FROM v_stockInRequestDetail4wince WHERE ORDERNO =@ORDERNO"
@@ -120,56 +130,58 @@ namespace DeiNiu.wms.Data.Model
                    }
                    else
                      * */
-                   {
+                    {
                         _strSql = "SELECT * FROM v_reportStockRecord WHERE ORDERNO =@ORDERNO"
                                 + " ORDER BY GOODSID,BATCH";  //同药品，按批次排序，便于分配货位。
-                   }
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
+                    }
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
 
-                   break;
+                    break;
 
                 case 600:  //query order with bad batch\productdate\validate details
 
-                   _strSql = "SELECT * FROM V_STOCKINREQUEST_AVAILABLE_bad order by orderDate desc";  
-                   sqlCmd.CommandText = _strSql;
+                    _strSql = "SELECT * FROM V_STOCKINREQUEST_AVAILABLE_bad order by orderDate desc";
+                    sqlCmd.CommandText = _strSql;
 
-                   break;
+                    break;
                 case 610:  //query order details with bad batch\productdate\validate  
 
-                   _strSql = " select * from v_stockInRequestDetail_Available_bad a where  orderno =@orderNo "
-                            + " and exists (select 1   from v_stockInRequestDetail_Available_bad b where orderNo = a.orderNo  group by  goodsId,batch having(count(1)>1)) "
-                            + " order by goodsId,batch,productDate,validDate";
-  
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    _strSql = " select * from v_stockInRequestDetail_Available_bad a where  orderno =@orderNo "
+                             + " and exists (select 1   from v_stockInRequestDetail_Available_bad b where orderNo = a.orderNo  group by  goodsId,batch having(count(1)>1)) "
+                             + " order by goodsId,batch,productDate,validDate";
 
-                   break;
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+
+                    break;
                 case 700:  //delete request and details
 
-                   _strSql = "DELETE FROM T_WMSINREQUESTDETAIL WHERE  preInOrder =@ORDERNO "
-                             + " ; DELETE FROM T_WMSINREQUEST WHERE preInOrder =@ORDERNO";
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
-                   break;
+                    _strSql = "DELETE FROM T_WMSINREQUESTDETAIL WHERE  preInOrder =@ORDERNO "
+                              + " ; DELETE FROM T_WMSINREQUEST WHERE preInOrder =@ORDERNO";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
+                    break;
 
                 case 800:  //get stock in record detail by  Id
-                    _strSql = "SELECT * FROM [v_stockInRequestDetailOnShelf4wince] WHERE portId = @Id";
-                   // _strSql = "SELECT * FROM [v_stockInRequestDetail4wince] WHERE ID = @Id";
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@Id", mObj.CmdParameters[0]);
-                   break;
+
+                    string col = "[分区] ,[商品名称]  ,[货位]  ,[应上数]  ,[实上数]  ,[sku]  ,[inPreOrder]   ,[上架码]  ,state  ,[diffCount] ,[portId] ,[partionEmpId],[partion], [unit] ,[typeName] ,[batch],[spec],[manufacturer] ,[validDate],[productDate] ,vender,orderNo";
+                    _strSql = " SELECT distinct " + col + " FROM [v_stockInRequestDetailOnShelf4wince] WHERE portId = @Id ";  
+                    // _strSql = "SELECT * FROM [v_stockInRequestDetail4wince] WHERE ID = @Id";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@Id", mObj.CmdParameters[0]);
+                    break;
                 case 810:  //get stock in record detail by  flowNo 托板验收流水号，可能对应多个货位
-                
-                   _strSql = "SELECT * FROM [v_stockInRequestDetail4wince] WHERE flowNo = @flowNo";
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
-                   break;
+
+                    _strSql = "SELECT * FROM [v_stockInRequestDetail4wince] WHERE flowNo = @flowNo";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
+                    break;
                 case 820:  //get stock in record detail by requestin  detailid 可能对应多个流水号  
-                   _strSql = "SELECT * FROM [v_stockInRequestDetail4wince] WHERE detailId = @detailId";
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@detailId", mObj.CmdParameters[0]);
-                   break;
+                    _strSql = "SELECT * FROM [v_stockInRequestDetail4wince] WHERE detailId = @detailId";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@detailId", mObj.CmdParameters[0]);
+                    break;
                 case 830:  //get stock in record detail by preInNo, flowNo 托板验收流水号，可能对应多个货位
 
                     _strSql = "SELECT * FROM [t_wmsInRequestDetail] WHERE preInOrder =@preInNo" +
@@ -180,48 +192,51 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
                     sqlCmd.Parameters.AddWithValue("@preInNo", mObj.CmdParameters[1]);
-                    sqlCmd.Parameters.AddWithValue("@status",(int)enumInStockDetailStatus.上架完成);
+                    sqlCmd.Parameters.AddWithValue("@status", (int)enumInStockDetailStatus.上架完成);
                     break;
                 case 900:  //update request order status to 
 
-                   _strSql = " UPDATE T_WMSINREQUEST SET STATE =@STATE,operater=@operater,lastmodified=getdate() WHERE preInOrder =@ORDERNO  "
-                             + " AND NOT EXISTS(SELECT 1 FROM T_WMSINUPPORT WHERE preInOrder = @ORDERNO AND STATE=1 )";
-                   _strSql += "; UPDATE t_wmsInRequestDetail SET STATE =@DETAILSTATE,operater=@operater,lastmodified=getdate() WHERE id =@detailId  ";
-                   sqlCmd.CommandText = _strSql;
-                   sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
-                   sqlCmd.Parameters.AddWithValue("@detailId", mObj.CmdParameters[1]);
-                   sqlCmd.Parameters.AddWithValue("@operater", mObj.CmdParameters[2]);
-                   sqlCmd.Parameters.AddWithValue("@STATE", (int)enumInStockOrderStatus.已上架);
-                   sqlCmd.Parameters.AddWithValue("@DETAILSTATE", (int)enumInStockDetailStatus.上架完成);
+                    _strSql = " UPDATE T_WMSINREQUEST SET STATE =@STATE,operater=@operater,lastmodified=getdate() WHERE preInOrder =@ORDERNO  "
+                              + " AND NOT EXISTS(SELECT 1 FROM T_WMSINUPPORT WHERE preInOrder = @ORDERNO AND STATE=1 )";
+                    _strSql += "; UPDATE t_wmsInRequestDetail SET STATE =@DETAILSTATE,operater=@operater,lastmodified=getdate() WHERE id =@detailId  ";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@detailId", mObj.CmdParameters[1]);
+                    sqlCmd.Parameters.AddWithValue("@operater", mObj.CmdParameters[2]);
+                    sqlCmd.Parameters.AddWithValue("@STATE", (int)enumInStockOrderStatus.已上架);
+                    sqlCmd.Parameters.AddWithValue("@DETAILSTATE", (int)enumInStockDetailStatus.上架完成);
 
-                   break;
+                    break;
                 case 1000:  // 验收结果货位分配明细
-                   string col = "[分区] ,[商品名称]  ,[货位]   ,[应上数]  ,[实上数]  ,[sku]  ,[inPreOrder]   ,[上架码]   ,[diffCount] ,[portId] ,[partionEmpId],[partion]";
-                  //  _strSql = " SELECT distinct " + col + " FROM [v_stockInRequestDetailOnShelf4wince] WHERE 1=1 ";
-                    _strSql = " SELECT distinct * FROM [v_stockInRequestDetailOnShelf4wince] WHERE 1=1 ";
-                    if (!String.IsNullOrEmpty(mObj.CmdParameters[0].ToString()) )
-                   {
-                       _strSql += " and inPreOrder=@inPreOrder";
+                      col = "[分区] ,[商品名称]  ,[货位]  ,[应上数]  ,box,[实上数]  ,[sku]  ,[inPreOrder]   ,[上架码] " +
+                        ",state  ,[diffCount] ,[portId] ,[partionEmpId],[partion], [unit] ,[typeName] ,[batch],[spec],bigCount,[manufacturer] ,[validDate],[productDate] ,vender,orderNo";
+                    _strSql = " SELECT distinct " + col + " FROM [v_stockInRequestDetailOnShelf4wince] WHERE 1=1 " +
+                        " and stackState=@taskState ";
+                  //  _strSql = " SELECT distinct * FROM [v_stockInRequestDetailOnShelf4wince] WHERE 1=1 ";
+                    if (!String.IsNullOrEmpty(mObj.CmdParameters[0].ToString()))
+                    {
+                        _strSql += " and inPreOrder=@inPreOrder";
                         sqlCmd.Parameters.AddWithValue("@inPreOrder", mObj.CmdParameters[0]);
 
-                       
-                   }
-                   if ( !String.IsNullOrEmpty(mObj.CmdParameters[1].ToString()) )
-                   {
-                       _strSql += " and 上架码 = @flowNo";
-                       sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[1]);
 
-                   }
-                   if (Convert.ToInt32(mObj.CmdParameters[2].ToString())>0)
-                   { 
-                       _strSql += " and empId=@userId";
-                       sqlCmd.Parameters.AddWithValue("@userId", mObj.CmdParameters[2]);
-                   }
-                    _strSql += " order by partion,diffcount desc";
+                    }
+                    if (!String.IsNullOrEmpty(mObj.CmdParameters[1].ToString()))
+                    {
+                        _strSql += " and 上架码 = @flowNo";
+                        sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[1]);
 
-                   sqlCmd.CommandText = _strSql;
-                 
-                   break;
+                    }
+                    if (Convert.ToInt32(mObj.CmdParameters[2].ToString()) > 0)
+                    {
+                        _strSql += " and empId=@userId";
+                        sqlCmd.Parameters.AddWithValue("@userId", mObj.CmdParameters[2]);
+                    }
+                    sqlCmd.Parameters.AddWithValue("@taskState", (int)enumFlowTaskStatus.进行中);
+                    _strSql += " order by state, partion,货位 desc";
+
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
 
                 case 1100:  //  验收明细
                     _strSql = "SELECT * FROM [v_stockInRequestDetail_wms] WHERE 1=1 ";
@@ -238,30 +253,44 @@ namespace DeiNiu.wms.Data.Model
                         sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[1]);
 
                     }
-                    _strSql += " order by id";
+                    _strSql += " order by id desc";
                     sqlCmd.CommandText = _strSql;
-       
+
+                  //  LogHelper.debug(this.GetType(), _strSql);
+                  //  LogHelper.debug(this.GetType(), mObj.CmdParameters[0].ToString());
+                  //  LogHelper.debug(this.GetType(), mObj.CmdParameters[1].ToString());
+
                     break;
 
                 case 1200:  //直通入库播种，根据验收流水号， 获取对应物品的出库订单需求明细
 
                     _strSql = "SELECT * FROM [v_stockInSeedsOutDetail] WHERE " +
                         " flowNo = @flowNo"
-                       // + " order by priority"
+                        // + " order by priority"
                         ;
 
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
-                   
+
                     break;
 
                 case 1300:  // //直通入库播种，按门店边收边发， 获取对应物品的出库订单需求明细
 
-                    _strSql = "SELECT *  FROM [v_stockInSeedsOutDetailByCust]  where  [preInOrderNo] =@preOrder  and customerid is not null order by {0} ";
+                    _strSql = "SELECT *  FROM [v_stockInSeedsOutDetailByCust]  where  [preInOrderNo] =@preOrder";
+
+                    if (!string.IsNullOrEmpty(mObj.CmdParameters[2].ToString()))
+                    {
+                        _strSql += " and barcode=@barcode ";
+                    }
+
+                    _strSql += "  and customerid is not null order by {0} ";
+
                     _strSql = String.Format(_strSql, mObj.CmdParameters[1]);
+
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@preOrder", mObj.CmdParameters[0]);
                     sqlCmd.Parameters.AddWithValue("@orderBy", mObj.CmdParameters[1]);
+                    sqlCmd.Parameters.AddWithValue("@barcode", mObj.CmdParameters[2]);
                     break;
 
             }

Model/wms/data/WmsInUpPort_Imp.cs

@@ -87,6 +87,17 @@ namespace DeiNiu.wms.Data.Model
 
                     break;
 
+
+                case 610:  //retrieve tasks
+                    _strSql = "select * from t_wmsInUpPort  WHERE  goodsId=@goodsId and productDate =@productDate and flowNo =@flowNo";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@goodsId", mObj.CmdParameters[1]);
+                    sqlCmd.Parameters.AddWithValue("@productDate", mObj.CmdParameters[2]);
+
+                    break;
+
+
                 case 700:  //all tasks 
                     _strSql = "select * from t_wmsInUpPort  WHERE state=@state and  count> upCount";
                     sqlCmd.Parameters.AddWithValue("@state", (int)enumInStockDetailStatus.已分配货位);

Model/wms/data/WmsOrderDetail_Imp.cs

@@ -37,7 +37,13 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@orderno", mObj.CmdParameters[0]);
                     break;
-
+                case 400:  //by ornerno to check if all the details picked or not
+                    _strSql = "select count(1) from t_wmsOrderDetail where   orderNo =@orderNo and state !=@picked ";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@picked", mObj.CmdParameters[1]);
+ 
+                    break;
 
             }
         }

Model/wms/data/WmsOrderRequest_Imp.cs

@@ -18,9 +18,9 @@ namespace DeiNiu.wms.Data.Model
             switch (_cust_op_flag)
             {
              case 99:  //query with dic
-                    _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM t_wmsOrderRequest  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
+                    _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM v_orderRequest  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
                     _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY ID DESC";
-                    _strSql += ";SELECT COUNT(*) FROM t_wmsOrderRequest  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
+                    _strSql += ";SELECT COUNT(*) FROM v_orderRequest  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
                     sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);
@@ -44,7 +44,12 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
                     break;
-    
+                case 400:  //by state
+                    _strSql = "SELECT * FROM t_wmsOrderRequest WHERE state = @state"; 
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[0]);
+                    break;
+
             }
         }
     }

Model/wms/data/WmsOutPickLable_Imp.cs

@@ -131,6 +131,17 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
 
                     break;
+                case 503:  
+
+
+                    _strSql = "SELECT  *  FROM [t_wmsOutPickLable_tmp]    where  dpsOrder=@dpsOrder  ";
+
+                    sqlCmd.Parameters.AddWithValue("@dpsOrder", mObj.CmdParameters[0]);
+
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
                 /*case 503: //to get current wave picking list by partions
 
                     _strSql = "SELECT a.*  FROM [t_wmsOutPickLable_tmp] a  where state =@state ";
@@ -144,7 +155,7 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
 
                     break;
-                 */ 
+                 */
                 case 600 : //拣选结束lable 回传数据  
                     wherestr = " where state = 0 and color =@color and  elabId =@elabId and elabAddress=@elabAddress "
                              + " and pickCount =0 and count =@pickCount";

Model/wms/data/WmsOutPickLable_tmp_Imp.cs

@@ -47,8 +47,27 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@elabAddress", mObj.CmdParameters[2]);
                     sqlCmd.Parameters.AddWithValue("@pickCount", mObj.CmdParameters[3]);
                     break;
-    
+
+                case 300:  //by name
+                    _strSql = "delete from t_wmsoutpicklable_tmp where dpsOrder =@dpsOrder";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@dpsOrder", mObj.CmdParameters[0]);
                  
+                    break;
+
+                case 400:  //by name
+                    _strSql = "select * from t_wmsoutpicklable_tmp where dpsOrder =@dpsOrder";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@dpsOrder", mObj.CmdParameters[0]);
+
+                    break;
+
+                case 500:  //by name
+                    _strSql = "delete from t_wmsoutpicklable_tmp where partion =@partion";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@partion", mObj.CmdParameters[0]);
+
+                    break;
             }
         }
     }

Model/wms/data/WmsOutPickPort_Imp.cs

@@ -21,13 +21,14 @@ namespace DeiNiu.wms.Data.Model
             {
                 case 99:  //query with dic
 
-                    if (mObj.CmdParameters[0].ToString().Contains("saleOrder ="))
+                  //  if (mObj.CmdParameters[0].ToString().Contains("saleOrder ="))
                     {
                         _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM [v_stockOutBatchPickDetailWithSaleOrder]  WHERE 1 = 1 " + mObj.CmdParameters[0].ToString();
-                        _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY ID ";
+                        _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY  pickpriority ,channel,shelf,layer";
                         _strSql += ";SELECT COUNT(*) FROM [v_stockOutBatchPickDetailWithSaleOrder]  WHERE 1 = 1 " + mObj.CmdParameters[0].ToString(); 
 
                     }
+                    /*
                     else
                     {
 
@@ -36,6 +37,7 @@ namespace DeiNiu.wms.Data.Model
                         _strSql += ";SELECT COUNT(*) FROM v_stockOutBatchPickDetail  WHERE 1 = 1 " + mObj.CmdParameters[0].ToString();
                       
                     }
+                    */
                        sqlCmd.CommandText = _strSql;
                         sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
                         sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);
@@ -87,6 +89,8 @@ namespace DeiNiu.wms.Data.Model
                 case 500:  //by pickorderNo( or exclude rep pick order)
 
                     _strSql = "SELECT COUNT(*) FROM t_wmsOutPickPort WHERE state =@STATE";
+
+                    if(!WmsConstants.OUT_STOCK_BULK_PDA_SCAN)
                     _strSql += Convert.ToBoolean(mObj.CmdParameters[2].ToString()) ?
                         " and volType > 0"  //整库货位
                         : " and volType <= 0"; //零库货位
@@ -157,7 +161,7 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@orderState", (int)enumOutStockRequestStatus.等待波次);
                     sqlCmd.Parameters.AddWithValue("@pickState", (int)enumPickState.未拣);
-                    sqlCmd.Parameters.AddWithValue("@orderType", (int)enumOutOrderType.销售出库); //TODO: 非销售出库类型的怎么处理？
+                    sqlCmd.Parameters.AddWithValue("@orderType", (int)enumOrderType.销售出库); //TODO: 非销售出库类型的怎么处理？
                     sqlCmd.Parameters.AddWithValue("@cnt", WmsConstants.MAX_JOBS_IN_A_WAVE);
                     break;
                 case 701:  // 未分配波次的拣货任务 4 dps wave
@@ -174,7 +178,7 @@ namespace DeiNiu.wms.Data.Model
                         _strSql += " and ( orderType!= @orderType or  ownercode =@ownerCode ) ";
                         sqlCmd.Parameters.AddWithValue("@ownerCode", wr.owner);
                     }
-                    sqlCmd.Parameters.AddWithValue("@orderType", (int)enumOutOrderType.销售出库);
+                    sqlCmd.Parameters.AddWithValue("@orderType", (int)enumOrderType.销售出库);
 
                     _strSql += " order by pickOrderNo;";
                     sqlCmd.CommandText = _strSql;
@@ -240,9 +244,14 @@ namespace DeiNiu.wms.Data.Model
                     _strSql = "SELECT * FROM [v_stockOutBatchPickDetail] a WHERE " +
                         " jobNo is not null" +
                         " and isnull(takeBy,0) =0 ";
-                   
-                    _strSql += " and orderType =@orderType ";
-                    sqlCmd.Parameters.AddWithValue("@orderType", mObj.CmdParameters[4]);
+
+                    if (Convert.ToInt32(mObj.CmdParameters[4]) > 0)
+                    {
+                        _strSql += " and orderType =@orderType ";
+                        sqlCmd.Parameters.AddWithValue("@orderType", mObj.CmdParameters[4]);
+                    }
+
+                  
 
 
                     if (Convert.ToBoolean(mObj.CmdParameters[2]))
@@ -254,9 +263,10 @@ namespace DeiNiu.wms.Data.Model
                     
                     if (Convert.ToInt32(mObj.CmdParameters[0]) > 0)
                     {
-                        _strSql += " and partion =@partion";
+                        _strSql += " and (partion=0 or partion =@partion)";
                         sqlCmd.Parameters.AddWithValue("@partion", mObj.CmdParameters[0]);
                     }
+                    
 
                     if (Convert.ToInt32(mObj.CmdParameters[1]) > 0)
                     {
@@ -274,14 +284,65 @@ namespace DeiNiu.wms.Data.Model
 
                     sqlCmd.CommandText = _strSql; 
                    
+                    break;
+                case 1110:  //getFreeTasks by jobNo
+                    _strSql = "SELECT * FROM [v_stockOutBatchPickDetail] a WHERE " +
+                        " jobNo is not null" +
+                        " and isnull(owner,0) =0 ";
+
+                    if (Convert.ToInt32(mObj.CmdParameters[4]) > 0)
+                    {
+                        _strSql += " and orderType =@orderType ";
+                        sqlCmd.Parameters.AddWithValue("@orderType", mObj.CmdParameters[4]);
+                    }
+
+
+
+
+                    if (Convert.ToBoolean(mObj.CmdParameters[2]))
+                    {
+                        _strSql += " and volType>0 ";
+                    }
+
+                    _strSql += " and state = " + (int)enumPickState.未拣;
+
+                    if (Convert.ToInt32(mObj.CmdParameters[0]) > 0)
+                    {
+                        _strSql += " and (partion=0 or partion =@partion)";
+                        sqlCmd.Parameters.AddWithValue("@partion", mObj.CmdParameters[0]);
+                    }
+
+
+                    if (Convert.ToInt32(mObj.CmdParameters[1]) > 0)
+                    {
+                        _strSql += " and isnull(lineid,0) = @lineId";
+                        sqlCmd.Parameters.AddWithValue("@lineId", mObj.CmdParameters[1]);
+                    }
+
+                    if (Convert.ToInt32(mObj.CmdParameters[5]) > 0)
+                    {
+                        _strSql += " and exists(select 1 from v_empPartions where partion = a.partion and empId=@empId)";
+                        sqlCmd.Parameters.AddWithValue("@empId", mObj.CmdParameters[5]);
+                    }
+
+                    _strSql += " order by priority desc,pickorderno,locationid";
+
+                    sqlCmd.CommandText = _strSql;
+
                     break;
 
                 case 1200:  //getAssignedTasks by takeby
                     _strSql = "SELECT * FROM [v_stockOutBatchPickDetail] WHERE state = " + (int)enumPickState.未拣;
                     _strSql += " and takeBy =@takeBy ";
                     _strSql += " and jobNo is not null ";
-                    _strSql += " and orderType =@orderType ";
-                    sqlCmd.Parameters.AddWithValue("@orderType", mObj.CmdParameters[4]);
+
+                    if (Convert.ToInt32(mObj.CmdParameters[4]) > 0)
+                    {
+                        _strSql += " and orderType =@orderType ";
+                        sqlCmd.Parameters.AddWithValue("@orderType", mObj.CmdParameters[4]);
+                    }
+
+        
 
                     if (Convert.ToBoolean(mObj.CmdParameters[3]))
                     {
@@ -308,7 +369,7 @@ namespace DeiNiu.wms.Data.Model
                     }
                      
                   
-                    _strSql += " order by priority desc,locationid";
+                    _strSql += " order by priority desc,customerid,locationid";
 
 
                     sqlCmd.CommandText = _strSql;
@@ -400,7 +461,8 @@ namespace DeiNiu.wms.Data.Model
                 case 1800://get seeds out detail by flowno
                     _strSql = "SELECT * from [v_stockOutPortSeedsDetail] where flowNo=@flowNo  " +
                         "order by goodsId";
-
+                  
+                    
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
                     break;
@@ -413,17 +475,22 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
                     break;
                 case 1801://get seeds out detail by flowno
-                    _strSql = "SELECT * from [v_stockOutPortSeedsPickDetail] where flowNo=@flowNo  " +
-                        "order by goodsId";
+                  //  _strSql = "SELECT * from [v_stockOutPortSeedsPickDetail] where flowNo=@flowNo  " +
+                 //       "order by goodsId";
+
+                    _strSql = "SELECT * from [v_stockOutValidInSeedsDetail] where flowNo=@flowNo  " +  //直通分播商品按检验入拖的先入后出原则分播； 集中贱货商品按商品ID排序
+                  "order by createtime, goodsId";
 
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
                     break;
 
                 case 1811://get seeds out detail by flowno, order by cust line order
-                    _strSql = "SELECT * from [v_stockOutPortSeedsPickDetail] where flowNo=@flowNo  " +
-                        "order by lineOrder ";
+                  //  _strSql = "SELECT * from [v_stockOutPortSeedsPickDetail] where flowNo=@flowNo  " +
+                 //       "order by lineid,  lineOrder,customerid ";
 
+                    _strSql = "SELECT * from [v_stockOutValidInSeedsDetail] where flowNo=@flowNo  " +//直通分播商品按检验入拖的先入后出原则分播； 集中贱货商品按店铺线路顺序排序
+                          "order by createtime, lineid,  lineOrder,customerid ";
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@flowNo", mObj.CmdParameters[0]);
                     break;
@@ -450,11 +517,38 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@detailId", mObj.CmdParameters[0]);
                     sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[1]);
 
-                    sqlCmd.CommandText = _strSql;
-
-
+                    sqlCmd.CommandText = _strSql; 
                     break;
 
+                case 2200:// 
+                    _strSql = " SELECT * FROM [v_stockOutPortSumLight] WHERE  state =0 and takeby=@takeby  ";
+
+                    if (Convert.ToInt16( mObj.CmdParameters[1].ToString())>0)
+                    {
+                        _strSql += " and  partion=@partion  "; 
+                        sqlCmd.Parameters.AddWithValue("@partion", mObj.CmdParameters[1]);
+
+                    }
+                    if (Convert.ToInt16(mObj.CmdParameters[2].ToString()) > 0)
+                    {
+                        _strSql +=   " and orderType=@orderType" ;
+                        sqlCmd.Parameters.AddWithValue("@orderType", mObj.CmdParameters[2]); 
+
+                    }
+                  
+                     
+                    sqlCmd.Parameters.AddWithValue("@takeby", mObj.CmdParameters[0]);
+              
+                    sqlCmd.CommandText = _strSql;  
+                    break;
+                case 2300:// 
+                    _strSql = " SELECT id as portId, * FROM v_stockoutport WHERE jobNo =@jobNo " +
+                        " and elabId>0";
+                       
+                    sqlCmd.Parameters.AddWithValue("@jobNo", mObj.CmdParameters[0]);
+                 
+                    sqlCmd.CommandText = _strSql;
+                    break;
             }
         }
     }

Model/wms/data/WmsOutPickRequest_Imp.cs

@@ -36,7 +36,7 @@ namespace DeiNiu.wms.Data.Model
                     */
                     string whsql = mObj.CmdParameters[0].ToString();
                     _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY PRIORITY desc, ID) as sortNo  FROM v_stockOutRequestWithDetails r  WHERE DR = 1 " + whsql;
-                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY PRIORITY desc,ID ";
+                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY PRIORITY desc,ID desc";
                     _strSql += ";SELECT COUNT(*) FROM v_stockOutRequestWithDetails r WHERE DR = 1 " + whsql;
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
@@ -61,6 +61,11 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
                     break;
+                case 201:  //get order out detail by pick ORDERNO
+                    _strSql = "SELECT * FROM t_wmsoutpickdetail WHERE PICKORDERNO = @ORDERNO";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@ORDERNO", mObj.CmdParameters[0]);
+                    break;
                 case 210:  //get order out detail by pick ORDERNO
                     _strSql = "SELECT  TOP (@cnt) * FROM v_stockOutPickDetail WHERE PICKORDERNO = @ORDERNO";
                     sqlCmd.CommandText = _strSql;
@@ -74,27 +79,29 @@ namespace DeiNiu.wms.Data.Model
                                  // + " where   orderType =@orderType and state =@state order by priority desc,custAddress, createtime "; //按创建时间排序，fifo，保证缺零货的订单补货后会优先进下个波次。  //bulkcnt desc" 按散货数量排序 ，先出散货多的，这样为了均衡复合台工作量，由于复合台和拣选单子是随机组合，所有没有必要了 ;
                                  // + " where   orderType =@orderType and state =@state order by priority desc , createtime "; //按创建时间排序，fifo，保证缺零货的订单补货后会优先进下个波次。  //bulkcnt desc" 按散货数量排序 ，先出散货多的，这样为了均衡复合台工作量，由于复合台和拣选单子是随机组合，所有没有必要了 ;
                                  + " where  1=1  " +
-                                 " and createtime > getdate()-2 "  +
+                                 " and createtime > getdate()-@daysOut "  +
                                  " and state =@state order by pickgroup, priority desc, createtime desc"; //后生成的先入，需二次处理的问题订单排后面
                     
                     //按创建时间排序，fifo，保证缺零货的订单补货后会优先进下个波次。  //bulkcnt desc" 按散货数量排序 ，先出散货多的，这样为了均衡复合台工作量，由于复合台和拣选单子是随机组合，所有没有必要了 ;
                               
                     //sqlCmd.Parameters.AddWithValue("@outStoreType", mObj.CmdParameters[1]);
                     sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[0]);
-                   sqlCmd.Parameters.AddWithValue("@cnt",  WmsConstants.OUT_PROCESS_ORDERS_CNT*10);
+                   sqlCmd.Parameters.AddWithValue("@cnt",  WmsConstants.OUT_PROCESS_ORDERS_CNT);
+                    sqlCmd.Parameters.AddWithValue("@daysOut", WmsConstants.OUT_PROCESS_ORDERS_CNT );
                     sqlCmd.CommandText = _strSql;  
                     break;
                 case 30001:  //get pickrequest by  status
 
                            _strSql = "SELECT   top (@cnt) *  FROM [t_wmsOutPickRequest]  "
                                 + " where  1=1  " +
-                                 " and createtime > getdate()-2 " +
+                                 " and createtime > getdate()-@daysOut " +
                                  " and state =@state order by pickgroup, priority  desc, checkedtime"; //未处理过的，或新处理过的优先，确保所有订单都有机会处理库存
 
                
                     //sqlCmd.Parameters.AddWithValue("@outStoreType", mObj.CmdParameters[1]);
                     sqlCmd.Parameters.AddWithValue("@state", mObj.CmdParameters[0]);
-                    sqlCmd.Parameters.AddWithValue("@cnt", WmsConstants.OUT_PROCESS_ORDERS_CNT * 10);
+                    sqlCmd.Parameters.AddWithValue("@cnt", WmsConstants.OUT_PROCESS_ORDERS_CNT );
+                    sqlCmd.Parameters.AddWithValue("@daysOut", WmsConstants.OUT_PROCESS_ORDERS_CNT);
                     sqlCmd.CommandText = _strSql;
                     break;
                 case 3001:  //get pickrequest by outStoreType,satus
@@ -160,7 +167,7 @@ namespace DeiNiu.wms.Data.Model
                         _strSql += " and ( orderType!= @orderType or  ownercode =@ownerCode ) ";
                         sqlCmd.Parameters.AddWithValue("@ownerCode", wr.owner);
                     }
-                    sqlCmd.Parameters.AddWithValue("@orderType", (int)enumOutOrderType.销售出库);
+                    sqlCmd.Parameters.AddWithValue("@orderType", (int)enumOrderType.销售出库);
                     _strSql += " and pickOrderNo = r.pickOrderNo";
                     
                     _strSql = "SELECT  TOP (@cnt) *  FROM [t_wmsOutPickRequest] r  where exists("
@@ -870,7 +877,7 @@ namespace DeiNiu.wms.Data.Model
                             + " and exists(select 1 from [t_wmsOutPickRequest]  where pickorderNo = a.pickorderNo and orderType =@orderType and orderDate =getDate())"
                             + " and batchpickstate <@pickStatus" ;//+ (int)Utils.enumOutStockPickStatus.复核完成; //复核完成=完成零货上架
 
-                    sqlCmd.Parameters.AddWithValue("@orderType",(int) Utils.enumOutOrderType.补货出库);
+                    sqlCmd.Parameters.AddWithValue("@orderType",(int) Utils.enumOrderType.补货出库);
                     sqlCmd.Parameters.AddWithValue("@pickStatus", mObj.CmdParameters[0]);
 
                     sqlCmd.CommandText = _strSql;
@@ -941,7 +948,7 @@ namespace DeiNiu.wms.Data.Model
 
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@pickstate", mObj.CmdParameters[0]);
-                    sqlCmd.Parameters.AddWithValue("@repOrder", (int)Utils.enumOutOrderType.补货出库);
+                    sqlCmd.Parameters.AddWithValue("@repOrder", (int)Utils.enumOrderType.补货出库);
 
                     break;
 
@@ -1082,10 +1089,16 @@ namespace DeiNiu.wms.Data.Model
                 case 2600:  // 取播种拣选明细
                     _strSql = "SELECT  goodsId, batch, skuId, canSeedOut, orderState, pickGroup, SUM(count) AS count " +
                         " FROM     dbo.v_stockOutPickDetailPickgroup WHERE 1=1" +
-                      //  " and seedsport=@mark " +
-                         " and pickGroup =@groupMark" +
-                           " and canseedout =1 " +
-                           " and orderState = @orderState " + 
+                         //  " and seedsport=@mark " +
+                         " and pickGroup =@groupMark";
+
+                         if (!WmsConstants.SEEDS_PICK_ALL)
+                            {
+                                _strSql += " and canseedout =1 ";
+                            }
+
+
+                    _strSql += " and orderState = @orderState " + 
                             " GROUP BY goodsId, batch, skuId, canSeedOut, orderState, pickGroup ";//" and bulkPickstate =@bulkState"; 
 
                     sqlCmd.CommandText = _strSql;
@@ -1102,12 +1115,26 @@ namespace DeiNiu.wms.Data.Model
 
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@seedsPickOrder", mObj.CmdParameters[1]);
-                    sqlCmd.Parameters.AddWithValue("@pickOrderNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@pickOrderNo", mObj.CmdParameters[0]); 
+                    break;
 
+                case 2800:  // 分拣完成、所有任务已复核（抽检复核，装车时自动复核）
+                    _strSql = "select top 10 * from t_wmsoutpickrequest p where state =@orderState  and" +
+                        " not exists(select 1 from t_wmsoutpickport where pickorderno =p.pickorderno and state <@pickState) "; 
 
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@orderState", (int)enumOutStockRequestStatus.分拣完成);
+                    sqlCmd.Parameters.AddWithValue("@pickState", (int)enumPickState.复核完成); 
 
                     break;
 
+                case 2900:  // get by transNo ( vihicle type plateId    )
+                    _strSql = "SELECT *  FROM  [t_wmsoutpickrequest] where transNo =@transNo";
+
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@transNo", mObj.CmdParameters[0]);
+
+                    break;
             }
         }
     }

Model/wms/data/WmsOutRequest_Imp.cs

@@ -21,7 +21,7 @@ namespace DeiNiu.wms.Data.Model
 
                 case 99:  //query orders with free parameters 
                     _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM t_wmsOutRequest WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
-                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END";
+                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END " + " ORDER BY PRIORITY desc,ID desc"; ;
                     _strSql += ";SELECT COUNT(*) FROM t_wmsOutRequest WHERE DR = 1  " + mObj.CmdParameters[0].ToString();
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);

Model/wms/data/WmsPlatePack_Imp.cs

@@ -6,7 +6,9 @@
 /// </summary>
 
 using System;
-using System.Data.SqlClient; 
+using System.Data.SqlClient;
+using DeiNiu.Utils;
+
 namespace DeiNiu.wms.Data.Model
 {
     [Serializable]  class WmsPlatePack_Imp : WmsPlatePack_base_Imp
@@ -32,8 +34,36 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql; 
                      sqlCmd.Parameters.AddWithValue("@NAME",   mObj.CmdParameters[0]  );
                     break;
-    
-                 
+
+                case 200:  //
+                  
+                    _strSql  = " update t_wmsplate " +
+                        " set customerid =null,lineid =0,inPlate=null ,load=0,volume=0 ,pickOrderNo=null,transNo=null " +
+                        " where exists (select 1 from t_wmsplatepack where plateId = t_wmsplate.plateId and subplateId =@plateId )";
+                     _strSql += ";DELETE t_wmsPlatePack WHERE subPlateId =@plateid";
+
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateid", mObj.CmdParameters[0]);
+                    break;
+                case 300:  //
+                    _strSql = "select * from t_wmsPlatePack WHERE  subPlateId =@subPlateid" +
+                        " and plateId =@plateId";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateid", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@subPlateid", mObj.CmdParameters[1]);
+                   // LogHelper.debug(this.GetType(), " 2 upPlate is " + mObj.cmdParameters[0] + ", plate is " + mObj.cmdParameters[2]);
+                    break;
+
+                case 400:  //by plate id get sub plates
+                    _strSql = "SELECT * FROM t_wmsPlatePack WHERE plateId = @plateid";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateid", mObj.CmdParameters[0]);
+                    break;
+                case 500:  //by plate id get sub plates
+                    _strSql = "SELECT * FROM t_wmsPlatePack WHERE subPlateId = @plateid";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateid", mObj.CmdParameters[0]);
+                    break;
             }
         }
     }

Model/wms/data/WmsPlateStock_tmp_Imp.cs

@@ -49,8 +49,14 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@portId", mObj.CmdParameters[0]);
                     break;
 
-                case 400:  //by outportId
-                    _strSql = "SELECT * FROM v_plateStock WHERE plateId = @plateId";
+                case 310:  //by inportId
+                    _strSql = "SELECT * FROM t_wmsPlateStock_tmp WHERE inPortId = @portId";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@portId", mObj.CmdParameters[0]);
+                    break;
+
+                case 400:  // inupPort, outPort job detail
+                    _strSql = "SELECT * FROM [v_plateStockDetail] WHERE plateId = @plateId";
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@plateId", mObj.CmdParameters[0]);
                     break;
@@ -80,13 +86,33 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@plateId", mObj.CmdParameters[0]);
                     break;
                 case 900:  //merge
-                    _strSql = "update t_wmsPlateStock_tmp WHERE plateId = @toPlateId " +
+                    _strSql = "update t_wmsPlateStock_tmp set plateId = @toPlateId " +
                         "where plateId =@plateId";
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@plateId", mObj.CmdParameters[0]);
                     sqlCmd.Parameters.AddWithValue("@toPlateId", mObj.CmdParameters[1]);
 
                     break;
+
+                case 1000: // 
+                    _strSql = "select * from t_wmsoutpickrequest p where outStoreType=@outStoreType and exists (select 1 from t_wmsPlateStock_tmp where plateid =@plateid and orderno = p.pickorderNo )";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateId", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@outStoreType", mObj.CmdParameters[1]);
+                    break;
+
+                case 1100:  //delete
+                    _strSql = "delete  FROM t_wmsPlateStock_tmp WHERE orderNo = @orderNo ";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    break;
+
+
+                case 1200:  // 
+                    _strSql = "select *  FROM t_wmsPlateStock_tmp WHERE orderNo = @orderNo ";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    break;
             }
         }
     }

Model/wms/data/WmsPlate_Imp.cs

@@ -81,13 +81,48 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@subPlateId", mObj.CmdParameters[0]);
                     break;
 
-                case 800: //取子容器信息，子容器 需要在t_wmsplate定义
-                    _strSql = "select * from t_wmsplate p  where exists(select 1 from t_wmsPlatePack" +
-                       " where p.plateId =subplateid and plateid =@plateId ) ";
+                case 800: // 
+                  //  _strSql = "select * from t_wmsplate p  where exists(select 1 from t_wmsPlatePack" +
+                 //      " where p.plateId =subplateid and plateid =@plateId ) ";
+                    _strSql = "select * from t_wmsPlatePack " +
+                       " where  plateid =@plateId ";
+
+                   sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateId", mObj.CmdParameters[0]);
+                    break;
+                case 900: // 
+                    _strSql = "select * from v_wmsplate where plateid =@plateId "  ;
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@plateId", mObj.CmdParameters[0]);
                     break;
+
+                case 1000: // 
+                    _strSql = "select * from t_wmsplate p where exists (select 1 from t_wmsplatepack where subPlateId =p.plateId and plateId =@plateId )";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateId", mObj.CmdParameters[0]);
                     break;
+
+
+                case 1100: // 释放下级容器，装车时释放线路下面的客户级别的容器
+                    _strSql = "update t_wmsplate " +
+                        " set customerid =null,lineid =0,inPlate=null ,load=0,volume=0 ,pickOrderNo=null,transNo=null " +
+                        " where exists (select 1 from t_wmsplatepack where subPlateId =t_wmsplate.plateId and plateId =@plateId )" +  //释放下级容器
+                        " or  plateId =@plateId";//释放本级
+                  //  _strSql += ";update t_wmsplate  set customerid =null,lineid =0,inPlate=null ,load=0,volume=0 ,pickOrderNo=null,transNo=null where plateId =@plateId"; //释放线路码头类线路属性 
+                    _strSql += ";delete  from t_wmsplatepack where plateId =@plateId  "; //删除店铺类集货关系
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@plateId", mObj.CmdParameters[0]);
+                    break;
+
+
+                case 1200: // 
+                    _strSql = "select * from t_wmsplate where customerid = @custid";
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@custid", mObj.CmdParameters[0]);
+                    break;
+
+
+
             }
         }
     }

Model/wms/data/WmsStockPandianResult_Imp.cs

@@ -29,14 +29,21 @@ namespace DeiNiu.wms.Data.Model
                     break;
                 case 100:  //by name
                     _strSql = "SELECT * FROM t_wmsStockPandianResult WHERE orderNo = @orderNo and locationId =@locationId";
-                    _strSql += " and skuId =@skuId";
+                   _strSql += " and skuId =@skuId";
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
                     sqlCmd.Parameters.AddWithValue("@locationId", mObj.CmdParameters[1]);
-                    sqlCmd.Parameters.AddWithValue("@skuId", mObj.CmdParameters[2]);
+                   sqlCmd.Parameters.AddWithValue("@skuId", mObj.CmdParameters[2]);
                     break;
 
+                case 200:  //by name
+                    _strSql = "SELECT * FROM t_wmsStockPandianResult WHERE orderNo = @orderNo and locationId =@locationId";
                
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@locationId", mObj.CmdParameters[1]);
+                 
+                    break;
 
             }
         }

Model/wms/data/WmsStockPandian_Imp.cs

@@ -19,9 +19,9 @@ namespace DeiNiu.wms.Data.Model
             switch (_cust_op_flag)
             {
              case 99:  //query with dic
-                    _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM t_wmsStockPandian  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
+                    _strSql = "SELECT *,ROW_NUMBER() OVER (ORDER BY ID DESC) as sortNo  FROM v_pandian  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
                     _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY ID DESC";
-                    _strSql += ";SELECT COUNT(*) FROM t_wmsStockPandian  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
+                    _strSql += ";SELECT COUNT(*) FROM v_pandian  WHERE DR = 1 " + mObj.CmdParameters[0].ToString();
                     sqlCmd.CommandText = _strSql;
                     sqlCmd.Parameters.AddWithValue("@START", this._rownumStart);
                     sqlCmd.Parameters.AddWithValue("@END", this._rownumEnd);
@@ -34,22 +34,27 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
                     break;
                 case 200:
-                    string cols = "[locationId] ,[skuId] ,[skuCode] ,[goodsId],[batch],[productDate],[validDate],[avCount],[state] ";
+                    string cols = "[locationId] ,[skuId] ,[skuCode] ,[goodsId],[batch],[productDate],[validDate],[shelfCount],[state] ";
                     _strSql = string.Format(
                      " insert into t_wmsStockPandianStockMirror([orderNo],{0},[operater]) select '{1}',{2}, {3} from v_stockGoods where 1=1  {4} "
                         , cols, mObj.CmdParameters[1].ToString(),cols,mObj.CmdParameters[2].ToString(), mObj.CmdParameters[0].ToString());
                     
                     //to update stock set loctation to be disabled
-                    _strSql += "; update v_stockGoods set locState =@status where 1=1  " + mObj.CmdParameters[0].ToString(); 
-                    _strSql += "; update v_stockGoods set state =@status where 1=1  " + mObj.CmdParameters[0].ToString();
-                    sqlCmd.Parameters.AddWithValue("@status", enumStockLocationStatus.盘点锁定);
+                   // _strSql += "; update v_stockGoods set locState =@status where 1=1  " + mObj.CmdParameters[0].ToString(); 
+                 //   _strSql += "; update v_stockGoods set state =@status where 1=1  " + mObj.CmdParameters[0].ToString();
+                  //  sqlCmd.Parameters.AddWithValue("@status", enumStockLocationStatus.盘点锁定);
                     sqlCmd.CommandText = _strSql;
                   
                     break;
 
                 case 300:
-                    _strSql = "SELECT * FROM [v_PandianStockBalance_running] WHERE [orderNo] = @orderNo";
+                    
+                    _strSql = "SELECT  *,ROW_NUMBER() OVER (ORDER BY GOODSID DESC) as sortNo  FROM [v_PandianStockBalance_running] WHERE [orderNo] = @orderNo";
+                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY GOODSID DESC";
+                    _strSql += ";SELECT COUNT(*) FROM v_PandianStockBalance_running  WHERE   [orderNo] = @orderNo";
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@START", mObj.CmdParameters[1]);
+                    sqlCmd.Parameters.AddWithValue("@END", mObj.CmdParameters[2]);
                     sqlCmd.CommandText = _strSql;
 
                     break;
@@ -81,6 +86,62 @@ namespace DeiNiu.wms.Data.Model
                     sqlCmd.CommandText = _strSql;
 
                     break;
+                case 410:
+                    _strSql = "SELECT  *,ROW_NUMBER() OVER (ORDER BY LOCATIONID DESC) as sortNo  FROM [v_pandianReuslt] WHERE [orderNo] = @orderNo";
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    goodsId = mObj.CmdParameters[1].ToString();
+                    if (!string.IsNullOrEmpty(goodsId))
+                    {
+                        _strSql += " and goodsId =@goodsId";
+                        sqlCmd.Parameters.AddWithValue("@goodsId", goodsId);
+                    }
+
+
+
+                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY LOCATIONID DESC";
+                    _strSql += ";SELECT COUNT(*) FROM v_pandianReuslt  WHERE   [orderNo] = @orderNo";
+
+                    if (!string.IsNullOrEmpty(goodsId))
+                    {
+                        _strSql += " and goodsId =@goodsId";
+                    }
+             
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@START", mObj.CmdParameters[2]);
+                    sqlCmd.Parameters.AddWithValue("@END", mObj.CmdParameters[3]);
+
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
+                case 420:
+                    _strSql = "SELECT  *,ROW_NUMBER() OVER (ORDER BY GOODSID DESC) as sortNo  FROM [v_pandianResultSum] WHERE [orderNo] = @orderNo";
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    goodsId = mObj.CmdParameters[1].ToString();
+                    if (!string.IsNullOrEmpty(goodsId))
+                    {
+                        _strSql += " and goodsId =@goodsId";
+                        sqlCmd.Parameters.AddWithValue("@goodsId", goodsId);
+                    }
+
+
+
+                    _strSql = "SELECT * FROM (" + _strSql + " )AS SORTEDTB WHERE sortNo BETWEEN @START AND @END" + " ORDER BY GOODSID DESC";
+                    _strSql += ";SELECT COUNT(*) FROM v_pandianResultSum  WHERE   [orderNo] = @orderNo";
+
+                    if (!string.IsNullOrEmpty(goodsId))
+                    {
+                        _strSql += " and goodsId =@goodsId";
+                    }
+
+                    sqlCmd.CommandText = _strSql;
+                    sqlCmd.Parameters.AddWithValue("@START", mObj.CmdParameters[2]);
+                    sqlCmd.Parameters.AddWithValue("@END", mObj.CmdParameters[3]);
+
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
                 case 500:
                     _strSql = "SELECT * FROM t_wmsStockPandian  WHERE [orderNo] = @orderNo";
                     sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
@@ -115,7 +176,31 @@ namespace DeiNiu.wms.Data.Model
                    
                     _strSql = "  update v_stockGoods set locState =@status where  1=1 " + mObj.CmdParameters[0].ToString(); 
                     _strSql += "; update v_stockGoods set state =@status where 1=1  " + mObj.CmdParameters[0].ToString();
-                    sqlCmd.Parameters.AddWithValue("@status", (int) enumStockLocationStatus.正常);
+                    sqlCmd.Parameters.AddWithValue("@status",  mObj.CmdParameters[1]);
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
+                case 1000:
+                    _strSql = "SELECT * FROM [v_pandianTarget] WHERE [orderNo] = @orderNo and locationId =@locationId";
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
+                    sqlCmd.Parameters.AddWithValue("@locationId", mObj.CmdParameters[1]);
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
+                case 1100:
+                    _strSql = "SELECT * FROM [v_pandianMirror] WHERE [orderNo] = @orderNo  order by locationId";
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]); 
+                    sqlCmd.CommandText = _strSql;
+
+                    break;
+
+                case 1200:
+                    _strSql = "insert into [t_wmsOrderDetail] (orderNo,goodsId,goodsName,unit,count,whtype)" +
+                        " select orderNo,goodsId,goodsName,unit,avcount,0 from [v_pandianResultSum] " +
+                        " where orderno =@orderNo ";
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[0]);
                     sqlCmd.CommandText = _strSql;
 
                     break;

Model/wms/data/WmsStock_Imp.cs

@@ -222,15 +222,16 @@ namespace DeiNiu.wms.Data.Model
                         sqlCmd.Parameters.AddWithValue("@batch", mObj.CmdParameters[2]);
                     }
                     
-                     _strSql += " and avCount > 0 and (state !=@state1 or state !=@state2)"
+                     _strSql += " and (state =@state1 or state =@state2)"
+                             +  " and avCount > 0 "
                              +  " and  whType =@whType "
-                             + " ORDER BY productDate,batch,createtime"; 
+                             +  " ORDER BY productDate,batch,createtime"; 
                     
                     sqlCmd.CommandText = _strSql;  
                     sqlCmd.Parameters.AddWithValue("@goodsId", mObj.CmdParameters[0]); 
                     sqlCmd.Parameters.AddWithValue("@whType", mObj.CmdParameters[3]);
-                    sqlCmd.Parameters.AddWithValue("@state1", (int)enumStockLocationStatus.养护异常);
-                    sqlCmd.Parameters.AddWithValue("@state2", (int)enumStockLocationStatus.不可用);
+                    sqlCmd.Parameters.AddWithValue("@state1", (int)enumStockLocationStatus.正常);
+                    sqlCmd.Parameters.AddWithValue("@state2", (int)enumStockLocationStatus.入库受限);
                     sqlCmd.Parameters.AddWithValue("@minDays", WmsConstants.OUT_MIN_DAYS_VALIDTION_LEFT);
                  
                     break;
@@ -322,8 +323,24 @@ namespace DeiNiu.wms.Data.Model
                     {
                         _strSql +=" where operater  =@operaterId "; 
                         sqlCmd.Parameters.AddWithValue("@operaterId", operId);         
-                    } 
-                                
+                    }
+                    _strSql += " order by id desc";
+                    sqlCmd.CommandText = _strSql;
+                    break;
+                case 810: //已下架商品待上架商品列表
+
+                    operId = Convert.ToInt32(mObj.CmdParameters[0]); //operId ==-1 means all records
+
+
+                    _strSql = " select * from v_reportStockRecordDownList4Up4winCE where orderNo=@orderNo ";
+
+                    if (operId > 0)
+                    {
+                        _strSql += " and operater  =@operaterId ";
+                        sqlCmd.Parameters.AddWithValue("@operaterId", operId);
+                    }
+                    _strSql += " order by id desc";
+                    sqlCmd.Parameters.AddWithValue("@orderNo", mObj.CmdParameters[1]);
                     sqlCmd.CommandText = _strSql;
                     break;
 
@@ -373,18 +390,19 @@ namespace DeiNiu.wms.Data.Model
 
              
 
-                case 1200:// 根据goodsid,batch取货位存储详细
+                case 1200:// 根据goodsid,skuId 取货位存储详细
 
 
                     _strSql = "select * from v_stockGoods "
                            // + " where goodsid=@goodsid   and batch=@batch "
-                            + " where skuId =@skuId "
-                            + mObj.CmdParameters[1];
+                            + " where skuId =@skuId " +
+                            " and goodsId =@goodsId"
+
+                            + mObj.CmdParameters[2];
 
                     sqlCmd.CommandText = _strSql;
-                     sqlCmd.Parameters.AddWithValue("@skuId", mObj.CmdParameters[0]);
-                  
-                   // sqlCmd.Parameters.AddWithValue("@goodsid", mObj.CmdParameters[0]);
+                     sqlCmd.Parameters.AddWithValue("@skuId", mObj.CmdParameters[0]); 
+                     sqlCmd.Parameters.AddWithValue("@goodsId", mObj.CmdParameters[1]);
                   //  sqlCmd.Parameters.AddWithValue("@batch", mObj.CmdParameters[1]);
                   
                     break;

Model/wms/data/Wmslocation_Imp.cs

@@ -61,7 +61,9 @@ namespace DeiNiu.wms.Data.Model
                                  + " AND (LOC.WHTYPE>0 or warehouse =@warehouse) " +
                                  //    +" AND (LOC.WHTYPE>0 or goodsType =@GOODTYPE) " +
                                  "   AND LOC.VOLTYPE = @VOLTYPE AND LOC.WHTYPE =@WHTYPE " 
-                                 + " AND NOT EXISTS (SELECT 1 FROM T_WMSSTOCK with(nolock) WHERE LOCATIONID = LOC.LOCATIONID) ";
+                                 + " AND NOT EXISTS (SELECT 1 FROM T_WMSSTOCK with(nolock) WHERE " +
+                                                        "  LOCATIONID = LOC.LOCATIONID" +
+                                                        "   and (count-countOut>0 or countin>0 or countOuting>0 ) ) ";  //--已全部下架，但在途数量存在，依然可以当空货架使用
 
                     if (WmsConstants.IN_STOCK_ABC)
                     {
@@ -109,7 +111,8 @@ namespace DeiNiu.wms.Data.Model
                     break;
                 case 400: //free the location that goods count is 0
 
-                    _strSql = " delete from t_wmsstock where plateid is null and countIn=0 and countOuting =0 and "
+                    _strSql = " delete from t_wmsstock where plateid is null and countIn=0 and countOuting =0 " +
+                              " and plateCount=0 and "
                              +" ([count] + countIn -  countout) <=0";
 
                     sqlCmd.CommandText = _strSql; 

Model/wms/data/basic/ErpGoods_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_erpGoods
 ///By wm  
-///on 09/04/2023
+///on 09/09/2023
 /// </summary>
  
 using System;
@@ -46,7 +46,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal string _shortName = String.Empty,_OshortName= String.Empty;   
                     internal int _expiryDays,_OexpiryDays;   
                     internal decimal _price,_Oprice;   
-                    internal int _minOperateCount,_OminOperateCount;   
+                    internal decimal _minOperateCount,_OminOperateCount;   
                     internal string _packingUnit = String.Empty,_OpackingUnit= String.Empty;   
                     internal string _minOperateUnit = String.Empty,_OminOperateUnit= String.Empty;   
                     internal int _isZhitong,_OisZhitong;   
@@ -215,7 +215,7 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_price = value;}    
 		}  
         
-        public  int   minOperateCount{
+        public  decimal   minOperateCount{
 			get {return _minOperateCount;}
 			 set {_minOperateCount = value;}    
 		}  

Model/wms/data/basic/ErpGoods_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_erpGoods
 ///By wm 
-///on 09/04/2023
+///on 09/28/2023
 /// </summary>
  
 
@@ -23,224 +23,809 @@ namespace DeiNiu.wms.Data.Model
                   ErpGoods_base  tmpObj = (ErpGoods_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("entId") && !(dr["entId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._entId =  dr["entId"].ToString() ;
                                 tmpObj._OentId =  dr["entId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["entId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsId =  dr["goodsId"].ToString() ;
                                 tmpObj._OgoodsId =  dr["goodsId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsName") && !(dr["goodsName"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsName =  dr["goodsName"].ToString() ;
                                 tmpObj._OgoodsName =  dr["goodsName"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsName"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("manufacturer") && !(dr["manufacturer"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._manufacturer =  dr["manufacturer"].ToString() ;
                                 tmpObj._Omanufacturer =  dr["manufacturer"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["manufacturer"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("spec") && !(dr["spec"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._spec =  dr["spec"].ToString() ;
                                 tmpObj._Ospec =  dr["spec"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["spec"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("unit") && !(dr["unit"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._unit =  dr["unit"].ToString() ;
                                 tmpObj._Ounit =  dr["unit"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["unit"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("type") && !(dr["type"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._type =  dr["type"].ToString() ;
                                 tmpObj._Otype =  dr["type"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["type"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("regeditCode") && !(dr["regeditCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._regeditCode =  dr["regeditCode"].ToString() ;
                                 tmpObj._OregeditCode =  dr["regeditCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["regeditCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("bigCount") && !(dr["bigCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._bigCount =   Convert.ToDecimal(dr["bigCount"].ToString()); ;
                                 tmpObj._ObigCount =   Convert.ToDecimal(dr["bigCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["bigCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("middleCount") && !(dr["middleCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._middleCount =   Convert.ToDecimal(dr["middleCount"].ToString()); ;
                                 tmpObj._OmiddleCount =   Convert.ToDecimal(dr["middleCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["middleCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("address") && !(dr["address"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._address =  dr["address"].ToString() ;
                                 tmpObj._Oaddress =  dr["address"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["address"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("station") && !(dr["station"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._station =  dr["station"].ToString() ;
                                 tmpObj._Ostation =  dr["station"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["station"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("weight") && !(dr["weight"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._weight =   Convert.ToDecimal(dr["weight"].ToString()); ;
                                 tmpObj._Oweight =   Convert.ToDecimal(dr["weight"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["weight"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("drug_code") && !(dr["drug_code"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._drug_code =  dr["drug_code"].ToString() ;
                                 tmpObj._Odrug_code =  dr["drug_code"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["drug_code"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("isDouChk") && !(dr["isDouChk"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._isDouChk =   Convert.ToBoolean(dr["isDouChk"].ToString()); ;
                                 tmpObj._OisDouChk =   Convert.ToBoolean(dr["isDouChk"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["isDouChk"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("barCode") && !(dr["barCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._barCode =  dr["barCode"].ToString() ;
                                 tmpObj._ObarCode =  dr["barCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["barCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("packingId") && !(dr["packingId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._packingId =   Convert.ToInt32(dr["packingId"].ToString()); ;
                                 tmpObj._OpackingId =   Convert.ToInt32(dr["packingId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["packingId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("pinYin") && !(dr["pinYin"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._pinYin =  dr["pinYin"].ToString() ;
                                 tmpObj._OpinYin =  dr["pinYin"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["pinYin"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("chang") && !(dr["chang"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._chang =   Convert.ToDecimal(dr["chang"].ToString()); ;
                                 tmpObj._Ochang =   Convert.ToDecimal(dr["chang"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["chang"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("kuan") && !(dr["kuan"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._kuan =   Convert.ToDecimal(dr["kuan"].ToString()); ;
                                 tmpObj._Okuan =   Convert.ToDecimal(dr["kuan"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["kuan"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("gao") && !(dr["gao"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._gao =   Convert.ToDecimal(dr["gao"].ToString()); ;
                                 tmpObj._Ogao =   Convert.ToDecimal(dr["gao"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["gao"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("curCycle") && !(dr["curCycle"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._curCycle =   Convert.ToInt32(dr["curCycle"].ToString()); ;
                                 tmpObj._OcurCycle =   Convert.ToInt32(dr["curCycle"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["curCycle"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("isimport") && !(dr["isimport"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._isimport =   Convert.ToBoolean(dr["isimport"].ToString()); ;
                                 tmpObj._Oisimport =   Convert.ToBoolean(dr["isimport"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["isimport"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("shortName") && !(dr["shortName"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._shortName =  dr["shortName"].ToString() ;
                                 tmpObj._OshortName =  dr["shortName"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["shortName"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("expiryDays") && !(dr["expiryDays"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._expiryDays =   Convert.ToInt32(dr["expiryDays"].ToString()); ;
                                 tmpObj._OexpiryDays =   Convert.ToInt32(dr["expiryDays"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["expiryDays"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("price") && !(dr["price"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._price =   Convert.ToDecimal(dr["price"].ToString()); ;
                                 tmpObj._Oprice =   Convert.ToDecimal(dr["price"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["price"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("minOperateCount") && !(dr["minOperateCount"] is DBNull))
                             {
-                                tmpObj._minOperateCount =   Convert.ToInt32(dr["minOperateCount"].ToString()); ;
-                                tmpObj._OminOperateCount =   Convert.ToInt32(dr["minOperateCount"].ToString()); ;
+                              try
+                                { 
+                                tmpObj._minOperateCount =   Convert.ToDecimal(dr["minOperateCount"].ToString()); ;
+                                tmpObj._OminOperateCount =   Convert.ToDecimal(dr["minOperateCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["minOperateCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("packingUnit") && !(dr["packingUnit"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._packingUnit =  dr["packingUnit"].ToString() ;
                                 tmpObj._OpackingUnit =  dr["packingUnit"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["packingUnit"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("minOperateUnit") && !(dr["minOperateUnit"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._minOperateUnit =  dr["minOperateUnit"].ToString() ;
                                 tmpObj._OminOperateUnit =  dr["minOperateUnit"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["minOperateUnit"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("isZhitong") && !(dr["isZhitong"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._isZhitong =   Convert.ToInt32(dr["isZhitong"].ToString()); ;
                                 tmpObj._OisZhitong =   Convert.ToInt32(dr["isZhitong"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["isZhitong"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("isQc") && !(dr["isQc"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._isQc =   Convert.ToBoolean(dr["isQc"].ToString()); ;
                                 tmpObj._OisQc =   Convert.ToBoolean(dr["isQc"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["isQc"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("isManufacture") && !(dr["isManufacture"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._isManufacture =   Convert.ToInt32(dr["isManufacture"].ToString()); ;
                                 tmpObj._OisManufacture =   Convert.ToInt32(dr["isManufacture"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["isManufacture"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("messureModel") && !(dr["messureModel"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._messureModel =   Convert.ToInt32(dr["messureModel"].ToString()); ;
                                 tmpObj._OmessureModel =   Convert.ToInt32(dr["messureModel"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["messureModel"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("approvedBy") && !(dr["approvedBy"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._approvedBy =  dr["approvedBy"].ToString() ;
                                 tmpObj._OapprovedBy =  dr["approvedBy"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["approvedBy"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("region") && !(dr["region"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._region =  dr["region"].ToString() ;
                                 tmpObj._Oregion =  dr["region"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["region"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("status") && !(dr["status"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._status =   Convert.ToInt32(dr["status"].ToString()); ;
                                 tmpObj._Ostatus =   Convert.ToInt32(dr["status"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["status"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("ext1") && !(dr["ext1"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._ext1 =  dr["ext1"].ToString() ;
                                 tmpObj._Oext1 =  dr["ext1"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["ext1"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("ext2") && !(dr["ext2"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._ext2 =  dr["ext2"].ToString() ;
                                 tmpObj._Oext2 =  dr["ext2"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["ext2"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("ext3") && !(dr["ext3"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._ext3 =  dr["ext3"].ToString() ;
                                 tmpObj._Oext3 =  dr["ext3"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["ext3"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("ext4") && !(dr["ext4"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._ext4 =  dr["ext4"].ToString() ;
                                 tmpObj._Oext4 =  dr["ext4"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["ext4"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }

Model/wms/data/basic/WmsGoods_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsGoods
 ///By wm  
-///on 08/17/2023
+///on 09/18/2023
 /// </summary>
  
 using System;
@@ -46,6 +46,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal bool _tempRequired,_OtempRequired;   
                     internal decimal _temperature,_Otemperature;   
                     internal bool _canSeedOut,_OcanSeedOut;   
+                    internal bool _canZhitong,_OcanZhitong;   
                     internal int _Ooperater;   
                     internal string _minOperateUnit = String.Empty,_OminOperateUnit= String.Empty;   
                     internal decimal _minOperateCount,_OminOperateCount;   
@@ -204,6 +205,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_canSeedOut = value;}    
 		}  
         
+        public  bool   canZhitong{
+			get {return _canZhitong;}
+			 set {_canZhitong = value;}    
+		}  
+        
         public  int   operater{
 			get {return _operater;}
 			 set {_operater = value;}    
@@ -243,7 +249,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{goodsId,goodsType,ownerCode,plotId,pIsDateValid,part,full_max,bulkMax,bulkMax1,batchMax1,batchMax2,batchMax3,batchMax4,length,width,height,weight,validTermDays,bigCount,repType,ABC,lowStore,highStore,tempRequired,temperature,canSeedOut,operater,minOperateUnit,minOperateCount,expiryDays}
+      public enum fields{goodsId,goodsType,ownerCode,plotId,pIsDateValid,part,full_max,bulkMax,bulkMax1,batchMax1,batchMax2,batchMax3,batchMax4,length,width,height,weight,validTermDays,bigCount,repType,ABC,lowStore,highStore,tempRequired,temperature,canSeedOut,canZhitong,operater,minOperateUnit,minOperateCount,expiryDays}
       #endregion
     
 	

Model/wms/data/basic/WmsGoods_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsGoods
 ///By wm 
-///on 08/17/2023
+///on 09/18/2023
 /// </summary>
  
 
@@ -155,6 +155,11 @@ namespace DeiNiu.wms.Data.Model
                                 tmpObj._canSeedOut =   Convert.ToBoolean(dr["canSeedOut"].ToString()); ;
                                 tmpObj._OcanSeedOut =   Convert.ToBoolean(dr["canSeedOut"].ToString()); ;
                             }
+                        if (dr.Table.Columns.Contains("canZhitong") && !(dr["canZhitong"] is DBNull))
+                            {
+                                tmpObj._canZhitong =   Convert.ToBoolean(dr["canZhitong"].ToString()); ;
+                                tmpObj._OcanZhitong =   Convert.ToBoolean(dr["canZhitong"].ToString()); ;
+                            }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
@@ -199,7 +204,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSGOODS SET GOODSID = @GOODSID,GOODSTYPE = @GOODSTYPE,OWNERCODE = @OWNERCODE,PLOTID = @PLOTID,PISDATEVALID = @PISDATEVALID,PART = @PART,FULL_MAX = @FULL_MAX,BULKMAX = @BULKMAX,BULKMAX1 = @BULKMAX1,BATCHMAX1 = @BATCHMAX1,BATCHMAX2 = @BATCHMAX2,BATCHMAX3 = @BATCHMAX3,BATCHMAX4 = @BATCHMAX4,LENGTH = @LENGTH,WIDTH = @WIDTH,HEIGHT = @HEIGHT,WEIGHT = @WEIGHT,VALIDTERMDAYS = @VALIDTERMDAYS,BIGCOUNT = @BIGCOUNT,REPTYPE = @REPTYPE,ABC = @ABC,LOWSTORE = @LOWSTORE,HIGHSTORE = @HIGHSTORE,TEMPREQUIRED = @TEMPREQUIRED,TEMPERATURE = @TEMPERATURE,CANSEEDOUT = @CANSEEDOUT,OPERATER = @OPERATER,MINOPERATEUNIT = @MINOPERATEUNIT,MINOPERATECOUNT = @MINOPERATECOUNT,EXPIRYDAYS = @EXPIRYDAYS,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSGOODS SET GOODSID = @GOODSID,GOODSTYPE = @GOODSTYPE,OWNERCODE = @OWNERCODE,PLOTID = @PLOTID,PISDATEVALID = @PISDATEVALID,PART = @PART,FULL_MAX = @FULL_MAX,BULKMAX = @BULKMAX,BULKMAX1 = @BULKMAX1,BATCHMAX1 = @BATCHMAX1,BATCHMAX2 = @BATCHMAX2,BATCHMAX3 = @BATCHMAX3,BATCHMAX4 = @BATCHMAX4,LENGTH = @LENGTH,WIDTH = @WIDTH,HEIGHT = @HEIGHT,WEIGHT = @WEIGHT,VALIDTERMDAYS = @VALIDTERMDAYS,BIGCOUNT = @BIGCOUNT,REPTYPE = @REPTYPE,ABC = @ABC,LOWSTORE = @LOWSTORE,HIGHSTORE = @HIGHSTORE,TEMPREQUIRED = @TEMPREQUIRED,TEMPERATURE = @TEMPERATURE,CANSEEDOUT = @CANSEEDOUT,CANZHITONG = @CANZHITONG,OPERATER = @OPERATER,MINOPERATEUNIT = @MINOPERATEUNIT,MINOPERATECOUNT = @MINOPERATECOUNT,EXPIRYDAYS = @EXPIRYDAYS,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSGOODS {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -262,6 +267,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._tempRequired == null ? "" : "TEMPREQUIRED"  + ",";
              colums+= tmpObj._temperature == null ? "" : "TEMPERATURE"  + ",";
              colums+= tmpObj._canSeedOut == null ? "" : "CANSEEDOUT"  + ",";
+             colums+= tmpObj._canZhitong == null ? "" : "CANZHITONG"  + ",";
              colums+= tmpObj._operater == null ? "" : "OPERATER"  + ",";
              colums+= tmpObj._minOperateUnit == null ? "" : "MINOPERATEUNIT"  + ",";
              colums+= tmpObj._minOperateCount == null ? "" : "MINOPERATECOUNT"  + ",";
@@ -299,6 +305,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._tempRequired == null ? "" : "@TEMPREQUIRED"  + ",";
              values+= tmpObj._temperature == null ? "" : "@TEMPERATURE"  + ",";
              values+= tmpObj._canSeedOut == null ? "" : "@CANSEEDOUT"  + ",";
+             values+= tmpObj._canZhitong == null ? "" : "@CANZHITONG"  + ",";
              values+= tmpObj._operater == null ? "" : "@OPERATER"  + ",";
              values+= tmpObj._minOperateUnit == null ? "" : "@MINOPERATEUNIT"  + ",";
              values+= tmpObj._minOperateCount == null ? "" : "@MINOPERATECOUNT"  + ",";
@@ -414,6 +421,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="CANSEEDOUT  = @CANSEEDOUT," ; 
             }
+            if (tmpObj._canZhitong !=null && tmpObj._canZhitong != tmpObj._OcanZhitong)
+            {
+                updateFields +="CANZHITONG  = @CANZHITONG," ; 
+            }
             if (tmpObj._operater !=null && tmpObj._operater != tmpObj._Ooperater)
             {
                 updateFields +="OPERATER  = @OPERATER," ; 
@@ -482,6 +493,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@TEMPREQUIRED",  VerifyDbnull(tmpObj._tempRequired))  ;
                           oraCmd.Parameters.AddWithValue("@TEMPERATURE",  VerifyDbnull(tmpObj._temperature))  ;
                           oraCmd.Parameters.AddWithValue("@CANSEEDOUT",  VerifyDbnull(tmpObj._canSeedOut))  ;
+                          oraCmd.Parameters.AddWithValue("@CANZHITONG",  VerifyDbnull(tmpObj._canZhitong))  ;
                           oraCmd.Parameters.AddWithValue("@OPERATER",  VerifyDbnull(tmpObj._operater))  ;
                           oraCmd.Parameters.AddWithValue("@MINOPERATEUNIT",  VerifyDbnull(tmpObj._minOperateUnit))  ;
                           oraCmd.Parameters.AddWithValue("@MINOPERATECOUNT",  VerifyDbnull(tmpObj._minOperateCount))  ;
@@ -541,6 +553,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@TEMPERATURE",  VerifyDbnull(tmpObj._temperature))  ;
                        if(tmpObj._canSeedOut!=null)
                        oraCmd.Parameters.AddWithValue("@CANSEEDOUT",  VerifyDbnull(tmpObj._canSeedOut))  ;
+                       if(tmpObj._canZhitong!=null)
+                       oraCmd.Parameters.AddWithValue("@CANZHITONG",  VerifyDbnull(tmpObj._canZhitong))  ;
                        if(tmpObj._operater!=null)
                        oraCmd.Parameters.AddWithValue("@OPERATER",  VerifyDbnull(tmpObj._operater))  ;
                        if(tmpObj._minOperateUnit!=null)

Model/wms/data/basic/WmsInRequestDetail_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsInRequestDetail
 ///By wm  
-///on 08/04/2023
+///on 11/16/2023
 /// </summary>
  
 using System;
@@ -33,6 +33,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal decimal _countIn,_OcountIn;   
                     internal decimal _orderCount,_OorderCount;   
                     internal decimal _receiveCount,_OreceiveCount;   
+                    internal decimal _seedOutCnt,_OseedOutCnt;   
                     internal string _batch = String.Empty,_Obatch= String.Empty;   
                     internal string _productDate = String.Empty,_OproductDate= String.Empty;   
                     internal string _barcode = String.Empty,_Obarcode= String.Empty;   
@@ -49,6 +50,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal int _Ooperater;   
                     internal int _outDetailId,_OoutDetailId;   
                     internal string _poNo = String.Empty,_OpoNo= String.Empty;   
+                    internal string _taskNo = String.Empty,_OtaskNo= String.Empty;   
                        
                     internal string _createtime = String.Empty,_Ocreatetime= String.Empty;   
                        
@@ -138,6 +140,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_receiveCount = value;}    
 		}  
         
+        public  decimal   seedOutCnt{
+			get {return _seedOutCnt;}
+			 set {_seedOutCnt = value;}    
+		}  
+        
         public string  batch{
 			get {return _batch;}
 			 set {_batch = value;}    
@@ -218,6 +225,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_poNo = value;}    
 		}  
         
+        public string  taskNo{
+			get {return _taskNo;}
+			 set {_taskNo = value;}    
+		}  
+        
         public string  lastmodified{
 			get {return _lastmodified;}
 			   
@@ -237,7 +249,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{validId,flowNo,preInOrder,purch_d_id,skuId,skuCode,orderNo,goodsId,goodsName,validCount,countIn,orderCount,receiveCount,batch,productDate,barcode,whType,validbyAccount1,validbyAccount,validDate,regeditCode,manufacturer,state,description,entid,partion,operater,outDetailId,poNo}
+      public enum fields{validId,flowNo,preInOrder,purch_d_id,skuId,skuCode,orderNo,goodsId,goodsName,validCount,countIn,orderCount,receiveCount,seedOutCnt,batch,productDate,barcode,whType,validbyAccount1,validbyAccount,validDate,regeditCode,manufacturer,state,description,entid,partion,operater,outDetailId,poNo,taskNo}
       #endregion
     
 	

Model/wms/data/basic/WmsInRequestDetail_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsInRequestDetail
 ///By wm 
-///on 08/04/2023
+///on 11/16/2023
 /// </summary>
  
 
@@ -23,164 +23,629 @@ namespace DeiNiu.wms.Data.Model
                   WmsInRequestDetail_base  tmpObj = (WmsInRequestDetail_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validId") && !(dr["validId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validId =   Convert.ToInt32(dr["validId"].ToString()); ;
                                 tmpObj._OvalidId =   Convert.ToInt32(dr["validId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("flowNo") && !(dr["flowNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._flowNo =  dr["flowNo"].ToString() ;
                                 tmpObj._OflowNo =  dr["flowNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["flowNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("preInOrder") && !(dr["preInOrder"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._preInOrder =  dr["preInOrder"].ToString() ;
                                 tmpObj._OpreInOrder =  dr["preInOrder"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["preInOrder"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("purch_d_id") && !(dr["purch_d_id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._purch_d_id =   Convert.ToInt32(dr["purch_d_id"].ToString()); ;
                                 tmpObj._Opurch_d_id =   Convert.ToInt32(dr["purch_d_id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["purch_d_id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuId") && !(dr["skuId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
                                 tmpObj._OskuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuCode") && !(dr["skuCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuCode =  dr["skuCode"].ToString() ;
                                 tmpObj._OskuCode =  dr["skuCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderNo") && !(dr["orderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderNo =  dr["orderNo"].ToString() ;
                                 tmpObj._OorderNo =  dr["orderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsId =  dr["goodsId"].ToString() ;
                                 tmpObj._OgoodsId =  dr["goodsId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsName") && !(dr["goodsName"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsName =  dr["goodsName"].ToString() ;
                                 tmpObj._OgoodsName =  dr["goodsName"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsName"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validCount") && !(dr["validCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validCount =   Convert.ToDecimal(dr["validCount"].ToString()); ;
                                 tmpObj._OvalidCount =   Convert.ToDecimal(dr["validCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("countIn") && !(dr["countIn"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._countIn =   Convert.ToDecimal(dr["countIn"].ToString()); ;
                                 tmpObj._OcountIn =   Convert.ToDecimal(dr["countIn"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["countIn"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderCount") && !(dr["orderCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderCount =   Convert.ToDecimal(dr["orderCount"].ToString()); ;
                                 tmpObj._OorderCount =   Convert.ToDecimal(dr["orderCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("receiveCount") && !(dr["receiveCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._receiveCount =   Convert.ToDecimal(dr["receiveCount"].ToString()); ;
                                 tmpObj._OreceiveCount =   Convert.ToDecimal(dr["receiveCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["receiveCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("seedOutCnt") && !(dr["seedOutCnt"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._seedOutCnt =   Convert.ToDecimal(dr["seedOutCnt"].ToString()); ;
+                                tmpObj._OseedOutCnt =   Convert.ToDecimal(dr["seedOutCnt"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["seedOutCnt"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch") && !(dr["batch"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch =  dr["batch"].ToString() ;
                                 tmpObj._Obatch =  dr["batch"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("productDate") && !(dr["productDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._productDate =  dr["productDate"].ToString() ;
                                 tmpObj._OproductDate =  dr["productDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["productDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("barcode") && !(dr["barcode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._barcode =  dr["barcode"].ToString() ;
                                 tmpObj._Obarcode =  dr["barcode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["barcode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("whType") && !(dr["whType"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._whType =   Convert.ToInt32(dr["whType"].ToString()); ;
                                 tmpObj._OwhType =   Convert.ToInt32(dr["whType"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["whType"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validbyAccount1") && !(dr["validbyAccount1"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validbyAccount1 =  dr["validbyAccount1"].ToString() ;
                                 tmpObj._OvalidbyAccount1 =  dr["validbyAccount1"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validbyAccount1"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validbyAccount") && !(dr["validbyAccount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validbyAccount =  dr["validbyAccount"].ToString() ;
                                 tmpObj._OvalidbyAccount =  dr["validbyAccount"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validbyAccount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validDate") && !(dr["validDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validDate =  dr["validDate"].ToString() ;
                                 tmpObj._OvalidDate =  dr["validDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("regeditCode") && !(dr["regeditCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._regeditCode =  dr["regeditCode"].ToString() ;
                                 tmpObj._OregeditCode =  dr["regeditCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["regeditCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("manufacturer") && !(dr["manufacturer"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._manufacturer =  dr["manufacturer"].ToString() ;
                                 tmpObj._Omanufacturer =  dr["manufacturer"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["manufacturer"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("description") && !(dr["description"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._description =  dr["description"].ToString() ;
                                 tmpObj._Odescription =  dr["description"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["description"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("entid") && !(dr["entid"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._entid =  dr["entid"].ToString() ;
                                 tmpObj._Oentid =  dr["entid"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["entid"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("partion") && !(dr["partion"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._partion =   Convert.ToInt32(dr["partion"].ToString()); ;
                                 tmpObj._Opartion =   Convert.ToInt32(dr["partion"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["partion"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("outDetailId") && !(dr["outDetailId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._outDetailId =   Convert.ToInt32(dr["outDetailId"].ToString()); ;
                                 tmpObj._OoutDetailId =   Convert.ToInt32(dr["outDetailId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["outDetailId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("poNo") && !(dr["poNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._poNo =  dr["poNo"].ToString() ;
                                 tmpObj._OpoNo =  dr["poNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["poNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("taskNo") && !(dr["taskNo"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._taskNo =  dr["taskNo"].ToString() ;
+                                tmpObj._OtaskNo =  dr["taskNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["taskNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -194,7 +659,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSINREQUESTDETAIL SET VALIDID = @VALIDID,FLOWNO = @FLOWNO,PREINORDER = @PREINORDER,PURCH_D_ID = @PURCH_D_ID,SKUID = @SKUID,SKUCODE = @SKUCODE,ORDERNO = @ORDERNO,GOODSID = @GOODSID,GOODSNAME = @GOODSNAME,VALIDCOUNT = @VALIDCOUNT,COUNTIN = @COUNTIN,ORDERCOUNT = @ORDERCOUNT,RECEIVECOUNT = @RECEIVECOUNT,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,BARCODE = @BARCODE,WHTYPE = @WHTYPE,VALIDBYACCOUNT1 = @VALIDBYACCOUNT1,VALIDBYACCOUNT = @VALIDBYACCOUNT,VALIDDATE = @VALIDDATE,REGEDITCODE = @REGEDITCODE,MANUFACTURER = @MANUFACTURER,STATE = @STATE,DESCRIPTION = @DESCRIPTION,ENTID = @ENTID,PARTION = @PARTION,OPERATER = @OPERATER,OUTDETAILID = @OUTDETAILID,PONO = @PONO,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSINREQUESTDETAIL SET VALIDID = @VALIDID,FLOWNO = @FLOWNO,PREINORDER = @PREINORDER,PURCH_D_ID = @PURCH_D_ID,SKUID = @SKUID,SKUCODE = @SKUCODE,ORDERNO = @ORDERNO,GOODSID = @GOODSID,GOODSNAME = @GOODSNAME,VALIDCOUNT = @VALIDCOUNT,COUNTIN = @COUNTIN,ORDERCOUNT = @ORDERCOUNT,RECEIVECOUNT = @RECEIVECOUNT,SEEDOUTCNT = @SEEDOUTCNT,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,BARCODE = @BARCODE,WHTYPE = @WHTYPE,VALIDBYACCOUNT1 = @VALIDBYACCOUNT1,VALIDBYACCOUNT = @VALIDBYACCOUNT,VALIDDATE = @VALIDDATE,REGEDITCODE = @REGEDITCODE,MANUFACTURER = @MANUFACTURER,STATE = @STATE,DESCRIPTION = @DESCRIPTION,ENTID = @ENTID,PARTION = @PARTION,OPERATER = @OPERATER,OUTDETAILID = @OUTDETAILID,PONO = @PONO,TASKNO = @TASKNO,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSINREQUESTDETAIL {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -244,6 +709,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._countIn == null ? "" : "COUNTIN"  + ",";
              colums+= tmpObj._orderCount == null ? "" : "ORDERCOUNT"  + ",";
              colums+= tmpObj._receiveCount == null ? "" : "RECEIVECOUNT"  + ",";
+             colums+= tmpObj._seedOutCnt == null ? "" : "SEEDOUTCNT"  + ",";
              colums+= tmpObj._batch == null ? "" : "BATCH"  + ",";
              colums+= tmpObj._productDate == null ? "" : "PRODUCTDATE"  + ",";
              colums+= tmpObj._barcode == null ? "" : "BARCODE"  + ",";
@@ -260,6 +726,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._operater == null ? "" : "OPERATER"  + ",";
              colums+= tmpObj._outDetailId == null ? "" : "OUTDETAILID"  + ",";
              colums+= tmpObj._poNo == null ? "" : "PONO"  + ",";
+             colums+= tmpObj._taskNo == null ? "" : "TASKNO"  + ",";
     	 return colums.Substring(0,colums.Length -1) ;
       
         }
@@ -280,6 +747,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._countIn == null ? "" : "@COUNTIN"  + ",";
              values+= tmpObj._orderCount == null ? "" : "@ORDERCOUNT"  + ",";
              values+= tmpObj._receiveCount == null ? "" : "@RECEIVECOUNT"  + ",";
+             values+= tmpObj._seedOutCnt == null ? "" : "@SEEDOUTCNT"  + ",";
              values+= tmpObj._batch == null ? "" : "@BATCH"  + ",";
              values+= tmpObj._productDate == null ? "" : "@PRODUCTDATE"  + ",";
              values+= tmpObj._barcode == null ? "" : "@BARCODE"  + ",";
@@ -296,6 +764,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._operater == null ? "" : "@OPERATER"  + ",";
              values+= tmpObj._outDetailId == null ? "" : "@OUTDETAILID"  + ",";
              values+= tmpObj._poNo == null ? "" : "@PONO"  + ",";
+             values+= tmpObj._taskNo == null ? "" : "@TASKNO"  + ",";
     	 return values.Substring(0,values.Length -1) ;
  
         }
@@ -355,6 +824,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="RECEIVECOUNT  = @RECEIVECOUNT," ; 
             }
+            if (tmpObj._seedOutCnt !=null && tmpObj._seedOutCnt != tmpObj._OseedOutCnt)
+            {
+                updateFields +="SEEDOUTCNT  = @SEEDOUTCNT," ; 
+            }
             if (tmpObj._batch !=null && tmpObj._batch != tmpObj._Obatch)
             {
                 updateFields +="BATCH  = @BATCH," ; 
@@ -418,6 +891,10 @@ namespace DeiNiu.wms.Data.Model
             if (tmpObj._poNo !=null && tmpObj._poNo != tmpObj._OpoNo)
             {
                 updateFields +="PONO  = @PONO," ; 
+            }
+            if (tmpObj._taskNo !=null && tmpObj._taskNo != tmpObj._OtaskNo)
+            {
+                updateFields +="TASKNO  = @TASKNO," ; 
             }
              updateFields +="LASTMODIFIED  = getdate()" ;                     
            return updateFields  ;
@@ -458,6 +935,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@COUNTIN",  VerifyDbnull(tmpObj._countIn))  ;
                           oraCmd.Parameters.AddWithValue("@ORDERCOUNT",  VerifyDbnull(tmpObj._orderCount))  ;
                           oraCmd.Parameters.AddWithValue("@RECEIVECOUNT",  VerifyDbnull(tmpObj._receiveCount))  ;
+                          oraCmd.Parameters.AddWithValue("@SEEDOUTCNT",  VerifyDbnull(tmpObj._seedOutCnt))  ;
                           oraCmd.Parameters.AddWithValue("@BATCH",  VerifyDbnull(tmpObj._batch))  ;
                           oraCmd.Parameters.AddWithValue("@PRODUCTDATE",  VerifyDbnull(tmpObj._productDate))  ;
                           oraCmd.Parameters.AddWithValue("@BARCODE",  VerifyDbnull(tmpObj._barcode))  ;
@@ -474,6 +952,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@OPERATER",  VerifyDbnull(tmpObj._operater))  ;
                           oraCmd.Parameters.AddWithValue("@OUTDETAILID",  VerifyDbnull(tmpObj._outDetailId))  ;
                           oraCmd.Parameters.AddWithValue("@PONO",  VerifyDbnull(tmpObj._poNo))  ;
+                          oraCmd.Parameters.AddWithValue("@TASKNO",  VerifyDbnull(tmpObj._taskNo))  ;
                          // oraCmd.Parameters.AddWithValue("@LASTMODIFIED", "getdate()")  ;                     
 					return;
                     case (int)op_flag.add:
@@ -503,6 +982,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@ORDERCOUNT",  VerifyDbnull(tmpObj._orderCount))  ;
                        if(tmpObj._receiveCount!=null)
                        oraCmd.Parameters.AddWithValue("@RECEIVECOUNT",  VerifyDbnull(tmpObj._receiveCount))  ;
+                       if(tmpObj._seedOutCnt!=null)
+                       oraCmd.Parameters.AddWithValue("@SEEDOUTCNT",  VerifyDbnull(tmpObj._seedOutCnt))  ;
                        if(tmpObj._batch!=null)
                        oraCmd.Parameters.AddWithValue("@BATCH",  VerifyDbnull(tmpObj._batch))  ;
                        if(tmpObj._productDate!=null)
@@ -535,6 +1016,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@OUTDETAILID",  VerifyDbnull(tmpObj._outDetailId))  ;
                        if(tmpObj._poNo!=null)
                        oraCmd.Parameters.AddWithValue("@PONO",  VerifyDbnull(tmpObj._poNo))  ;
+                       if(tmpObj._taskNo!=null)
+                       oraCmd.Parameters.AddWithValue("@TASKNO",  VerifyDbnull(tmpObj._taskNo))  ;
                 return;
 
 			}

Model/wms/data/basic/WmsOrderDetail_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsOrderDetail
 ///By wm  
-///on 08/25/2023
+///on 10/01/2023
 /// </summary>
  
 using System;
@@ -30,6 +30,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal string _productDate = String.Empty,_OproductDate= String.Empty;   
                     internal string _validDate = String.Empty,_OvalidDate= String.Empty;   
                     internal decimal _count,_Ocount;   
+                    internal decimal _finishedCount,_OfinishedCount;   
                     internal decimal _price,_Oprice;   
                     internal int _state,_Ostate;   
                     internal int _whtype,_Owhtype;   
@@ -112,6 +113,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_count = value;}    
 		}  
         
+        public  decimal   finishedCount{
+			get {return _finishedCount;}
+			 set {_finishedCount = value;}    
+		}  
+        
         public  decimal   price{
 			get {return _price;}
 			 set {_price = value;}    
@@ -171,7 +177,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{orderNo,skuId,skuCode,goodsId,goodsName,unit,batch,productDate,validDate,count,price,state,whtype,toWhType,locationId,partion,description,operater}
+      public enum fields{orderNo,skuId,skuCode,goodsId,goodsName,unit,batch,productDate,validDate,count,finishedCount,price,state,whtype,toWhType,locationId,partion,description,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsOrderDetail_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsOrderDetail
 ///By wm 
-///on 08/25/2023
+///on 10/01/2023
 /// </summary>
  
 
@@ -23,109 +23,413 @@ namespace DeiNiu.wms.Data.Model
                   WmsOrderDetail_base  tmpObj = (WmsOrderDetail_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderNo") && !(dr["orderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderNo =  dr["orderNo"].ToString() ;
                                 tmpObj._OorderNo =  dr["orderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuId") && !(dr["skuId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
                                 tmpObj._OskuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuCode") && !(dr["skuCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuCode =  dr["skuCode"].ToString() ;
                                 tmpObj._OskuCode =  dr["skuCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsId =  dr["goodsId"].ToString() ;
                                 tmpObj._OgoodsId =  dr["goodsId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsName") && !(dr["goodsName"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsName =  dr["goodsName"].ToString() ;
                                 tmpObj._OgoodsName =  dr["goodsName"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsName"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("unit") && !(dr["unit"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._unit =  dr["unit"].ToString() ;
                                 tmpObj._Ounit =  dr["unit"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["unit"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch") && !(dr["batch"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch =  dr["batch"].ToString() ;
                                 tmpObj._Obatch =  dr["batch"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("productDate") && !(dr["productDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._productDate =  dr["productDate"].ToString() ;
                                 tmpObj._OproductDate =  dr["productDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["productDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validDate") && !(dr["validDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validDate =  dr["validDate"].ToString() ;
                                 tmpObj._OvalidDate =  dr["validDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("count") && !(dr["count"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._count =   Convert.ToDecimal(dr["count"].ToString()); ;
                                 tmpObj._Ocount =   Convert.ToDecimal(dr["count"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["count"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("finishedCount") && !(dr["finishedCount"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._finishedCount =   Convert.ToDecimal(dr["finishedCount"].ToString()); ;
+                                tmpObj._OfinishedCount =   Convert.ToDecimal(dr["finishedCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["finishedCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("price") && !(dr["price"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._price =   Convert.ToDecimal(dr["price"].ToString()); ;
                                 tmpObj._Oprice =   Convert.ToDecimal(dr["price"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["price"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("whtype") && !(dr["whtype"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._whtype =   Convert.ToInt32(dr["whtype"].ToString()); ;
                                 tmpObj._Owhtype =   Convert.ToInt32(dr["whtype"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["whtype"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("toWhType") && !(dr["toWhType"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._toWhType =   Convert.ToInt32(dr["toWhType"].ToString()); ;
                                 tmpObj._OtoWhType =   Convert.ToInt32(dr["toWhType"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["toWhType"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("locationId") && !(dr["locationId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._locationId =  dr["locationId"].ToString() ;
                                 tmpObj._OlocationId =  dr["locationId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["locationId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("partion") && !(dr["partion"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._partion =   Convert.ToInt32(dr["partion"].ToString()); ;
                                 tmpObj._Opartion =   Convert.ToInt32(dr["partion"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["partion"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("description") && !(dr["description"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._description =  dr["description"].ToString() ;
                                 tmpObj._Odescription =  dr["description"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["description"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -139,7 +443,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSORDERDETAIL SET ORDERNO = @ORDERNO,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,GOODSNAME = @GOODSNAME,UNIT = @UNIT,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,COUNT = @COUNT,PRICE = @PRICE,STATE = @STATE,WHTYPE = @WHTYPE,TOWHTYPE = @TOWHTYPE,LOCATIONID = @LOCATIONID,PARTION = @PARTION,DESCRIPTION = @DESCRIPTION,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSORDERDETAIL SET ORDERNO = @ORDERNO,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,GOODSNAME = @GOODSNAME,UNIT = @UNIT,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,COUNT = @COUNT,FINISHEDCOUNT = @FINISHEDCOUNT,PRICE = @PRICE,STATE = @STATE,WHTYPE = @WHTYPE,TOWHTYPE = @TOWHTYPE,LOCATIONID = @LOCATIONID,PARTION = @PARTION,DESCRIPTION = @DESCRIPTION,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSORDERDETAIL {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -186,6 +490,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._productDate == null ? "" : "PRODUCTDATE"  + ",";
              colums+= tmpObj._validDate == null ? "" : "VALIDDATE"  + ",";
              colums+= tmpObj._count == null ? "" : "COUNT"  + ",";
+             colums+= tmpObj._finishedCount == null ? "" : "FINISHEDCOUNT"  + ",";
              colums+= tmpObj._price == null ? "" : "PRICE"  + ",";
              colums+= tmpObj._state == null ? "" : "STATE"  + ",";
              colums+= tmpObj._whtype == null ? "" : "WHTYPE"  + ",";
@@ -211,6 +516,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._productDate == null ? "" : "@PRODUCTDATE"  + ",";
              values+= tmpObj._validDate == null ? "" : "@VALIDDATE"  + ",";
              values+= tmpObj._count == null ? "" : "@COUNT"  + ",";
+             values+= tmpObj._finishedCount == null ? "" : "@FINISHEDCOUNT"  + ",";
              values+= tmpObj._price == null ? "" : "@PRICE"  + ",";
              values+= tmpObj._state == null ? "" : "@STATE"  + ",";
              values+= tmpObj._whtype == null ? "" : "@WHTYPE"  + ",";
@@ -266,6 +572,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="COUNT  = @COUNT," ; 
             }
+            if (tmpObj._finishedCount !=null && tmpObj._finishedCount != tmpObj._OfinishedCount)
+            {
+                updateFields +="FINISHEDCOUNT  = @FINISHEDCOUNT," ; 
+            }
             if (tmpObj._price !=null && tmpObj._price != tmpObj._Oprice)
             {
                 updateFields +="PRICE  = @PRICE," ; 
@@ -334,6 +644,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@PRODUCTDATE",  VerifyDbnull(tmpObj._productDate))  ;
                           oraCmd.Parameters.AddWithValue("@VALIDDATE",  VerifyDbnull(tmpObj._validDate))  ;
                           oraCmd.Parameters.AddWithValue("@COUNT",  VerifyDbnull(tmpObj._count))  ;
+                          oraCmd.Parameters.AddWithValue("@FINISHEDCOUNT",  VerifyDbnull(tmpObj._finishedCount))  ;
                           oraCmd.Parameters.AddWithValue("@PRICE",  VerifyDbnull(tmpObj._price))  ;
                           oraCmd.Parameters.AddWithValue("@STATE",  VerifyDbnull(tmpObj._state))  ;
                           oraCmd.Parameters.AddWithValue("@WHTYPE",  VerifyDbnull(tmpObj._whtype))  ;
@@ -365,6 +676,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@VALIDDATE",  VerifyDbnull(tmpObj._validDate))  ;
                        if(tmpObj._count!=null)
                        oraCmd.Parameters.AddWithValue("@COUNT",  VerifyDbnull(tmpObj._count))  ;
+                       if(tmpObj._finishedCount!=null)
+                       oraCmd.Parameters.AddWithValue("@FINISHEDCOUNT",  VerifyDbnull(tmpObj._finishedCount))  ;
                        if(tmpObj._price!=null)
                        oraCmd.Parameters.AddWithValue("@PRICE",  VerifyDbnull(tmpObj._price))  ;
                        if(tmpObj._state!=null)

Model/wms/data/basic/WmsOrderRequest_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsOrderRequest
 ///By wm  
-///on 08/25/2023
+///on 10/19/2023
 /// </summary>
  
 using System;
@@ -30,6 +30,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal string _description = String.Empty,_Odescription= String.Empty;   
                     internal int _Ooperater;   
                     internal int _requestBy,_OrequestBy;   
+                    internal string _requestByName = String.Empty,_OrequestByName= String.Empty;   
                     internal string _requestDate = String.Empty,_OrequestDate= String.Empty;   
                     internal int _approvedBy,_OapprovedBy;   
                     internal string _approveDate = String.Empty,_OapproveDate= String.Empty;   
@@ -114,6 +115,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_requestBy = value;}    
 		}  
         
+        public string  requestByName{
+			get {return _requestByName;}
+			 set {_requestByName = value;}    
+		}  
+        
         public string  requestDate{
 			get {return _requestDate;}
 			 set {_requestDate = value;}    
@@ -183,7 +189,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{orderNo,orderType,orderTypeName,ownerCode,owner,state,orderDate,description,operater,requestBy,requestDate,approvedBy,approveDate,toWareHouse,WhType,toWhType,venderNo,venderName,customerId,referOrderNo}
+      public enum fields{orderNo,orderType,orderTypeName,ownerCode,owner,state,orderDate,description,operater,requestBy,requestByName,requestDate,approvedBy,approveDate,toWareHouse,WhType,toWhType,venderNo,venderName,customerId,referOrderNo}
       #endregion
     
 	

Model/wms/data/basic/WmsOrderRequest_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsOrderRequest
 ///By wm 
-///on 08/25/2023
+///on 10/19/2023
 /// </summary>
  
 
@@ -23,119 +23,449 @@ namespace DeiNiu.wms.Data.Model
                   WmsOrderRequest_base  tmpObj = (WmsOrderRequest_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderNo") && !(dr["orderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderNo =  dr["orderNo"].ToString() ;
                                 tmpObj._OorderNo =  dr["orderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderType") && !(dr["orderType"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderType =   Convert.ToInt32(dr["orderType"].ToString()); ;
                                 tmpObj._OorderType =   Convert.ToInt32(dr["orderType"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderType"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderTypeName") && !(dr["orderTypeName"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderTypeName =  dr["orderTypeName"].ToString() ;
                                 tmpObj._OorderTypeName =  dr["orderTypeName"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderTypeName"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("ownerCode") && !(dr["ownerCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._ownerCode =  dr["ownerCode"].ToString() ;
                                 tmpObj._OownerCode =  dr["ownerCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["ownerCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("owner") && !(dr["owner"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._owner =  dr["owner"].ToString() ;
                                 tmpObj._Oowner =  dr["owner"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["owner"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderDate") && !(dr["orderDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderDate =  dr["orderDate"].ToString() ;
                                 tmpObj._OorderDate =  dr["orderDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("description") && !(dr["description"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._description =  dr["description"].ToString() ;
                                 tmpObj._Odescription =  dr["description"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["description"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("requestBy") && !(dr["requestBy"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._requestBy =   Convert.ToInt32(dr["requestBy"].ToString()); ;
                                 tmpObj._OrequestBy =   Convert.ToInt32(dr["requestBy"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["requestBy"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("requestByName") && !(dr["requestByName"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._requestByName =  dr["requestByName"].ToString() ;
+                                tmpObj._OrequestByName =  dr["requestByName"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["requestByName"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("requestDate") && !(dr["requestDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._requestDate =  dr["requestDate"].ToString() ;
                                 tmpObj._OrequestDate =  dr["requestDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["requestDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("approvedBy") && !(dr["approvedBy"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._approvedBy =   Convert.ToInt32(dr["approvedBy"].ToString()); ;
                                 tmpObj._OapprovedBy =   Convert.ToInt32(dr["approvedBy"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["approvedBy"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("approveDate") && !(dr["approveDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._approveDate =  dr["approveDate"].ToString() ;
                                 tmpObj._OapproveDate =  dr["approveDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["approveDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("toWareHouse") && !(dr["toWareHouse"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._toWareHouse =   Convert.ToInt32(dr["toWareHouse"].ToString()); ;
                                 tmpObj._OtoWareHouse =   Convert.ToInt32(dr["toWareHouse"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["toWareHouse"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("WhType") && !(dr["WhType"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._WhType =   Convert.ToInt32(dr["WhType"].ToString()); ;
                                 tmpObj._OWhType =   Convert.ToInt32(dr["WhType"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["WhType"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("toWhType") && !(dr["toWhType"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._toWhType =   Convert.ToInt32(dr["toWhType"].ToString()); ;
                                 tmpObj._OtoWhType =   Convert.ToInt32(dr["toWhType"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["toWhType"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("venderNo") && !(dr["venderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._venderNo =  dr["venderNo"].ToString() ;
                                 tmpObj._OvenderNo =  dr["venderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["venderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("venderName") && !(dr["venderName"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._venderName =  dr["venderName"].ToString() ;
                                 tmpObj._OvenderName =  dr["venderName"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["venderName"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("customerId") && !(dr["customerId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._customerId =   Convert.ToInt32(dr["customerId"].ToString()); ;
                                 tmpObj._OcustomerId =   Convert.ToInt32(dr["customerId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["customerId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("referOrderNo") && !(dr["referOrderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._referOrderNo =  dr["referOrderNo"].ToString() ;
                                 tmpObj._OreferOrderNo =  dr["referOrderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["referOrderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -149,7 +479,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSORDERREQUEST SET ORDERNO = @ORDERNO,ORDERTYPE = @ORDERTYPE,ORDERTYPENAME = @ORDERTYPENAME,OWNERCODE = @OWNERCODE,OWNER = @OWNER,STATE = @STATE,ORDERDATE = @ORDERDATE,DESCRIPTION = @DESCRIPTION,OPERATER = @OPERATER,REQUESTBY = @REQUESTBY,REQUESTDATE = @REQUESTDATE,APPROVEDBY = @APPROVEDBY,APPROVEDATE = @APPROVEDATE,TOWAREHOUSE = @TOWAREHOUSE,WHTYPE = @WHTYPE,TOWHTYPE = @TOWHTYPE,VENDERNO = @VENDERNO,VENDERNAME = @VENDERNAME,CUSTOMERID = @CUSTOMERID,REFERORDERNO = @REFERORDERNO,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSORDERREQUEST SET ORDERNO = @ORDERNO,ORDERTYPE = @ORDERTYPE,ORDERTYPENAME = @ORDERTYPENAME,OWNERCODE = @OWNERCODE,OWNER = @OWNER,STATE = @STATE,ORDERDATE = @ORDERDATE,DESCRIPTION = @DESCRIPTION,OPERATER = @OPERATER,REQUESTBY = @REQUESTBY,REQUESTBYNAME = @REQUESTBYNAME,REQUESTDATE = @REQUESTDATE,APPROVEDBY = @APPROVEDBY,APPROVEDATE = @APPROVEDATE,TOWAREHOUSE = @TOWAREHOUSE,WHTYPE = @WHTYPE,TOWHTYPE = @TOWHTYPE,VENDERNO = @VENDERNO,VENDERNAME = @VENDERNAME,CUSTOMERID = @CUSTOMERID,REFERORDERNO = @REFERORDERNO,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSORDERREQUEST {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -196,6 +526,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._description == null ? "" : "DESCRIPTION"  + ",";
              colums+= tmpObj._operater == null ? "" : "OPERATER"  + ",";
              colums+= tmpObj._requestBy == null ? "" : "REQUESTBY"  + ",";
+             colums+= tmpObj._requestByName == null ? "" : "REQUESTBYNAME"  + ",";
              colums+= tmpObj._requestDate == null ? "" : "REQUESTDATE"  + ",";
              colums+= tmpObj._approvedBy == null ? "" : "APPROVEDBY"  + ",";
              colums+= tmpObj._approveDate == null ? "" : "APPROVEDATE"  + ",";
@@ -223,6 +554,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._description == null ? "" : "@DESCRIPTION"  + ",";
              values+= tmpObj._operater == null ? "" : "@OPERATER"  + ",";
              values+= tmpObj._requestBy == null ? "" : "@REQUESTBY"  + ",";
+             values+= tmpObj._requestByName == null ? "" : "@REQUESTBYNAME"  + ",";
              values+= tmpObj._requestDate == null ? "" : "@REQUESTDATE"  + ",";
              values+= tmpObj._approvedBy == null ? "" : "@APPROVEDBY"  + ",";
              values+= tmpObj._approveDate == null ? "" : "@APPROVEDATE"  + ",";
@@ -280,6 +612,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="REQUESTBY  = @REQUESTBY," ; 
             }
+            if (tmpObj._requestByName !=null && tmpObj._requestByName != tmpObj._OrequestByName)
+            {
+                updateFields +="REQUESTBYNAME  = @REQUESTBYNAME," ; 
+            }
             if (tmpObj._requestDate !=null && tmpObj._requestDate != tmpObj._OrequestDate)
             {
                 updateFields +="REQUESTDATE  = @REQUESTDATE," ; 
@@ -356,6 +692,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@DESCRIPTION",  VerifyDbnull(tmpObj._description))  ;
                           oraCmd.Parameters.AddWithValue("@OPERATER",  VerifyDbnull(tmpObj._operater))  ;
                           oraCmd.Parameters.AddWithValue("@REQUESTBY",  VerifyDbnull(tmpObj._requestBy))  ;
+                          oraCmd.Parameters.AddWithValue("@REQUESTBYNAME",  VerifyDbnull(tmpObj._requestByName))  ;
                           oraCmd.Parameters.AddWithValue("@REQUESTDATE",  VerifyDbnull(tmpObj._requestDate))  ;
                           oraCmd.Parameters.AddWithValue("@APPROVEDBY",  VerifyDbnull(tmpObj._approvedBy))  ;
                           oraCmd.Parameters.AddWithValue("@APPROVEDATE",  VerifyDbnull(tmpObj._approveDate))  ;
@@ -389,6 +726,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@OPERATER",  VerifyDbnull(tmpObj._operater))  ;
                        if(tmpObj._requestBy!=null)
                        oraCmd.Parameters.AddWithValue("@REQUESTBY",  VerifyDbnull(tmpObj._requestBy))  ;
+                       if(tmpObj._requestByName!=null)
+                       oraCmd.Parameters.AddWithValue("@REQUESTBYNAME",  VerifyDbnull(tmpObj._requestByName))  ;
                        if(tmpObj._requestDate!=null)
                        oraCmd.Parameters.AddWithValue("@REQUESTDATE",  VerifyDbnull(tmpObj._requestDate))  ;
                        if(tmpObj._approvedBy!=null)

Model/wms/data/basic/WmsOutPickDetail_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsOutPickDetail
 ///By wm  
-///on 09/04/2023
+///on 11/17/2023
 /// </summary>
  
 using System;
@@ -36,9 +36,12 @@ namespace  DeiNiu.wms.Data.Model
                     internal decimal _batch1Count,_Obatch1Count;   
                     internal decimal _batch2Count,_Obatch2Count;   
                     internal int _boxcnt,_Oboxcnt;   
+                    internal int _pcs,_Opcs;   
                     internal decimal _batchPicked,_ObatchPicked;   
                     internal decimal _bulkPicked,_ObulkPicked;   
                     internal decimal _seeded,_Oseeded;   
+                    internal decimal _seedOutCnt,_OseedOutCnt;   
+                    internal string _seedTaskNo = String.Empty,_OseedTaskNo= String.Empty;   
                     internal string _productDate = String.Empty,_OproductDate= String.Empty;   
                     internal string _validDate = String.Empty,_OvalidDate= String.Empty;   
                     internal int _state,_Ostate;   
@@ -161,6 +164,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_boxcnt = value;}    
 		}  
         
+        public  int   pcs{
+			get {return _pcs;}
+			 set {_pcs = value;}    
+		}  
+        
         public  decimal   batchPicked{
 			get {return _batchPicked;}
 			 set {_batchPicked = value;}    
@@ -176,6 +184,16 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_seeded = value;}    
 		}  
         
+        public  decimal   seedOutCnt{
+			get {return _seedOutCnt;}
+			 set {_seedOutCnt = value;}    
+		}  
+        
+        public string  seedTaskNo{
+			get {return _seedTaskNo;}
+			 set {_seedTaskNo = value;}    
+		}  
+        
         public string  productDate{
 			get {return _productDate;}
 			 set {_productDate = value;}    
@@ -285,7 +303,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{pickOrderNo,seedsPickNo,customerId,customerName,custAddress,skuId,skuCode,goodsId,batch,lackCount,count,locationId,bulkCount,batch1Count,batch2Count,boxcnt,batchPicked,bulkPicked,seeded,productDate,validDate,state,bulkPickState,batchPickState,whtype,description,confirmedCount,checkedBy,checkedBy1,validReason,validSolution,validRemark,solutionRemark,checkedTime,price,salesperson,operater}
+      public enum fields{pickOrderNo,seedsPickNo,customerId,customerName,custAddress,skuId,skuCode,goodsId,batch,lackCount,count,locationId,bulkCount,batch1Count,batch2Count,boxcnt,pcs,batchPicked,bulkPicked,seeded,seedOutCnt,seedTaskNo,productDate,validDate,state,bulkPickState,batchPickState,whtype,description,confirmedCount,checkedBy,checkedBy1,validReason,validSolution,validRemark,solutionRemark,checkedTime,price,salesperson,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsOutPickDetail_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsOutPickDetail
 ///By wm 
-///on 09/04/2023
+///on 11/17/2023
 /// </summary>
  
 
@@ -23,204 +23,791 @@ namespace DeiNiu.wms.Data.Model
                   WmsOutPickDetail_base  tmpObj = (WmsOutPickDetail_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("pickOrderNo") && !(dr["pickOrderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._pickOrderNo =  dr["pickOrderNo"].ToString() ;
                                 tmpObj._OpickOrderNo =  dr["pickOrderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["pickOrderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("seedsPickNo") && !(dr["seedsPickNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._seedsPickNo =  dr["seedsPickNo"].ToString() ;
                                 tmpObj._OseedsPickNo =  dr["seedsPickNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["seedsPickNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("customerId") && !(dr["customerId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._customerId =  dr["customerId"].ToString() ;
                                 tmpObj._OcustomerId =  dr["customerId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["customerId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("customerName") && !(dr["customerName"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._customerName =  dr["customerName"].ToString() ;
                                 tmpObj._OcustomerName =  dr["customerName"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["customerName"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("custAddress") && !(dr["custAddress"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._custAddress =  dr["custAddress"].ToString() ;
                                 tmpObj._OcustAddress =  dr["custAddress"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["custAddress"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuId") && !(dr["skuId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
                                 tmpObj._OskuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuCode") && !(dr["skuCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuCode =  dr["skuCode"].ToString() ;
                                 tmpObj._OskuCode =  dr["skuCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsId =  dr["goodsId"].ToString() ;
                                 tmpObj._OgoodsId =  dr["goodsId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch") && !(dr["batch"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch =  dr["batch"].ToString() ;
                                 tmpObj._Obatch =  dr["batch"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lackCount") && !(dr["lackCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lackCount =   Convert.ToDecimal(dr["lackCount"].ToString()); ;
                                 tmpObj._OlackCount =   Convert.ToDecimal(dr["lackCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lackCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("count") && !(dr["count"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._count =   Convert.ToDecimal(dr["count"].ToString()); ;
                                 tmpObj._Ocount =   Convert.ToDecimal(dr["count"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["count"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("locationId") && !(dr["locationId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._locationId =  dr["locationId"].ToString() ;
                                 tmpObj._OlocationId =  dr["locationId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["locationId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("bulkCount") && !(dr["bulkCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._bulkCount =   Convert.ToDecimal(dr["bulkCount"].ToString()); ;
                                 tmpObj._ObulkCount =   Convert.ToDecimal(dr["bulkCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["bulkCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch1Count") && !(dr["batch1Count"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch1Count =   Convert.ToDecimal(dr["batch1Count"].ToString()); ;
                                 tmpObj._Obatch1Count =   Convert.ToDecimal(dr["batch1Count"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch1Count"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch2Count") && !(dr["batch2Count"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch2Count =   Convert.ToDecimal(dr["batch2Count"].ToString()); ;
                                 tmpObj._Obatch2Count =   Convert.ToDecimal(dr["batch2Count"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch2Count"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("boxcnt") && !(dr["boxcnt"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._boxcnt =   Convert.ToInt32(dr["boxcnt"].ToString()); ;
                                 tmpObj._Oboxcnt =   Convert.ToInt32(dr["boxcnt"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["boxcnt"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("pcs") && !(dr["pcs"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._pcs =   Convert.ToInt32(dr["pcs"].ToString()); ;
+                                tmpObj._Opcs =   Convert.ToInt32(dr["pcs"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["pcs"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batchPicked") && !(dr["batchPicked"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batchPicked =   Convert.ToDecimal(dr["batchPicked"].ToString()); ;
                                 tmpObj._ObatchPicked =   Convert.ToDecimal(dr["batchPicked"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batchPicked"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("bulkPicked") && !(dr["bulkPicked"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._bulkPicked =   Convert.ToDecimal(dr["bulkPicked"].ToString()); ;
                                 tmpObj._ObulkPicked =   Convert.ToDecimal(dr["bulkPicked"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["bulkPicked"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("seeded") && !(dr["seeded"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._seeded =   Convert.ToDecimal(dr["seeded"].ToString()); ;
                                 tmpObj._Oseeded =   Convert.ToDecimal(dr["seeded"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["seeded"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("seedOutCnt") && !(dr["seedOutCnt"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._seedOutCnt =   Convert.ToDecimal(dr["seedOutCnt"].ToString()); ;
+                                tmpObj._OseedOutCnt =   Convert.ToDecimal(dr["seedOutCnt"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["seedOutCnt"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("seedTaskNo") && !(dr["seedTaskNo"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._seedTaskNo =  dr["seedTaskNo"].ToString() ;
+                                tmpObj._OseedTaskNo =  dr["seedTaskNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["seedTaskNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("productDate") && !(dr["productDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._productDate =  dr["productDate"].ToString() ;
                                 tmpObj._OproductDate =  dr["productDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["productDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validDate") && !(dr["validDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validDate =  dr["validDate"].ToString() ;
                                 tmpObj._OvalidDate =  dr["validDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("bulkPickState") && !(dr["bulkPickState"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._bulkPickState =   Convert.ToInt32(dr["bulkPickState"].ToString()); ;
                                 tmpObj._ObulkPickState =   Convert.ToInt32(dr["bulkPickState"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["bulkPickState"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batchPickState") && !(dr["batchPickState"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batchPickState =   Convert.ToInt32(dr["batchPickState"].ToString()); ;
                                 tmpObj._ObatchPickState =   Convert.ToInt32(dr["batchPickState"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batchPickState"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("whtype") && !(dr["whtype"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._whtype =   Convert.ToInt32(dr["whtype"].ToString()); ;
                                 tmpObj._Owhtype =   Convert.ToInt32(dr["whtype"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["whtype"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("description") && !(dr["description"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._description =  dr["description"].ToString() ;
                                 tmpObj._Odescription =  dr["description"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["description"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("confirmedCount") && !(dr["confirmedCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._confirmedCount =   Convert.ToDecimal(dr["confirmedCount"].ToString()); ;
                                 tmpObj._OconfirmedCount =   Convert.ToDecimal(dr["confirmedCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["confirmedCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("checkedBy") && !(dr["checkedBy"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._checkedBy =   Convert.ToInt32(dr["checkedBy"].ToString()); ;
                                 tmpObj._OcheckedBy =   Convert.ToInt32(dr["checkedBy"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["checkedBy"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("checkedBy1") && !(dr["checkedBy1"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._checkedBy1 =   Convert.ToInt32(dr["checkedBy1"].ToString()); ;
                                 tmpObj._OcheckedBy1 =   Convert.ToInt32(dr["checkedBy1"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["checkedBy1"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validReason") && !(dr["validReason"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validReason =   Convert.ToInt32(dr["validReason"].ToString()); ;
                                 tmpObj._OvalidReason =   Convert.ToInt32(dr["validReason"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validReason"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validSolution") && !(dr["validSolution"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validSolution =   Convert.ToInt32(dr["validSolution"].ToString()); ;
                                 tmpObj._OvalidSolution =   Convert.ToInt32(dr["validSolution"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validSolution"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validRemark") && !(dr["validRemark"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validRemark =  dr["validRemark"].ToString() ;
                                 tmpObj._OvalidRemark =  dr["validRemark"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validRemark"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("solutionRemark") && !(dr["solutionRemark"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._solutionRemark =  dr["solutionRemark"].ToString() ;
                                 tmpObj._OsolutionRemark =  dr["solutionRemark"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["solutionRemark"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("checkedTime") && !(dr["checkedTime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._checkedTime =  dr["checkedTime"].ToString() ;
                                 tmpObj._OcheckedTime =  dr["checkedTime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["checkedTime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("price") && !(dr["price"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._price =   Convert.ToDecimal(dr["price"].ToString()); ;
                                 tmpObj._Oprice =   Convert.ToDecimal(dr["price"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["price"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("salesperson") && !(dr["salesperson"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._salesperson =  dr["salesperson"].ToString() ;
                                 tmpObj._Osalesperson =  dr["salesperson"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["salesperson"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -234,7 +821,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSOUTPICKDETAIL SET PICKORDERNO = @PICKORDERNO,SEEDSPICKNO = @SEEDSPICKNO,CUSTOMERID = @CUSTOMERID,CUSTOMERNAME = @CUSTOMERNAME,CUSTADDRESS = @CUSTADDRESS,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,LACKCOUNT = @LACKCOUNT,COUNT = @COUNT,LOCATIONID = @LOCATIONID,BULKCOUNT = @BULKCOUNT,BATCH1COUNT = @BATCH1COUNT,BATCH2COUNT = @BATCH2COUNT,BOXCNT = @BOXCNT,BATCHPICKED = @BATCHPICKED,BULKPICKED = @BULKPICKED,SEEDED = @SEEDED,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,STATE = @STATE,BULKPICKSTATE = @BULKPICKSTATE,BATCHPICKSTATE = @BATCHPICKSTATE,WHTYPE = @WHTYPE,DESCRIPTION = @DESCRIPTION,CONFIRMEDCOUNT = @CONFIRMEDCOUNT,CHECKEDBY = @CHECKEDBY,CHECKEDBY1 = @CHECKEDBY1,VALIDREASON = @VALIDREASON,VALIDSOLUTION = @VALIDSOLUTION,VALIDREMARK = @VALIDREMARK,SOLUTIONREMARK = @SOLUTIONREMARK,CHECKEDTIME = @CHECKEDTIME,PRICE = @PRICE,SALESPERSON = @SALESPERSON,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSOUTPICKDETAIL SET PICKORDERNO = @PICKORDERNO,SEEDSPICKNO = @SEEDSPICKNO,CUSTOMERID = @CUSTOMERID,CUSTOMERNAME = @CUSTOMERNAME,CUSTADDRESS = @CUSTADDRESS,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,LACKCOUNT = @LACKCOUNT,COUNT = @COUNT,LOCATIONID = @LOCATIONID,BULKCOUNT = @BULKCOUNT,BATCH1COUNT = @BATCH1COUNT,BATCH2COUNT = @BATCH2COUNT,BOXCNT = @BOXCNT,PCS = @PCS,BATCHPICKED = @BATCHPICKED,BULKPICKED = @BULKPICKED,SEEDED = @SEEDED,SEEDOUTCNT = @SEEDOUTCNT,SEEDTASKNO = @SEEDTASKNO,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,STATE = @STATE,BULKPICKSTATE = @BULKPICKSTATE,BATCHPICKSTATE = @BATCHPICKSTATE,WHTYPE = @WHTYPE,DESCRIPTION = @DESCRIPTION,CONFIRMEDCOUNT = @CONFIRMEDCOUNT,CHECKEDBY = @CHECKEDBY,CHECKEDBY1 = @CHECKEDBY1,VALIDREASON = @VALIDREASON,VALIDSOLUTION = @VALIDSOLUTION,VALIDREMARK = @VALIDREMARK,SOLUTIONREMARK = @SOLUTIONREMARK,CHECKEDTIME = @CHECKEDTIME,PRICE = @PRICE,SALESPERSON = @SALESPERSON,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSOUTPICKDETAIL {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -287,9 +874,12 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._batch1Count == null ? "" : "BATCH1COUNT"  + ",";
              colums+= tmpObj._batch2Count == null ? "" : "BATCH2COUNT"  + ",";
              colums+= tmpObj._boxcnt == null ? "" : "BOXCNT"  + ",";
+             colums+= tmpObj._pcs == null ? "" : "PCS"  + ",";
              colums+= tmpObj._batchPicked == null ? "" : "BATCHPICKED"  + ",";
              colums+= tmpObj._bulkPicked == null ? "" : "BULKPICKED"  + ",";
              colums+= tmpObj._seeded == null ? "" : "SEEDED"  + ",";
+             colums+= tmpObj._seedOutCnt == null ? "" : "SEEDOUTCNT"  + ",";
+             colums+= tmpObj._seedTaskNo == null ? "" : "SEEDTASKNO"  + ",";
              colums+= tmpObj._productDate == null ? "" : "PRODUCTDATE"  + ",";
              colums+= tmpObj._validDate == null ? "" : "VALIDDATE"  + ",";
              colums+= tmpObj._state == null ? "" : "STATE"  + ",";
@@ -331,9 +921,12 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._batch1Count == null ? "" : "@BATCH1COUNT"  + ",";
              values+= tmpObj._batch2Count == null ? "" : "@BATCH2COUNT"  + ",";
              values+= tmpObj._boxcnt == null ? "" : "@BOXCNT"  + ",";
+             values+= tmpObj._pcs == null ? "" : "@PCS"  + ",";
              values+= tmpObj._batchPicked == null ? "" : "@BATCHPICKED"  + ",";
              values+= tmpObj._bulkPicked == null ? "" : "@BULKPICKED"  + ",";
              values+= tmpObj._seeded == null ? "" : "@SEEDED"  + ",";
+             values+= tmpObj._seedOutCnt == null ? "" : "@SEEDOUTCNT"  + ",";
+             values+= tmpObj._seedTaskNo == null ? "" : "@SEEDTASKNO"  + ",";
              values+= tmpObj._productDate == null ? "" : "@PRODUCTDATE"  + ",";
              values+= tmpObj._validDate == null ? "" : "@VALIDDATE"  + ",";
              values+= tmpObj._state == null ? "" : "@STATE"  + ",";
@@ -423,6 +1016,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="BOXCNT  = @BOXCNT," ; 
             }
+            if (tmpObj._pcs !=null && tmpObj._pcs != tmpObj._Opcs)
+            {
+                updateFields +="PCS  = @PCS," ; 
+            }
             if (tmpObj._batchPicked !=null && tmpObj._batchPicked != tmpObj._ObatchPicked)
             {
                 updateFields +="BATCHPICKED  = @BATCHPICKED," ; 
@@ -435,6 +1032,14 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="SEEDED  = @SEEDED," ; 
             }
+            if (tmpObj._seedOutCnt !=null && tmpObj._seedOutCnt != tmpObj._OseedOutCnt)
+            {
+                updateFields +="SEEDOUTCNT  = @SEEDOUTCNT," ; 
+            }
+            if (tmpObj._seedTaskNo !=null && tmpObj._seedTaskNo != tmpObj._OseedTaskNo)
+            {
+                updateFields +="SEEDTASKNO  = @SEEDTASKNO," ; 
+            }
             if (tmpObj._productDate !=null && tmpObj._productDate != tmpObj._OproductDate)
             {
                 updateFields +="PRODUCTDATE  = @PRODUCTDATE," ; 
@@ -549,9 +1154,12 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@BATCH1COUNT",  VerifyDbnull(tmpObj._batch1Count))  ;
                           oraCmd.Parameters.AddWithValue("@BATCH2COUNT",  VerifyDbnull(tmpObj._batch2Count))  ;
                           oraCmd.Parameters.AddWithValue("@BOXCNT",  VerifyDbnull(tmpObj._boxcnt))  ;
+                          oraCmd.Parameters.AddWithValue("@PCS",  VerifyDbnull(tmpObj._pcs))  ;
                           oraCmd.Parameters.AddWithValue("@BATCHPICKED",  VerifyDbnull(tmpObj._batchPicked))  ;
                           oraCmd.Parameters.AddWithValue("@BULKPICKED",  VerifyDbnull(tmpObj._bulkPicked))  ;
                           oraCmd.Parameters.AddWithValue("@SEEDED",  VerifyDbnull(tmpObj._seeded))  ;
+                          oraCmd.Parameters.AddWithValue("@SEEDOUTCNT",  VerifyDbnull(tmpObj._seedOutCnt))  ;
+                          oraCmd.Parameters.AddWithValue("@SEEDTASKNO",  VerifyDbnull(tmpObj._seedTaskNo))  ;
                           oraCmd.Parameters.AddWithValue("@PRODUCTDATE",  VerifyDbnull(tmpObj._productDate))  ;
                           oraCmd.Parameters.AddWithValue("@VALIDDATE",  VerifyDbnull(tmpObj._validDate))  ;
                           oraCmd.Parameters.AddWithValue("@STATE",  VerifyDbnull(tmpObj._state))  ;
@@ -605,12 +1213,18 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@BATCH2COUNT",  VerifyDbnull(tmpObj._batch2Count))  ;
                        if(tmpObj._boxcnt!=null)
                        oraCmd.Parameters.AddWithValue("@BOXCNT",  VerifyDbnull(tmpObj._boxcnt))  ;
+                       if(tmpObj._pcs!=null)
+                       oraCmd.Parameters.AddWithValue("@PCS",  VerifyDbnull(tmpObj._pcs))  ;
                        if(tmpObj._batchPicked!=null)
                        oraCmd.Parameters.AddWithValue("@BATCHPICKED",  VerifyDbnull(tmpObj._batchPicked))  ;
                        if(tmpObj._bulkPicked!=null)
                        oraCmd.Parameters.AddWithValue("@BULKPICKED",  VerifyDbnull(tmpObj._bulkPicked))  ;
                        if(tmpObj._seeded!=null)
                        oraCmd.Parameters.AddWithValue("@SEEDED",  VerifyDbnull(tmpObj._seeded))  ;
+                       if(tmpObj._seedOutCnt!=null)
+                       oraCmd.Parameters.AddWithValue("@SEEDOUTCNT",  VerifyDbnull(tmpObj._seedOutCnt))  ;
+                       if(tmpObj._seedTaskNo!=null)
+                       oraCmd.Parameters.AddWithValue("@SEEDTASKNO",  VerifyDbnull(tmpObj._seedTaskNo))  ;
                        if(tmpObj._productDate!=null)
                        oraCmd.Parameters.AddWithValue("@PRODUCTDATE",  VerifyDbnull(tmpObj._productDate))  ;
                        if(tmpObj._validDate!=null)

Model/wms/data/basic/WmsOutPickDetail_tmp_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsOutPickDetail_tmp
 ///By wm  
-///on 09/04/2023
+///on 09/09/2023
 /// </summary>
  
 using System;
@@ -41,6 +41,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal decimal _batch1Count,_Obatch1Count;   
                     internal decimal _batch2Count,_Obatch2Count;   
                     internal int _boxcnt,_Oboxcnt;   
+                    internal int _pcs,_Opcs;   
                     internal decimal _batchPicked,_ObatchPicked;   
                     internal decimal _bulkPicked,_ObulkPicked;   
                     internal decimal _seeded,_Oseeded;   
@@ -191,6 +192,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_boxcnt = value;}    
 		}  
         
+        public  int   pcs{
+			get {return _pcs;}
+			 set {_pcs = value;}    
+		}  
+        
         public  decimal   batchPicked{
 			get {return _batchPicked;}
 			 set {_batchPicked = value;}    
@@ -315,7 +321,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{desk,orderState,waveOrder,seedsPickNo,seedsPort,seedsLabelId,pickOrderNo,customerId,customerName,custAddress,skuId,skuCode,goodsId,batch,lackCount,count,locationId,bulkCount,batch1Count,batch2Count,boxcnt,batchPicked,bulkPicked,seeded,productDate,validDate,state,bulkPickState,batchPickState,whtype,description,confirmedCount,checkedBy,checkedBy1,validReason,validSolution,validRemark,solutionRemark,checkedTime,price,salesperson,operater}
+      public enum fields{desk,orderState,waveOrder,seedsPickNo,seedsPort,seedsLabelId,pickOrderNo,customerId,customerName,custAddress,skuId,skuCode,goodsId,batch,lackCount,count,locationId,bulkCount,batch1Count,batch2Count,boxcnt,pcs,batchPicked,bulkPicked,seeded,productDate,validDate,state,bulkPickState,batchPickState,whtype,description,confirmedCount,checkedBy,checkedBy1,validReason,validSolution,validRemark,solutionRemark,checkedTime,price,salesperson,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsOutPickDetail_tmp_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsOutPickDetail_tmp
 ///By wm 
-///on 09/04/2023
+///on 09/09/2023
 /// </summary>
  
 
@@ -130,6 +130,11 @@ namespace DeiNiu.wms.Data.Model
                                 tmpObj._boxcnt =   Convert.ToInt32(dr["boxcnt"].ToString()); ;
                                 tmpObj._Oboxcnt =   Convert.ToInt32(dr["boxcnt"].ToString()); ;
                             }
+                        if (dr.Table.Columns.Contains("pcs") && !(dr["pcs"] is DBNull))
+                            {
+                                tmpObj._pcs =   Convert.ToInt32(dr["pcs"].ToString()); ;
+                                tmpObj._Opcs =   Convert.ToInt32(dr["pcs"].ToString()); ;
+                            }
                         if (dr.Table.Columns.Contains("batchPicked") && !(dr["batchPicked"] is DBNull))
                             {
                                 tmpObj._batchPicked =   Convert.ToDecimal(dr["batchPicked"].ToString()); ;
@@ -259,7 +264,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSOUTPICKDETAIL_TMP SET DESK = @DESK,ORDERSTATE = @ORDERSTATE,WAVEORDER = @WAVEORDER,SEEDSPICKNO = @SEEDSPICKNO,SEEDSPORT = @SEEDSPORT,SEEDSLABELID = @SEEDSLABELID,PICKORDERNO = @PICKORDERNO,CUSTOMERID = @CUSTOMERID,CUSTOMERNAME = @CUSTOMERNAME,CUSTADDRESS = @CUSTADDRESS,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,LACKCOUNT = @LACKCOUNT,COUNT = @COUNT,LOCATIONID = @LOCATIONID,BULKCOUNT = @BULKCOUNT,BATCH1COUNT = @BATCH1COUNT,BATCH2COUNT = @BATCH2COUNT,BOXCNT = @BOXCNT,BATCHPICKED = @BATCHPICKED,BULKPICKED = @BULKPICKED,SEEDED = @SEEDED,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,STATE = @STATE,BULKPICKSTATE = @BULKPICKSTATE,BATCHPICKSTATE = @BATCHPICKSTATE,WHTYPE = @WHTYPE,DESCRIPTION = @DESCRIPTION,CONFIRMEDCOUNT = @CONFIRMEDCOUNT,CHECKEDBY = @CHECKEDBY,CHECKEDBY1 = @CHECKEDBY1,VALIDREASON = @VALIDREASON,VALIDSOLUTION = @VALIDSOLUTION,VALIDREMARK = @VALIDREMARK,SOLUTIONREMARK = @SOLUTIONREMARK,CHECKEDTIME = @CHECKEDTIME,PRICE = @PRICE,SALESPERSON = @SALESPERSON,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSOUTPICKDETAIL_TMP SET DESK = @DESK,ORDERSTATE = @ORDERSTATE,WAVEORDER = @WAVEORDER,SEEDSPICKNO = @SEEDSPICKNO,SEEDSPORT = @SEEDSPORT,SEEDSLABELID = @SEEDSLABELID,PICKORDERNO = @PICKORDERNO,CUSTOMERID = @CUSTOMERID,CUSTOMERNAME = @CUSTOMERNAME,CUSTADDRESS = @CUSTADDRESS,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,LACKCOUNT = @LACKCOUNT,COUNT = @COUNT,LOCATIONID = @LOCATIONID,BULKCOUNT = @BULKCOUNT,BATCH1COUNT = @BATCH1COUNT,BATCH2COUNT = @BATCH2COUNT,BOXCNT = @BOXCNT,PCS = @PCS,BATCHPICKED = @BATCHPICKED,BULKPICKED = @BULKPICKED,SEEDED = @SEEDED,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,STATE = @STATE,BULKPICKSTATE = @BULKPICKSTATE,BATCHPICKSTATE = @BATCHPICKSTATE,WHTYPE = @WHTYPE,DESCRIPTION = @DESCRIPTION,CONFIRMEDCOUNT = @CONFIRMEDCOUNT,CHECKEDBY = @CHECKEDBY,CHECKEDBY1 = @CHECKEDBY1,VALIDREASON = @VALIDREASON,VALIDSOLUTION = @VALIDSOLUTION,VALIDREMARK = @VALIDREMARK,SOLUTIONREMARK = @SOLUTIONREMARK,CHECKEDTIME = @CHECKEDTIME,PRICE = @PRICE,SALESPERSON = @SALESPERSON,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSOUTPICKDETAIL_TMP {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -317,6 +322,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._batch1Count == null ? "" : "BATCH1COUNT"  + ",";
              colums+= tmpObj._batch2Count == null ? "" : "BATCH2COUNT"  + ",";
              colums+= tmpObj._boxcnt == null ? "" : "BOXCNT"  + ",";
+             colums+= tmpObj._pcs == null ? "" : "PCS"  + ",";
              colums+= tmpObj._batchPicked == null ? "" : "BATCHPICKED"  + ",";
              colums+= tmpObj._bulkPicked == null ? "" : "BULKPICKED"  + ",";
              colums+= tmpObj._seeded == null ? "" : "SEEDED"  + ",";
@@ -366,6 +372,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._batch1Count == null ? "" : "@BATCH1COUNT"  + ",";
              values+= tmpObj._batch2Count == null ? "" : "@BATCH2COUNT"  + ",";
              values+= tmpObj._boxcnt == null ? "" : "@BOXCNT"  + ",";
+             values+= tmpObj._pcs == null ? "" : "@PCS"  + ",";
              values+= tmpObj._batchPicked == null ? "" : "@BATCHPICKED"  + ",";
              values+= tmpObj._bulkPicked == null ? "" : "@BULKPICKED"  + ",";
              values+= tmpObj._seeded == null ? "" : "@SEEDED"  + ",";
@@ -478,6 +485,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="BOXCNT  = @BOXCNT," ; 
             }
+            if (tmpObj._pcs !=null && tmpObj._pcs != tmpObj._Opcs)
+            {
+                updateFields +="PCS  = @PCS," ; 
+            }
             if (tmpObj._batchPicked !=null && tmpObj._batchPicked != tmpObj._ObatchPicked)
             {
                 updateFields +="BATCHPICKED  = @BATCHPICKED," ; 
@@ -609,6 +620,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@BATCH1COUNT",  VerifyDbnull(tmpObj._batch1Count))  ;
                           oraCmd.Parameters.AddWithValue("@BATCH2COUNT",  VerifyDbnull(tmpObj._batch2Count))  ;
                           oraCmd.Parameters.AddWithValue("@BOXCNT",  VerifyDbnull(tmpObj._boxcnt))  ;
+                          oraCmd.Parameters.AddWithValue("@PCS",  VerifyDbnull(tmpObj._pcs))  ;
                           oraCmd.Parameters.AddWithValue("@BATCHPICKED",  VerifyDbnull(tmpObj._batchPicked))  ;
                           oraCmd.Parameters.AddWithValue("@BULKPICKED",  VerifyDbnull(tmpObj._bulkPicked))  ;
                           oraCmd.Parameters.AddWithValue("@SEEDED",  VerifyDbnull(tmpObj._seeded))  ;
@@ -675,6 +687,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@BATCH2COUNT",  VerifyDbnull(tmpObj._batch2Count))  ;
                        if(tmpObj._boxcnt!=null)
                        oraCmd.Parameters.AddWithValue("@BOXCNT",  VerifyDbnull(tmpObj._boxcnt))  ;
+                       if(tmpObj._pcs!=null)
+                       oraCmd.Parameters.AddWithValue("@PCS",  VerifyDbnull(tmpObj._pcs))  ;
                        if(tmpObj._batchPicked!=null)
                        oraCmd.Parameters.AddWithValue("@BATCHPICKED",  VerifyDbnull(tmpObj._batchPicked))  ;
                        if(tmpObj._bulkPicked!=null)

Model/wms/data/basic/WmsOutPickLable_tmp_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsOutPickLable_tmp
 ///By wm  
-///on 08/04/2023
+///on 09/20/2023
 /// </summary>
  
 using System;
@@ -27,6 +27,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal int _recordId,_OrecordId;   
                     internal decimal _count,_Ocount;   
                     internal string _locationId = String.Empty,_OlocationId= String.Empty;   
+                    internal int _portId,_OportId;   
                     internal int _elabId,_OelabId;   
                     internal int _port,_Oport;   
                     internal int _elabAddress,_OelabAddress;   
@@ -98,6 +99,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_locationId = value;}    
 		}  
         
+        public  int   portId{
+			get {return _portId;}
+			 set {_portId = value;}    
+		}  
+        
         public  int   elabId{
 			get {return _elabId;}
 			 set {_elabId = value;}    
@@ -177,7 +183,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{pickOrderNo,dpsOrder,color,orderDetailId,recordId,count,locationId,elabId,port,elabAddress,state,pickCount,description,partion,plate,calVol,minOperateUnit,minOperateCount,operater}
+      public enum fields{pickOrderNo,dpsOrder,color,orderDetailId,recordId,count,locationId,portId,elabId,port,elabAddress,state,pickCount,description,partion,plate,calVol,minOperateUnit,minOperateCount,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsOutPickLable_tmp_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsOutPickLable_tmp
 ///By wm 
-///on 08/04/2023
+///on 09/20/2023
 /// </summary>
  
 
@@ -60,6 +60,11 @@ namespace DeiNiu.wms.Data.Model
                                 tmpObj._locationId =  dr["locationId"].ToString() ;
                                 tmpObj._OlocationId =  dr["locationId"].ToString() ;
                             }
+                        if (dr.Table.Columns.Contains("portId") && !(dr["portId"] is DBNull))
+                            {
+                                tmpObj._portId =   Convert.ToInt32(dr["portId"].ToString()); ;
+                                tmpObj._OportId =   Convert.ToInt32(dr["portId"].ToString()); ;
+                            }
                         if (dr.Table.Columns.Contains("elabId") && !(dr["elabId"] is DBNull))
                             {
                                 tmpObj._elabId =   Convert.ToInt32(dr["elabId"].ToString()); ;
@@ -144,7 +149,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSOUTPICKLABLE_TMP SET PICKORDERNO = @PICKORDERNO,DPSORDER = @DPSORDER,COLOR = @COLOR,ORDERDETAILID = @ORDERDETAILID,RECORDID = @RECORDID,COUNT = @COUNT,LOCATIONID = @LOCATIONID,ELABID = @ELABID,PORT = @PORT,ELABADDRESS = @ELABADDRESS,STATE = @STATE,PICKCOUNT = @PICKCOUNT,DESCRIPTION = @DESCRIPTION,PARTION = @PARTION,PLATE = @PLATE,CALVOL = @CALVOL,MINOPERATEUNIT = @MINOPERATEUNIT,MINOPERATECOUNT = @MINOPERATECOUNT,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSOUTPICKLABLE_TMP SET PICKORDERNO = @PICKORDERNO,DPSORDER = @DPSORDER,COLOR = @COLOR,ORDERDETAILID = @ORDERDETAILID,RECORDID = @RECORDID,COUNT = @COUNT,LOCATIONID = @LOCATIONID,PORTID = @PORTID,ELABID = @ELABID,PORT = @PORT,ELABADDRESS = @ELABADDRESS,STATE = @STATE,PICKCOUNT = @PICKCOUNT,DESCRIPTION = @DESCRIPTION,PARTION = @PARTION,PLATE = @PLATE,CALVOL = @CALVOL,MINOPERATEUNIT = @MINOPERATEUNIT,MINOPERATECOUNT = @MINOPERATECOUNT,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSOUTPICKLABLE_TMP {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -188,6 +193,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._recordId == null ? "" : "RECORDID"  + ",";
              colums+= tmpObj._count == null ? "" : "COUNT"  + ",";
              colums+= tmpObj._locationId == null ? "" : "LOCATIONID"  + ",";
+             colums+= tmpObj._portId == null ? "" : "PORTID"  + ",";
              colums+= tmpObj._elabId == null ? "" : "ELABID"  + ",";
              colums+= tmpObj._port == null ? "" : "PORT"  + ",";
              colums+= tmpObj._elabAddress == null ? "" : "ELABADDRESS"  + ",";
@@ -214,6 +220,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._recordId == null ? "" : "@RECORDID"  + ",";
              values+= tmpObj._count == null ? "" : "@COUNT"  + ",";
              values+= tmpObj._locationId == null ? "" : "@LOCATIONID"  + ",";
+             values+= tmpObj._portId == null ? "" : "@PORTID"  + ",";
              values+= tmpObj._elabId == null ? "" : "@ELABID"  + ",";
              values+= tmpObj._port == null ? "" : "@PORT"  + ",";
              values+= tmpObj._elabAddress == null ? "" : "@ELABADDRESS"  + ",";
@@ -261,6 +268,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="LOCATIONID  = @LOCATIONID," ; 
             }
+            if (tmpObj._portId !=null && tmpObj._portId != tmpObj._OportId)
+            {
+                updateFields +="PORTID  = @PORTID," ; 
+            }
             if (tmpObj._elabId !=null && tmpObj._elabId != tmpObj._OelabId)
             {
                 updateFields +="ELABID  = @ELABID," ; 
@@ -342,6 +353,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@RECORDID",  VerifyDbnull(tmpObj._recordId))  ;
                           oraCmd.Parameters.AddWithValue("@COUNT",  VerifyDbnull(tmpObj._count))  ;
                           oraCmd.Parameters.AddWithValue("@LOCATIONID",  VerifyDbnull(tmpObj._locationId))  ;
+                          oraCmd.Parameters.AddWithValue("@PORTID",  VerifyDbnull(tmpObj._portId))  ;
                           oraCmd.Parameters.AddWithValue("@ELABID",  VerifyDbnull(tmpObj._elabId))  ;
                           oraCmd.Parameters.AddWithValue("@PORT",  VerifyDbnull(tmpObj._port))  ;
                           oraCmd.Parameters.AddWithValue("@ELABADDRESS",  VerifyDbnull(tmpObj._elabAddress))  ;
@@ -371,6 +383,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@COUNT",  VerifyDbnull(tmpObj._count))  ;
                        if(tmpObj._locationId!=null)
                        oraCmd.Parameters.AddWithValue("@LOCATIONID",  VerifyDbnull(tmpObj._locationId))  ;
+                       if(tmpObj._portId!=null)
+                       oraCmd.Parameters.AddWithValue("@PORTID",  VerifyDbnull(tmpObj._portId))  ;
                        if(tmpObj._elabId!=null)
                        oraCmd.Parameters.AddWithValue("@ELABID",  VerifyDbnull(tmpObj._elabId))  ;
                        if(tmpObj._port!=null)

Model/wms/data/basic/WmsOutPickPort_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsOutPickPort
 ///By wm  
-///on 08/04/2023
+///on 09/13/2023
 /// </summary>
  
 using System;
@@ -39,6 +39,8 @@ namespace  DeiNiu.wms.Data.Model
                     internal string _description = String.Empty,_Odescription= String.Empty;   
                     internal int _takeBy,_OtakeBy;   
                     internal int _printcnt,_Oprintcnt;   
+                    internal decimal _validationCnt,_OvalidationCnt;   
+                    internal string _validationReason = String.Empty,_OvalidationReason= String.Empty;   
                     internal int _pickBy,_OpickBy;   
                     internal string _pickTime = String.Empty,_OpickTime= String.Empty;   
                     internal int _checkBy,_OcheckBy;   
@@ -168,6 +170,16 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_printcnt = value;}    
 		}  
         
+        public  decimal   validationCnt{
+			get {return _validationCnt;}
+			 set {_validationCnt = value;}    
+		}  
+        
+        public string  validationReason{
+			get {return _validationReason;}
+			 set {_validationReason = value;}    
+		}  
+        
         public  int   pickBy{
 			get {return _pickBy;}
 			 set {_pickBy = value;}    
@@ -237,7 +249,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{id128,pickOrderNo,flowNo,waveOrder,jobNo,dpsOrder,recordId,recType,count,locationId,partion,volType,tranLocationId,tranArea,state,pickCount,description,takeBy,printcnt,pickBy,pickTime,checkBy,checkTime,checkBy2,checkByTime2,pickDetailId,seedsOutCount,seedsFromFlowNo,operater}
+      public enum fields{id128,pickOrderNo,flowNo,waveOrder,jobNo,dpsOrder,recordId,recType,count,locationId,partion,volType,tranLocationId,tranArea,state,pickCount,description,takeBy,printcnt,validationCnt,validationReason,pickBy,pickTime,checkBy,checkTime,checkBy2,checkByTime2,pickDetailId,seedsOutCount,seedsFromFlowNo,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsOutPickPort_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsOutPickPort
 ///By wm 
-///on 08/04/2023
+///on 09/13/2023
 /// </summary>
  
 
@@ -120,6 +120,16 @@ namespace DeiNiu.wms.Data.Model
                                 tmpObj._printcnt =   Convert.ToInt32(dr["printcnt"].ToString()); ;
                                 tmpObj._Oprintcnt =   Convert.ToInt32(dr["printcnt"].ToString()); ;
                             }
+                        if (dr.Table.Columns.Contains("validationCnt") && !(dr["validationCnt"] is DBNull))
+                            {
+                                tmpObj._validationCnt =   Convert.ToDecimal(dr["validationCnt"].ToString()); ;
+                                tmpObj._OvalidationCnt =   Convert.ToDecimal(dr["validationCnt"].ToString()); ;
+                            }
+                        if (dr.Table.Columns.Contains("validationReason") && !(dr["validationReason"] is DBNull))
+                            {
+                                tmpObj._validationReason =  dr["validationReason"].ToString() ;
+                                tmpObj._OvalidationReason =  dr["validationReason"].ToString() ;
+                            }
                         if (dr.Table.Columns.Contains("pickBy") && !(dr["pickBy"] is DBNull))
                             {
                                 tmpObj._pickBy =   Convert.ToInt32(dr["pickBy"].ToString()); ;
@@ -194,7 +204,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSOUTPICKPORT SET ID128 = @ID128,PICKORDERNO = @PICKORDERNO,FLOWNO = @FLOWNO,WAVEORDER = @WAVEORDER,JOBNO = @JOBNO,DPSORDER = @DPSORDER,RECORDID = @RECORDID,RECTYPE = @RECTYPE,COUNT = @COUNT,LOCATIONID = @LOCATIONID,PARTION = @PARTION,VOLTYPE = @VOLTYPE,TRANLOCATIONID = @TRANLOCATIONID,TRANAREA = @TRANAREA,STATE = @STATE,PICKCOUNT = @PICKCOUNT,DESCRIPTION = @DESCRIPTION,TAKEBY = @TAKEBY,PRINTCNT = @PRINTCNT,PICKBY = @PICKBY,PICKTIME = @PICKTIME,CHECKBY = @CHECKBY,CHECKTIME = @CHECKTIME,CHECKBY2 = @CHECKBY2,CHECKBYTIME2 = @CHECKBYTIME2,PICKDETAILID = @PICKDETAILID,SEEDSOUTCOUNT = @SEEDSOUTCOUNT,SEEDSFROMFLOWNO = @SEEDSFROMFLOWNO,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSOUTPICKPORT SET ID128 = @ID128,PICKORDERNO = @PICKORDERNO,FLOWNO = @FLOWNO,WAVEORDER = @WAVEORDER,JOBNO = @JOBNO,DPSORDER = @DPSORDER,RECORDID = @RECORDID,RECTYPE = @RECTYPE,COUNT = @COUNT,LOCATIONID = @LOCATIONID,PARTION = @PARTION,VOLTYPE = @VOLTYPE,TRANLOCATIONID = @TRANLOCATIONID,TRANAREA = @TRANAREA,STATE = @STATE,PICKCOUNT = @PICKCOUNT,DESCRIPTION = @DESCRIPTION,TAKEBY = @TAKEBY,PRINTCNT = @PRINTCNT,VALIDATIONCNT = @VALIDATIONCNT,VALIDATIONREASON = @VALIDATIONREASON,PICKBY = @PICKBY,PICKTIME = @PICKTIME,CHECKBY = @CHECKBY,CHECKTIME = @CHECKTIME,CHECKBY2 = @CHECKBY2,CHECKBYTIME2 = @CHECKBYTIME2,PICKDETAILID = @PICKDETAILID,SEEDSOUTCOUNT = @SEEDSOUTCOUNT,SEEDSFROMFLOWNO = @SEEDSFROMFLOWNO,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSOUTPICKPORT {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -250,6 +260,8 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._description == null ? "" : "DESCRIPTION"  + ",";
              colums+= tmpObj._takeBy == null ? "" : "TAKEBY"  + ",";
              colums+= tmpObj._printcnt == null ? "" : "PRINTCNT"  + ",";
+             colums+= tmpObj._validationCnt == null ? "" : "VALIDATIONCNT"  + ",";
+             colums+= tmpObj._validationReason == null ? "" : "VALIDATIONREASON"  + ",";
              colums+= tmpObj._pickBy == null ? "" : "PICKBY"  + ",";
              colums+= tmpObj._pickTime == null ? "" : "PICKTIME"  + ",";
              colums+= tmpObj._checkBy == null ? "" : "CHECKBY"  + ",";
@@ -286,6 +298,8 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._description == null ? "" : "@DESCRIPTION"  + ",";
              values+= tmpObj._takeBy == null ? "" : "@TAKEBY"  + ",";
              values+= tmpObj._printcnt == null ? "" : "@PRINTCNT"  + ",";
+             values+= tmpObj._validationCnt == null ? "" : "@VALIDATIONCNT"  + ",";
+             values+= tmpObj._validationReason == null ? "" : "@VALIDATIONREASON"  + ",";
              values+= tmpObj._pickBy == null ? "" : "@PICKBY"  + ",";
              values+= tmpObj._pickTime == null ? "" : "@PICKTIME"  + ",";
              values+= tmpObj._checkBy == null ? "" : "@CHECKBY"  + ",";
@@ -379,6 +393,14 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="PRINTCNT  = @PRINTCNT," ; 
             }
+            if (tmpObj._validationCnt !=null && tmpObj._validationCnt != tmpObj._OvalidationCnt)
+            {
+                updateFields +="VALIDATIONCNT  = @VALIDATIONCNT," ; 
+            }
+            if (tmpObj._validationReason !=null && tmpObj._validationReason != tmpObj._OvalidationReason)
+            {
+                updateFields +="VALIDATIONREASON  = @VALIDATIONREASON," ; 
+            }
             if (tmpObj._pickBy !=null && tmpObj._pickBy != tmpObj._OpickBy)
             {
                 updateFields +="PICKBY  = @PICKBY," ; 
@@ -464,6 +486,8 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@DESCRIPTION",  VerifyDbnull(tmpObj._description))  ;
                           oraCmd.Parameters.AddWithValue("@TAKEBY",  VerifyDbnull(tmpObj._takeBy))  ;
                           oraCmd.Parameters.AddWithValue("@PRINTCNT",  VerifyDbnull(tmpObj._printcnt))  ;
+                          oraCmd.Parameters.AddWithValue("@VALIDATIONCNT",  VerifyDbnull(tmpObj._validationCnt))  ;
+                          oraCmd.Parameters.AddWithValue("@VALIDATIONREASON",  VerifyDbnull(tmpObj._validationReason))  ;
                           oraCmd.Parameters.AddWithValue("@PICKBY",  VerifyDbnull(tmpObj._pickBy))  ;
                           oraCmd.Parameters.AddWithValue("@PICKTIME",  VerifyDbnull(tmpObj._pickTime))  ;
                           oraCmd.Parameters.AddWithValue("@CHECKBY",  VerifyDbnull(tmpObj._checkBy))  ;
@@ -515,6 +539,10 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@TAKEBY",  VerifyDbnull(tmpObj._takeBy))  ;
                        if(tmpObj._printcnt!=null)
                        oraCmd.Parameters.AddWithValue("@PRINTCNT",  VerifyDbnull(tmpObj._printcnt))  ;
+                       if(tmpObj._validationCnt!=null)
+                       oraCmd.Parameters.AddWithValue("@VALIDATIONCNT",  VerifyDbnull(tmpObj._validationCnt))  ;
+                       if(tmpObj._validationReason!=null)
+                       oraCmd.Parameters.AddWithValue("@VALIDATIONREASON",  VerifyDbnull(tmpObj._validationReason))  ;
                        if(tmpObj._pickBy!=null)
                        oraCmd.Parameters.AddWithValue("@PICKBY",  VerifyDbnull(tmpObj._pickBy))  ;
                        if(tmpObj._pickTime!=null)

Model/wms/data/basic/WmsOutPickRequest_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsOutPickRequest
 ///By wm  
-///on 08/04/2023
+///on 11/06/2023
 /// </summary>
  
 using System;
@@ -23,6 +23,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal string _pickOrderNo = String.Empty,_OpickOrderNo= String.Empty;   
                     internal string _waveOrder = String.Empty,_OwaveOrder= String.Empty;   
                     internal string _transNo = String.Empty,_OtransNo= String.Empty;   
+                    internal string _loadTruckJob = String.Empty,_OloadTruckJob= String.Empty;   
                     internal int _orderType,_OorderType;   
                     internal string _orderTypeName = String.Empty,_OorderTypeName= String.Empty;   
                     internal int _outStoreType,_OoutStoreType;   
@@ -111,6 +112,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_transNo = value;}    
 		}  
         
+        public string  loadTruckJob{
+			get {return _loadTruckJob;}
+			 set {_loadTruckJob = value;}    
+		}  
+        
         public  int   orderType{
 			get {return _orderType;}
 			 set {_orderType = value;}    
@@ -375,7 +381,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{pickOrderNo,waveOrder,transNo,orderType,orderTypeName,outStoreType,owner,customerId,customerName,custAddress,phone1,phone2,contactperson,desk,boxCnt,bulkCnt,bulkBox,bulkBag,tranLocationId,volume,weight,state,bulkPickState,batchPickState,orderDate,description,pickedBy,pickedTime,checkedBy,checkedTime,batchCheckedby,batchCheckedTime,bulkCheckedby,bulkCheckedTime,waveStart,waveEnd,priority,seedsPickNo,seedsPort,seedsLabelId,pickStartOn,pickGroup,dueDate,invoicedBy,invoiceNo,invoicePrintCnt,docNo,salesperson,sumPrice,fandian,deliveryType,operater}
+      public enum fields{pickOrderNo,waveOrder,transNo,loadTruckJob,orderType,orderTypeName,outStoreType,owner,customerId,customerName,custAddress,phone1,phone2,contactperson,desk,boxCnt,bulkCnt,bulkBox,bulkBag,tranLocationId,volume,weight,state,bulkPickState,batchPickState,orderDate,description,pickedBy,pickedTime,checkedBy,checkedTime,batchCheckedby,batchCheckedTime,bulkCheckedby,bulkCheckedTime,waveStart,waveEnd,priority,seedsPickNo,seedsPort,seedsLabelId,pickStartOn,pickGroup,dueDate,invoicedBy,invoiceNo,invoicePrintCnt,docNo,salesperson,sumPrice,fandian,deliveryType,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsPlateStock_tmp_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsPlateStock_tmp
 ///By wm  
-///on 08/26/2023
+///on 10/25/2023
 /// </summary>
  
 using System;
@@ -37,6 +37,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal int _outPortId,_OoutPortId;   
                     internal int _inPortId,_OinPortId;   
                     internal int _lineId,_OlineId;   
+                    internal string _inPlate = String.Empty,_OinPlate= String.Empty;   
                     internal string _customerId = String.Empty,_OcustomerId= String.Empty;   
                     internal string _orderNo = String.Empty,_OorderNo= String.Empty;   
                     internal string _description = String.Empty,_Odescription= String.Empty;   
@@ -150,6 +151,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_lineId = value;}    
 		}  
         
+        public string  inPlate{
+			get {return _inPlate;}
+			 set {_inPlate = value;}    
+		}  
+        
         public string  customerId{
 			get {return _customerId;}
 			 set {_customerId = value;}    
@@ -189,7 +195,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{plateId,skuId,skuCode,goodsId,barcode,batch,productDate,validDate,count,state,recordId,recType,jobNo,locationid,outPortId,inPortId,lineId,customerId,orderNo,description,operater}
+      public enum fields{plateId,skuId,skuCode,goodsId,barcode,batch,productDate,validDate,count,state,recordId,recType,jobNo,locationid,outPortId,inPortId,lineId,inPlate,customerId,orderNo,description,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsPlateStock_tmp_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsPlateStock_tmp
 ///By wm 
-///on 08/26/2023
+///on 10/25/2023
 /// </summary>
  
 
@@ -23,124 +23,467 @@ namespace DeiNiu.wms.Data.Model
                   WmsPlateStock_tmp_base  tmpObj = (WmsPlateStock_tmp_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("plateId") && !(dr["plateId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._plateId =  dr["plateId"].ToString() ;
                                 tmpObj._OplateId =  dr["plateId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["plateId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuId") && !(dr["skuId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
                                 tmpObj._OskuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuCode") && !(dr["skuCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuCode =  dr["skuCode"].ToString() ;
                                 tmpObj._OskuCode =  dr["skuCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsId =  dr["goodsId"].ToString() ;
                                 tmpObj._OgoodsId =  dr["goodsId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("barcode") && !(dr["barcode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._barcode =  dr["barcode"].ToString() ;
                                 tmpObj._Obarcode =  dr["barcode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["barcode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch") && !(dr["batch"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch =  dr["batch"].ToString() ;
                                 tmpObj._Obatch =  dr["batch"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("productDate") && !(dr["productDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._productDate =  dr["productDate"].ToString() ;
                                 tmpObj._OproductDate =  dr["productDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["productDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validDate") && !(dr["validDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validDate =  dr["validDate"].ToString() ;
                                 tmpObj._OvalidDate =  dr["validDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("count") && !(dr["count"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._count =   Convert.ToDecimal(dr["count"].ToString()); ;
                                 tmpObj._Ocount =   Convert.ToDecimal(dr["count"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["count"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("recordId") && !(dr["recordId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._recordId =   Convert.ToInt32(dr["recordId"].ToString()); ;
                                 tmpObj._OrecordId =   Convert.ToInt32(dr["recordId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["recordId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("recType") && !(dr["recType"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._recType =   Convert.ToInt32(dr["recType"].ToString()); ;
                                 tmpObj._OrecType =   Convert.ToInt32(dr["recType"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["recType"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("jobNo") && !(dr["jobNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._jobNo =  dr["jobNo"].ToString() ;
                                 tmpObj._OjobNo =  dr["jobNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["jobNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("locationid") && !(dr["locationid"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._locationid =  dr["locationid"].ToString() ;
                                 tmpObj._Olocationid =  dr["locationid"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["locationid"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("outPortId") && !(dr["outPortId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._outPortId =   Convert.ToInt32(dr["outPortId"].ToString()); ;
                                 tmpObj._OoutPortId =   Convert.ToInt32(dr["outPortId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["outPortId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("inPortId") && !(dr["inPortId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._inPortId =   Convert.ToInt32(dr["inPortId"].ToString()); ;
                                 tmpObj._OinPortId =   Convert.ToInt32(dr["inPortId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["inPortId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lineId") && !(dr["lineId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lineId =   Convert.ToInt32(dr["lineId"].ToString()); ;
                                 tmpObj._OlineId =   Convert.ToInt32(dr["lineId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lineId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("inPlate") && !(dr["inPlate"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._inPlate =  dr["inPlate"].ToString() ;
+                                tmpObj._OinPlate =  dr["inPlate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["inPlate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("customerId") && !(dr["customerId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._customerId =  dr["customerId"].ToString() ;
                                 tmpObj._OcustomerId =  dr["customerId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["customerId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderNo") && !(dr["orderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderNo =  dr["orderNo"].ToString() ;
                                 tmpObj._OorderNo =  dr["orderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("description") && !(dr["description"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._description =  dr["description"].ToString() ;
                                 tmpObj._Odescription =  dr["description"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["description"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -154,7 +497,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSPLATESTOCK_TMP SET PLATEID = @PLATEID,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BARCODE = @BARCODE,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,COUNT = @COUNT,STATE = @STATE,RECORDID = @RECORDID,RECTYPE = @RECTYPE,JOBNO = @JOBNO,LOCATIONID = @LOCATIONID,OUTPORTID = @OUTPORTID,INPORTID = @INPORTID,LINEID = @LINEID,CUSTOMERID = @CUSTOMERID,ORDERNO = @ORDERNO,DESCRIPTION = @DESCRIPTION,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSPLATESTOCK_TMP SET PLATEID = @PLATEID,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BARCODE = @BARCODE,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,COUNT = @COUNT,STATE = @STATE,RECORDID = @RECORDID,RECTYPE = @RECTYPE,JOBNO = @JOBNO,LOCATIONID = @LOCATIONID,OUTPORTID = @OUTPORTID,INPORTID = @INPORTID,LINEID = @LINEID,INPLATE = @INPLATE,CUSTOMERID = @CUSTOMERID,ORDERNO = @ORDERNO,DESCRIPTION = @DESCRIPTION,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSPLATESTOCK_TMP {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -208,6 +551,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._outPortId == null ? "" : "OUTPORTID"  + ",";
              colums+= tmpObj._inPortId == null ? "" : "INPORTID"  + ",";
              colums+= tmpObj._lineId == null ? "" : "LINEID"  + ",";
+             colums+= tmpObj._inPlate == null ? "" : "INPLATE"  + ",";
              colums+= tmpObj._customerId == null ? "" : "CUSTOMERID"  + ",";
              colums+= tmpObj._orderNo == null ? "" : "ORDERNO"  + ",";
              colums+= tmpObj._description == null ? "" : "DESCRIPTION"  + ",";
@@ -236,6 +580,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._outPortId == null ? "" : "@OUTPORTID"  + ",";
              values+= tmpObj._inPortId == null ? "" : "@INPORTID"  + ",";
              values+= tmpObj._lineId == null ? "" : "@LINEID"  + ",";
+             values+= tmpObj._inPlate == null ? "" : "@INPLATE"  + ",";
              values+= tmpObj._customerId == null ? "" : "@CUSTOMERID"  + ",";
              values+= tmpObj._orderNo == null ? "" : "@ORDERNO"  + ",";
              values+= tmpObj._description == null ? "" : "@DESCRIPTION"  + ",";
@@ -315,6 +660,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="LINEID  = @LINEID," ; 
             }
+            if (tmpObj._inPlate !=null && tmpObj._inPlate != tmpObj._OinPlate)
+            {
+                updateFields +="INPLATE  = @INPLATE," ; 
+            }
             if (tmpObj._customerId !=null && tmpObj._customerId != tmpObj._OcustomerId)
             {
                 updateFields +="CUSTOMERID  = @CUSTOMERID," ; 
@@ -374,6 +723,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@OUTPORTID",  VerifyDbnull(tmpObj._outPortId))  ;
                           oraCmd.Parameters.AddWithValue("@INPORTID",  VerifyDbnull(tmpObj._inPortId))  ;
                           oraCmd.Parameters.AddWithValue("@LINEID",  VerifyDbnull(tmpObj._lineId))  ;
+                          oraCmd.Parameters.AddWithValue("@INPLATE",  VerifyDbnull(tmpObj._inPlate))  ;
                           oraCmd.Parameters.AddWithValue("@CUSTOMERID",  VerifyDbnull(tmpObj._customerId))  ;
                           oraCmd.Parameters.AddWithValue("@ORDERNO",  VerifyDbnull(tmpObj._orderNo))  ;
                           oraCmd.Parameters.AddWithValue("@DESCRIPTION",  VerifyDbnull(tmpObj._description))  ;
@@ -415,6 +765,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@INPORTID",  VerifyDbnull(tmpObj._inPortId))  ;
                        if(tmpObj._lineId!=null)
                        oraCmd.Parameters.AddWithValue("@LINEID",  VerifyDbnull(tmpObj._lineId))  ;
+                       if(tmpObj._inPlate!=null)
+                       oraCmd.Parameters.AddWithValue("@INPLATE",  VerifyDbnull(tmpObj._inPlate))  ;
                        if(tmpObj._customerId!=null)
                        oraCmd.Parameters.AddWithValue("@CUSTOMERID",  VerifyDbnull(tmpObj._customerId))  ;
                        if(tmpObj._orderNo!=null)

Model/wms/data/basic/WmsPlate_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsPlate
 ///By wm  
-///on 08/16/2023
+///on 10/25/2023
 /// </summary>
  
 using System;
@@ -33,7 +33,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal int _lineId,_OlineId;   
                     internal int _partion,_Opartion;   
                     internal string _locationId = String.Empty,_OlocationId= String.Empty;   
-                    internal int _load,_Oload;   
+                    internal decimal _load,_Oload;   
                     internal decimal _volume,_Ovolume;   
                     internal decimal _length,_Olength;   
                     internal decimal _width,_Owidth;   
@@ -41,7 +41,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal int _terminal,_Oterminal;   
                     internal int _type,_Otype;   
                     internal int _plateLevel,_OplateLevel;   
-                    internal int _inPlate,_OinPlate;   
+                    internal string _inPlate = String.Empty,_OinPlate= String.Empty;   
                     internal int _state,_Ostate;   
                     internal int _Ooperater;   
                        
@@ -133,7 +133,7 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_locationId = value;}    
 		}  
         
-        public  int   load{
+        public  decimal   load{
 			get {return _load;}
 			 set {_load = value;}    
 		}  
@@ -173,7 +173,7 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_plateLevel = value;}    
 		}  
         
-        public  int   inPlate{
+        public string  inPlate{
 			get {return _inPlate;}
 			 set {_inPlate = value;}    
 		}  

Model/wms/data/basic/WmsPlate_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsPlate
 ///By wm 
-///on 08/16/2023
+///on 10/25/2023
 /// </summary>
  
 
@@ -23,139 +23,503 @@ namespace DeiNiu.wms.Data.Model
                   WmsPlate_base  tmpObj = (WmsPlate_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("plateId") && !(dr["plateId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._plateId =  dr["plateId"].ToString() ;
                                 tmpObj._OplateId =  dr["plateId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["plateId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("color") && !(dr["color"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._color =   Convert.ToInt32(dr["color"].ToString()); ;
                                 tmpObj._Ocolor =   Convert.ToInt32(dr["color"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["color"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("spec") && !(dr["spec"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._spec =  dr["spec"].ToString() ;
                                 tmpObj._Ospec =  dr["spec"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["spec"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("owner") && !(dr["owner"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._owner =   Convert.ToInt32(dr["owner"].ToString()); ;
                                 tmpObj._Oowner =   Convert.ToInt32(dr["owner"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["owner"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("driver") && !(dr["driver"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._driver =   Convert.ToInt32(dr["driver"].ToString()); ;
                                 tmpObj._Odriver =   Convert.ToInt32(dr["driver"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["driver"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("preInOrderNo") && !(dr["preInOrderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._preInOrderNo =  dr["preInOrderNo"].ToString() ;
                                 tmpObj._OpreInOrderNo =  dr["preInOrderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["preInOrderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("waveNo") && !(dr["waveNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._waveNo =  dr["waveNo"].ToString() ;
                                 tmpObj._OwaveNo =  dr["waveNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["waveNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("pickOrderNo") && !(dr["pickOrderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._pickOrderNo =  dr["pickOrderNo"].ToString() ;
                                 tmpObj._OpickOrderNo =  dr["pickOrderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["pickOrderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("customerId") && !(dr["customerId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._customerId =  dr["customerId"].ToString() ;
                                 tmpObj._OcustomerId =  dr["customerId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["customerId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("transNo") && !(dr["transNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._transNo =  dr["transNo"].ToString() ;
                                 tmpObj._OtransNo =  dr["transNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["transNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lineId") && !(dr["lineId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lineId =   Convert.ToInt32(dr["lineId"].ToString()); ;
                                 tmpObj._OlineId =   Convert.ToInt32(dr["lineId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lineId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("partion") && !(dr["partion"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._partion =   Convert.ToInt32(dr["partion"].ToString()); ;
                                 tmpObj._Opartion =   Convert.ToInt32(dr["partion"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["partion"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("locationId") && !(dr["locationId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._locationId =  dr["locationId"].ToString() ;
                                 tmpObj._OlocationId =  dr["locationId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["locationId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("load") && !(dr["load"] is DBNull))
                             {
-                                tmpObj._load =   Convert.ToInt32(dr["load"].ToString()); ;
-                                tmpObj._Oload =   Convert.ToInt32(dr["load"].ToString()); ;
+                              try
+                                { 
+                                tmpObj._load =   Convert.ToDecimal(dr["load"].ToString()); ;
+                                tmpObj._Oload =   Convert.ToDecimal(dr["load"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["load"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("volume") && !(dr["volume"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._volume =   Convert.ToDecimal(dr["volume"].ToString()); ;
                                 tmpObj._Ovolume =   Convert.ToDecimal(dr["volume"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["volume"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("length") && !(dr["length"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._length =   Convert.ToDecimal(dr["length"].ToString()); ;
                                 tmpObj._Olength =   Convert.ToDecimal(dr["length"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["length"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("width") && !(dr["width"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._width =   Convert.ToDecimal(dr["width"].ToString()); ;
                                 tmpObj._Owidth =   Convert.ToDecimal(dr["width"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["width"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("height") && !(dr["height"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._height =   Convert.ToDecimal(dr["height"].ToString()); ;
                                 tmpObj._Oheight =   Convert.ToDecimal(dr["height"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["height"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("terminal") && !(dr["terminal"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._terminal =   Convert.ToInt32(dr["terminal"].ToString()); ;
                                 tmpObj._Oterminal =   Convert.ToInt32(dr["terminal"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["terminal"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("type") && !(dr["type"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._type =   Convert.ToInt32(dr["type"].ToString()); ;
                                 tmpObj._Otype =   Convert.ToInt32(dr["type"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["type"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("plateLevel") && !(dr["plateLevel"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._plateLevel =   Convert.ToInt32(dr["plateLevel"].ToString()); ;
                                 tmpObj._OplateLevel =   Convert.ToInt32(dr["plateLevel"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["plateLevel"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("inPlate") && !(dr["inPlate"] is DBNull))
                             {
-                                tmpObj._inPlate =   Convert.ToInt32(dr["inPlate"].ToString()); ;
-                                tmpObj._OinPlate =   Convert.ToInt32(dr["inPlate"].ToString()); ;
+                              try
+                                { 
+                                tmpObj._inPlate =  dr["inPlate"].ToString() ;
+                                tmpObj._OinPlate =  dr["inPlate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["inPlate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }

Model/wms/data/basic/WmsStockPandianResult_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsStockPandianResult
 ///By wm  
-///on 08/04/2023
+///on 10/09/2023
 /// </summary>
  
 using System;
@@ -20,6 +20,7 @@ namespace  DeiNiu.wms.Data.Model
 	public class WmsStockPandianResult_base  : BaseModel { 
 
                        
+                    internal int _mirrorId,_OmirrorId;   
                     internal string _orderNo = String.Empty,_OorderNo= String.Empty;   
                     internal string _locationId = String.Empty,_OlocationId= String.Empty;   
                     internal int _skuId,_OskuId;   
@@ -55,6 +56,11 @@ namespace  DeiNiu.wms.Data.Model
             model_imp = new WmsStockPandianResult_base_Imp();  
         }
 		#region Public Properties 
+        public  int   mirrorId{
+			get {return _mirrorId;}
+			 set {_mirrorId = value;}    
+		}  
+        
         public string  orderNo{
 			get {return _orderNo;}
 			 set {_orderNo = value;}    
@@ -129,7 +135,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{orderNo,locationId,skuId,skuCode,goodsId,batch,productDate,validDate,avCount,state,operater}
+      public enum fields{mirrorId,orderNo,locationId,skuId,skuCode,goodsId,batch,productDate,validDate,avCount,state,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsStockPandianResult_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsStockPandianResult
 ///By wm 
-///on 08/04/2023
+///on 10/09/2023
 /// </summary>
  
 
@@ -23,74 +23,287 @@ namespace DeiNiu.wms.Data.Model
                   WmsStockPandianResult_base  tmpObj = (WmsStockPandianResult_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("mirrorId") && !(dr["mirrorId"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._mirrorId =   Convert.ToInt32(dr["mirrorId"].ToString()); ;
+                                tmpObj._OmirrorId =   Convert.ToInt32(dr["mirrorId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["mirrorId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderNo") && !(dr["orderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderNo =  dr["orderNo"].ToString() ;
                                 tmpObj._OorderNo =  dr["orderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("locationId") && !(dr["locationId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._locationId =  dr["locationId"].ToString() ;
                                 tmpObj._OlocationId =  dr["locationId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["locationId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuId") && !(dr["skuId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
                                 tmpObj._OskuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuCode") && !(dr["skuCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuCode =  dr["skuCode"].ToString() ;
                                 tmpObj._OskuCode =  dr["skuCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsId =  dr["goodsId"].ToString() ;
                                 tmpObj._OgoodsId =  dr["goodsId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch") && !(dr["batch"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch =  dr["batch"].ToString() ;
                                 tmpObj._Obatch =  dr["batch"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("productDate") && !(dr["productDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._productDate =  dr["productDate"].ToString() ;
                                 tmpObj._OproductDate =  dr["productDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["productDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validDate") && !(dr["validDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validDate =  dr["validDate"].ToString() ;
                                 tmpObj._OvalidDate =  dr["validDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("avCount") && !(dr["avCount"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._avCount =   Convert.ToDecimal(dr["avCount"].ToString()); ;
                                 tmpObj._OavCount =   Convert.ToDecimal(dr["avCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["avCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -104,7 +317,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSSTOCKPANDIANRESULT SET ORDERNO = @ORDERNO,LOCATIONID = @LOCATIONID,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,AVCOUNT = @AVCOUNT,STATE = @STATE,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSSTOCKPANDIANRESULT SET MIRRORID = @MIRRORID,ORDERNO = @ORDERNO,LOCATIONID = @LOCATIONID,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,AVCOUNT = @AVCOUNT,STATE = @STATE,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSSTOCKPANDIANRESULT {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -141,6 +354,7 @@ namespace DeiNiu.wms.Data.Model
         private string  getFields(WmsStockPandianResult_base tmpObj)
         { 
           String colums ="";
+             colums+= tmpObj._mirrorId == null ? "" : "MIRRORID"  + ",";
              colums+= tmpObj._orderNo == null ? "" : "ORDERNO"  + ",";
              colums+= tmpObj._locationId == null ? "" : "LOCATIONID"  + ",";
              colums+= tmpObj._skuId == null ? "" : "SKUID"  + ",";
@@ -159,6 +373,7 @@ namespace DeiNiu.wms.Data.Model
         private string getValues(WmsStockPandianResult_base tmpObj)
         {
           String values ="";
+             values+= tmpObj._mirrorId == null ? "" : "@MIRRORID"  + ",";
              values+= tmpObj._orderNo == null ? "" : "@ORDERNO"  + ",";
              values+= tmpObj._locationId == null ? "" : "@LOCATIONID"  + ",";
              values+= tmpObj._skuId == null ? "" : "@SKUID"  + ",";
@@ -177,6 +392,10 @@ namespace DeiNiu.wms.Data.Model
         private string getChangedFields(WmsStockPandianResult_base tmpObj)
         {
             string updateFields = " set ";
+            if (tmpObj._mirrorId !=null && tmpObj._mirrorId != tmpObj._OmirrorId)
+            {
+                updateFields +="MIRRORID  = @MIRRORID," ; 
+            }
             if (tmpObj._orderNo !=null && tmpObj._orderNo != tmpObj._OorderNo)
             {
                 updateFields +="ORDERNO  = @ORDERNO," ; 
@@ -247,6 +466,7 @@ namespace DeiNiu.wms.Data.Model
                		 return;
 				case (int)op_flag.update:
                           oraCmd.Parameters.AddWithValue("@ID", tmpObj.ID); 
+                          oraCmd.Parameters.AddWithValue("@MIRRORID",  VerifyDbnull(tmpObj._mirrorId))  ;
                           oraCmd.Parameters.AddWithValue("@ORDERNO",  VerifyDbnull(tmpObj._orderNo))  ;
                           oraCmd.Parameters.AddWithValue("@LOCATIONID",  VerifyDbnull(tmpObj._locationId))  ;
                           oraCmd.Parameters.AddWithValue("@SKUID",  VerifyDbnull(tmpObj._skuId))  ;
@@ -261,6 +481,8 @@ namespace DeiNiu.wms.Data.Model
                          // oraCmd.Parameters.AddWithValue("@LASTMODIFIED", "getdate()")  ;                     
 					return;
                     case (int)op_flag.add:
+                       if(tmpObj._mirrorId!=null)
+                       oraCmd.Parameters.AddWithValue("@MIRRORID",  VerifyDbnull(tmpObj._mirrorId))  ;
                        if(tmpObj._orderNo!=null)
                        oraCmd.Parameters.AddWithValue("@ORDERNO",  VerifyDbnull(tmpObj._orderNo))  ;
                        if(tmpObj._locationId!=null)

Model/wms/data/basic/WmsStockPandianStockMirror_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsStockPandianStockMirror
 ///By wm  
-///on 08/04/2023
+///on 10/17/2023
 /// </summary>
  
 using System;
@@ -29,7 +29,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal string _batch = String.Empty,_Obatch= String.Empty;   
                     internal string _productDate = String.Empty,_OproductDate= String.Empty;   
                     internal string _validDate = String.Empty,_OvalidDate= String.Empty;   
-                    internal decimal _avCount,_OavCount;   
+                    internal decimal _shelfCount,_OshelfCount;   
                     internal int _state,_Ostate;   
                     internal int _result,_Oresult;   
                     internal int _Ooperater;   
@@ -102,9 +102,9 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_validDate = value;}    
 		}  
         
-        public  decimal   avCount{
-			get {return _avCount;}
-			 set {_avCount = value;}    
+        public  decimal   shelfCount{
+			get {return _shelfCount;}
+			 set {_shelfCount = value;}    
 		}  
         
         public  int   state{
@@ -141,7 +141,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{orderNo,locationId,plateId,skuId,skuCode,goodsId,batch,productDate,validDate,avCount,state,result,operater}
+      public enum fields{orderNo,locationId,plateId,skuId,skuCode,goodsId,batch,productDate,validDate,shelfCount,state,result,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsStockPandianStockMirror_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsStockPandianStockMirror
 ///By wm 
-///on 08/04/2023
+///on 10/17/2023
 /// </summary>
  
 
@@ -23,84 +23,305 @@ namespace DeiNiu.wms.Data.Model
                   WmsStockPandianStockMirror_base  tmpObj = (WmsStockPandianStockMirror_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderNo") && !(dr["orderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderNo =  dr["orderNo"].ToString() ;
                                 tmpObj._OorderNo =  dr["orderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("locationId") && !(dr["locationId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._locationId =  dr["locationId"].ToString() ;
                                 tmpObj._OlocationId =  dr["locationId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["locationId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("plateId") && !(dr["plateId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._plateId =  dr["plateId"].ToString() ;
                                 tmpObj._OplateId =  dr["plateId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["plateId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuId") && !(dr["skuId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
                                 tmpObj._OskuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuCode") && !(dr["skuCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuCode =  dr["skuCode"].ToString() ;
                                 tmpObj._OskuCode =  dr["skuCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsId =  dr["goodsId"].ToString() ;
                                 tmpObj._OgoodsId =  dr["goodsId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch") && !(dr["batch"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch =  dr["batch"].ToString() ;
                                 tmpObj._Obatch =  dr["batch"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("productDate") && !(dr["productDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._productDate =  dr["productDate"].ToString() ;
                                 tmpObj._OproductDate =  dr["productDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["productDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validDate") && !(dr["validDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validDate =  dr["validDate"].ToString() ;
                                 tmpObj._OvalidDate =  dr["validDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
-                        if (dr.Table.Columns.Contains("avCount") && !(dr["avCount"] is DBNull))
+                        if (dr.Table.Columns.Contains("shelfCount") && !(dr["shelfCount"] is DBNull))
                             {
-                                tmpObj._avCount =   Convert.ToDecimal(dr["avCount"].ToString()); ;
-                                tmpObj._OavCount =   Convert.ToDecimal(dr["avCount"].ToString()); ;
+                              try
+                                { 
+                                tmpObj._shelfCount =   Convert.ToDecimal(dr["shelfCount"].ToString()); ;
+                                tmpObj._OshelfCount =   Convert.ToDecimal(dr["shelfCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["shelfCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("result") && !(dr["result"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._result =   Convert.ToInt32(dr["result"].ToString()); ;
                                 tmpObj._Oresult =   Convert.ToInt32(dr["result"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["result"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -114,7 +335,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSSTOCKPANDIANSTOCKMIRROR SET ORDERNO = @ORDERNO,LOCATIONID = @LOCATIONID,PLATEID = @PLATEID,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,AVCOUNT = @AVCOUNT,STATE = @STATE,RESULT = @RESULT,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSSTOCKPANDIANSTOCKMIRROR SET ORDERNO = @ORDERNO,LOCATIONID = @LOCATIONID,PLATEID = @PLATEID,SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,SHELFCOUNT = @SHELFCOUNT,STATE = @STATE,RESULT = @RESULT,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSSTOCKPANDIANSTOCKMIRROR {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -160,7 +381,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._batch == null ? "" : "BATCH"  + ",";
              colums+= tmpObj._productDate == null ? "" : "PRODUCTDATE"  + ",";
              colums+= tmpObj._validDate == null ? "" : "VALIDDATE"  + ",";
-             colums+= tmpObj._avCount == null ? "" : "AVCOUNT"  + ",";
+             colums+= tmpObj._shelfCount == null ? "" : "SHELFCOUNT"  + ",";
              colums+= tmpObj._state == null ? "" : "STATE"  + ",";
              colums+= tmpObj._result == null ? "" : "RESULT"  + ",";
              colums+= tmpObj._operater == null ? "" : "OPERATER"  + ",";
@@ -180,7 +401,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._batch == null ? "" : "@BATCH"  + ",";
              values+= tmpObj._productDate == null ? "" : "@PRODUCTDATE"  + ",";
              values+= tmpObj._validDate == null ? "" : "@VALIDDATE"  + ",";
-             values+= tmpObj._avCount == null ? "" : "@AVCOUNT"  + ",";
+             values+= tmpObj._shelfCount == null ? "" : "@SHELFCOUNT"  + ",";
              values+= tmpObj._state == null ? "" : "@STATE"  + ",";
              values+= tmpObj._result == null ? "" : "@RESULT"  + ",";
              values+= tmpObj._operater == null ? "" : "@OPERATER"  + ",";
@@ -227,9 +448,9 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="VALIDDATE  = @VALIDDATE," ; 
             }
-            if (tmpObj._avCount !=null && tmpObj._avCount != tmpObj._OavCount)
+            if (tmpObj._shelfCount !=null && tmpObj._shelfCount != tmpObj._OshelfCount)
             {
-                updateFields +="AVCOUNT  = @AVCOUNT," ; 
+                updateFields +="SHELFCOUNT  = @SHELFCOUNT," ; 
             }
             if (tmpObj._state !=null && tmpObj._state != tmpObj._Ostate)
             {
@@ -278,7 +499,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@BATCH",  VerifyDbnull(tmpObj._batch))  ;
                           oraCmd.Parameters.AddWithValue("@PRODUCTDATE",  VerifyDbnull(tmpObj._productDate))  ;
                           oraCmd.Parameters.AddWithValue("@VALIDDATE",  VerifyDbnull(tmpObj._validDate))  ;
-                          oraCmd.Parameters.AddWithValue("@AVCOUNT",  VerifyDbnull(tmpObj._avCount))  ;
+                          oraCmd.Parameters.AddWithValue("@SHELFCOUNT",  VerifyDbnull(tmpObj._shelfCount))  ;
                           oraCmd.Parameters.AddWithValue("@STATE",  VerifyDbnull(tmpObj._state))  ;
                           oraCmd.Parameters.AddWithValue("@RESULT",  VerifyDbnull(tmpObj._result))  ;
                           oraCmd.Parameters.AddWithValue("@OPERATER",  VerifyDbnull(tmpObj._operater))  ;
@@ -303,8 +524,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@PRODUCTDATE",  VerifyDbnull(tmpObj._productDate))  ;
                        if(tmpObj._validDate!=null)
                        oraCmd.Parameters.AddWithValue("@VALIDDATE",  VerifyDbnull(tmpObj._validDate))  ;
-                       if(tmpObj._avCount!=null)
-                       oraCmd.Parameters.AddWithValue("@AVCOUNT",  VerifyDbnull(tmpObj._avCount))  ;
+                       if(tmpObj._shelfCount!=null)
+                       oraCmd.Parameters.AddWithValue("@SHELFCOUNT",  VerifyDbnull(tmpObj._shelfCount))  ;
                        if(tmpObj._state!=null)
                        oraCmd.Parameters.AddWithValue("@STATE",  VerifyDbnull(tmpObj._state))  ;
                        if(tmpObj._result!=null)

Model/wms/data/basic/WmsStockPandian_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsStockPandian
 ///By wm  
-///on 08/04/2023
+///on 10/11/2023
 /// </summary>
  
 using System;
@@ -34,6 +34,7 @@ namespace  DeiNiu.wms.Data.Model
                     internal string _inputValus = String.Empty,_OinputValus= String.Empty;   
                     internal string _condition = String.Empty,_Ocondition= String.Empty;   
                     internal int _adjustStatus,_OadjustStatus;   
+                    internal bool _noticeErp,_OnoticeErp;   
                     internal int _Ooperater;   
                        
                     internal string _createtime = String.Empty,_Ocreatetime= String.Empty;   
@@ -129,6 +130,11 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_adjustStatus = value;}    
 		}  
         
+        public  bool   noticeErp{
+			get {return _noticeErp;}
+			 set {_noticeErp = value;}    
+		}  
+        
         public  int   operater{
 			get {return _operater;}
 			 set {_operater = value;}    
@@ -153,7 +159,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{orderNo,ownerId,type,status,planStartTime,planEndTime,startTime,endTime,createby,priority,approvedby,inputValus,condition,adjustStatus,operater}
+      public enum fields{orderNo,ownerId,type,status,planStartTime,planEndTime,startTime,endTime,createby,priority,approvedby,inputValus,condition,adjustStatus,noticeErp,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsStockPandian_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsStockPandian
 ///By wm 
-///on 08/04/2023
+///on 10/11/2023
 /// </summary>
  
 
@@ -23,94 +23,359 @@ namespace DeiNiu.wms.Data.Model
                   WmsStockPandian_base  tmpObj = (WmsStockPandian_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("orderNo") && !(dr["orderNo"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._orderNo =  dr["orderNo"].ToString() ;
                                 tmpObj._OorderNo =  dr["orderNo"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["orderNo"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("ownerId") && !(dr["ownerId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._ownerId =   Convert.ToInt32(dr["ownerId"].ToString()); ;
                                 tmpObj._OownerId =   Convert.ToInt32(dr["ownerId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["ownerId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("type") && !(dr["type"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._type =   Convert.ToInt32(dr["type"].ToString()); ;
                                 tmpObj._Otype =   Convert.ToInt32(dr["type"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["type"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("status") && !(dr["status"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._status =   Convert.ToInt32(dr["status"].ToString()); ;
                                 tmpObj._Ostatus =   Convert.ToInt32(dr["status"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["status"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("planStartTime") && !(dr["planStartTime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._planStartTime =  dr["planStartTime"].ToString() ;
                                 tmpObj._OplanStartTime =  dr["planStartTime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["planStartTime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("planEndTime") && !(dr["planEndTime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._planEndTime =  dr["planEndTime"].ToString() ;
                                 tmpObj._OplanEndTime =  dr["planEndTime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["planEndTime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("startTime") && !(dr["startTime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._startTime =  dr["startTime"].ToString() ;
                                 tmpObj._OstartTime =  dr["startTime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["startTime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("endTime") && !(dr["endTime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._endTime =  dr["endTime"].ToString() ;
                                 tmpObj._OendTime =  dr["endTime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["endTime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createby") && !(dr["createby"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createby =   Convert.ToInt32(dr["createby"].ToString()); ;
                                 tmpObj._Ocreateby =   Convert.ToInt32(dr["createby"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createby"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("priority") && !(dr["priority"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._priority =   Convert.ToInt32(dr["priority"].ToString()); ;
                                 tmpObj._Opriority =   Convert.ToInt32(dr["priority"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["priority"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("approvedby") && !(dr["approvedby"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._approvedby =   Convert.ToInt32(dr["approvedby"].ToString()); ;
                                 tmpObj._Oapprovedby =   Convert.ToInt32(dr["approvedby"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["approvedby"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("inputValus") && !(dr["inputValus"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._inputValus =  dr["inputValus"].ToString() ;
                                 tmpObj._OinputValus =  dr["inputValus"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["inputValus"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("condition") && !(dr["condition"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._condition =  dr["condition"].ToString() ;
                                 tmpObj._Ocondition =  dr["condition"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["condition"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("adjustStatus") && !(dr["adjustStatus"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._adjustStatus =   Convert.ToInt32(dr["adjustStatus"].ToString()); ;
                                 tmpObj._OadjustStatus =   Convert.ToInt32(dr["adjustStatus"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["adjustStatus"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("noticeErp") && !(dr["noticeErp"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._noticeErp =   Convert.ToBoolean(dr["noticeErp"].ToString()); ;
+                                tmpObj._OnoticeErp =   Convert.ToBoolean(dr["noticeErp"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["noticeErp"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -124,7 +389,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSSTOCKPANDIAN SET ORDERNO = @ORDERNO,OWNERID = @OWNERID,TYPE = @TYPE,STATUS = @STATUS,PLANSTARTTIME = @PLANSTARTTIME,PLANENDTIME = @PLANENDTIME,STARTTIME = @STARTTIME,ENDTIME = @ENDTIME,CREATEBY = @CREATEBY,PRIORITY = @PRIORITY,APPROVEDBY = @APPROVEDBY,INPUTVALUS = @INPUTVALUS,CONDITION = @CONDITION,ADJUSTSTATUS = @ADJUSTSTATUS,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSSTOCKPANDIAN SET ORDERNO = @ORDERNO,OWNERID = @OWNERID,TYPE = @TYPE,STATUS = @STATUS,PLANSTARTTIME = @PLANSTARTTIME,PLANENDTIME = @PLANENDTIME,STARTTIME = @STARTTIME,ENDTIME = @ENDTIME,CREATEBY = @CREATEBY,PRIORITY = @PRIORITY,APPROVEDBY = @APPROVEDBY,INPUTVALUS = @INPUTVALUS,CONDITION = @CONDITION,ADJUSTSTATUS = @ADJUSTSTATUS,NOTICEERP = @NOTICEERP,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSSTOCKPANDIAN {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -175,6 +440,7 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._inputValus == null ? "" : "INPUTVALUS"  + ",";
              colums+= tmpObj._condition == null ? "" : "CONDITION"  + ",";
              colums+= tmpObj._adjustStatus == null ? "" : "ADJUSTSTATUS"  + ",";
+             colums+= tmpObj._noticeErp == null ? "" : "NOTICEERP"  + ",";
              colums+= tmpObj._operater == null ? "" : "OPERATER"  + ",";
     	 return colums.Substring(0,colums.Length -1) ;
       
@@ -197,6 +463,7 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._inputValus == null ? "" : "@INPUTVALUS"  + ",";
              values+= tmpObj._condition == null ? "" : "@CONDITION"  + ",";
              values+= tmpObj._adjustStatus == null ? "" : "@ADJUSTSTATUS"  + ",";
+             values+= tmpObj._noticeErp == null ? "" : "@NOTICEERP"  + ",";
              values+= tmpObj._operater == null ? "" : "@OPERATER"  + ",";
     	 return values.Substring(0,values.Length -1) ;
  
@@ -261,6 +528,10 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="ADJUSTSTATUS  = @ADJUSTSTATUS," ; 
             }
+            if (tmpObj._noticeErp !=null && tmpObj._noticeErp != tmpObj._OnoticeErp)
+            {
+                updateFields +="NOTICEERP  = @NOTICEERP," ; 
+            }
             if (tmpObj._operater !=null && tmpObj._operater != tmpObj._Ooperater)
             {
                 updateFields +="OPERATER  = @OPERATER," ; 
@@ -305,6 +576,7 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@INPUTVALUS",  VerifyDbnull(tmpObj._inputValus))  ;
                           oraCmd.Parameters.AddWithValue("@CONDITION",  VerifyDbnull(tmpObj._condition))  ;
                           oraCmd.Parameters.AddWithValue("@ADJUSTSTATUS",  VerifyDbnull(tmpObj._adjustStatus))  ;
+                          oraCmd.Parameters.AddWithValue("@NOTICEERP",  VerifyDbnull(tmpObj._noticeErp))  ;
                           oraCmd.Parameters.AddWithValue("@OPERATER",  VerifyDbnull(tmpObj._operater))  ;
                          // oraCmd.Parameters.AddWithValue("@LASTMODIFIED", "getdate()")  ;                     
 					return;
@@ -337,6 +609,8 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@CONDITION",  VerifyDbnull(tmpObj._condition))  ;
                        if(tmpObj._adjustStatus!=null)
                        oraCmd.Parameters.AddWithValue("@ADJUSTSTATUS",  VerifyDbnull(tmpObj._adjustStatus))  ;
+                       if(tmpObj._noticeErp!=null)
+                       oraCmd.Parameters.AddWithValue("@NOTICEERP",  VerifyDbnull(tmpObj._noticeErp))  ;
                        if(tmpObj._operater!=null)
                        oraCmd.Parameters.AddWithValue("@OPERATER",  VerifyDbnull(tmpObj._operater))  ;
                 return;

Model/wms/data/basic/WmsStock_base.cs

@@ -2,7 +2,7 @@
 ///Data Object 
 ///BASIC CLASS FOR TABLE t_wmsStock
 ///By wm  
-///on 08/04/2023
+///on 10/16/2023
 /// </summary>
  
 using System;
@@ -34,6 +34,8 @@ namespace  DeiNiu.wms.Data.Model
                     internal decimal _countOut,_OcountOut;   
                     internal decimal _countIn,_OcountIn;   
                     internal decimal _countOuting,_OcountOuting;   
+                    internal decimal _adjustingCnt,_OadjustingCnt;   
+                    internal decimal _plateCount,_OplateCount;   
                     internal decimal _preLockOut,_OpreLockOut;   
                     internal int _state,_Ostate;   
                     internal string _maintainDate = String.Empty,_OmaintainDate= String.Empty;   
@@ -133,6 +135,16 @@ namespace  DeiNiu.wms.Data.Model
 			 set {_countOuting = value;}    
 		}  
         
+        public  decimal   adjustingCnt{
+			get {return _adjustingCnt;}
+			 set {_adjustingCnt = value;}    
+		}  
+        
+        public  decimal   plateCount{
+			get {return _plateCount;}
+			 set {_plateCount = value;}    
+		}  
+        
         public  decimal   preLockOut{
 			get {return _preLockOut;}
 			 set {_preLockOut = value;}    
@@ -177,7 +189,7 @@ namespace  DeiNiu.wms.Data.Model
 		#endregion
                  
       #region fieldNames 
-      public enum fields{skuId,skuCode,goodsId,batch,locationId,plateId,productDate,validDate,validationTerm,count,countLock,countOut,countIn,countOuting,preLockOut,state,maintainDate,description,operater}
+      public enum fields{skuId,skuCode,goodsId,batch,locationId,plateId,productDate,validDate,validationTerm,count,countLock,countOut,countIn,countOuting,adjustingCnt,plateCount,preLockOut,state,maintainDate,description,operater}
       #endregion
     
 	

Model/wms/data/basic/WmsStock_base_Imp.cs

@@ -2,7 +2,7 @@
 ///Data  Implemention Object 
 ///BASIC CRUD CLASS FOR TABLE t_wmsStock
 ///By wm 
-///on 08/04/2023
+///on 10/16/2023
 /// </summary>
  
 
@@ -23,114 +23,449 @@ namespace DeiNiu.wms.Data.Model
                   WmsStock_base  tmpObj = (WmsStock_base)obj;     
                         if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj.ID =   Convert.ToInt32(dr["id"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuId") && !(dr["skuId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
                                 tmpObj._OskuId =   Convert.ToInt32(dr["skuId"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("skuCode") && !(dr["skuCode"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._skuCode =  dr["skuCode"].ToString() ;
                                 tmpObj._OskuCode =  dr["skuCode"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["skuCode"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._goodsId =  dr["goodsId"].ToString() ;
                                 tmpObj._OgoodsId =  dr["goodsId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["goodsId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("batch") && !(dr["batch"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._batch =  dr["batch"].ToString() ;
                                 tmpObj._Obatch =  dr["batch"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["batch"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("locationId") && !(dr["locationId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._locationId =  dr["locationId"].ToString() ;
                                 tmpObj._OlocationId =  dr["locationId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["locationId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("plateId") && !(dr["plateId"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._plateId =  dr["plateId"].ToString() ;
                                 tmpObj._OplateId =  dr["plateId"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["plateId"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("productDate") && !(dr["productDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._productDate =  dr["productDate"].ToString() ;
                                 tmpObj._OproductDate =  dr["productDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["productDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validDate") && !(dr["validDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validDate =  dr["validDate"].ToString() ;
                                 tmpObj._OvalidDate =  dr["validDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("validationTerm") && !(dr["validationTerm"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._validationTerm =   Convert.ToInt32(dr["validationTerm"].ToString()); ;
                                 tmpObj._OvalidationTerm =   Convert.ToInt32(dr["validationTerm"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["validationTerm"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("count") && !(dr["count"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._count =   Convert.ToDecimal(dr["count"].ToString()); ;
                                 tmpObj._Ocount =   Convert.ToDecimal(dr["count"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["count"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("countLock") && !(dr["countLock"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._countLock =   Convert.ToDecimal(dr["countLock"].ToString()); ;
                                 tmpObj._OcountLock =   Convert.ToDecimal(dr["countLock"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["countLock"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("countOut") && !(dr["countOut"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._countOut =   Convert.ToDecimal(dr["countOut"].ToString()); ;
                                 tmpObj._OcountOut =   Convert.ToDecimal(dr["countOut"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["countOut"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("countIn") && !(dr["countIn"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._countIn =   Convert.ToDecimal(dr["countIn"].ToString()); ;
                                 tmpObj._OcountIn =   Convert.ToDecimal(dr["countIn"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["countIn"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("countOuting") && !(dr["countOuting"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._countOuting =   Convert.ToDecimal(dr["countOuting"].ToString()); ;
                                 tmpObj._OcountOuting =   Convert.ToDecimal(dr["countOuting"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["countOuting"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("adjustingCnt") && !(dr["adjustingCnt"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._adjustingCnt =   Convert.ToDecimal(dr["adjustingCnt"].ToString()); ;
+                                tmpObj._OadjustingCnt =   Convert.ToDecimal(dr["adjustingCnt"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["adjustingCnt"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
+                            }
+                        if (dr.Table.Columns.Contains("plateCount") && !(dr["plateCount"] is DBNull))
+                            {
+                              try
+                                { 
+                                tmpObj._plateCount =   Convert.ToDecimal(dr["plateCount"].ToString()); ;
+                                tmpObj._OplateCount =   Convert.ToDecimal(dr["plateCount"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["plateCount"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("preLockOut") && !(dr["preLockOut"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._preLockOut =   Convert.ToDecimal(dr["preLockOut"].ToString()); ;
                                 tmpObj._OpreLockOut =   Convert.ToDecimal(dr["preLockOut"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["preLockOut"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._state =   Convert.ToInt32(dr["state"].ToString()); ;
                                 tmpObj._Ostate =   Convert.ToInt32(dr["state"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("maintainDate") && !(dr["maintainDate"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._maintainDate =  dr["maintainDate"].ToString() ;
                                 tmpObj._OmaintainDate =  dr["maintainDate"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["maintainDate"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("description") && !(dr["description"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._description =  dr["description"].ToString() ;
                                 tmpObj._Odescription =  dr["description"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["description"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._operater =   Convert.ToInt32(dr["operater"].ToString()); ;
                                 tmpObj._Ooperater =   Convert.ToInt32(dr["operater"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._lastmodified =  dr["lastmodified"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._createtime =  dr["createtime"].ToString() ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
                         if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
                             {
+                              try
+                                { 
                                 tmpObj._dr =   Convert.ToBoolean(dr["dr"].ToString()); ;
+                                }
+                                catch (Exception er)
+                                {
+                                    LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
+                               
+                                    LogHelper.debug(this.GetType(), er.Message);
+                                    
+                                    
+                                }
+                    
+                               
                             }
              }
           }
@@ -144,7 +479,7 @@ namespace DeiNiu.wms.Data.Model
                     
                     break;
                 case (int)op_flag.update:
-                   // _strSql = "UPDATE dbo.T_WMSSTOCK SET SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,LOCATIONID = @LOCATIONID,PLATEID = @PLATEID,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,VALIDATIONTERM = @VALIDATIONTERM,COUNT = @COUNT,COUNTLOCK = @COUNTLOCK,COUNTOUT = @COUNTOUT,COUNTIN = @COUNTIN,COUNTOUTING = @COUNTOUTING,PRELOCKOUT = @PRELOCKOUT,STATE = @STATE,MAINTAINDATE = @MAINTAINDATE,DESCRIPTION = @DESCRIPTION,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
+                   // _strSql = "UPDATE dbo.T_WMSSTOCK SET SKUID = @SKUID,SKUCODE = @SKUCODE,GOODSID = @GOODSID,BATCH = @BATCH,LOCATIONID = @LOCATIONID,PLATEID = @PLATEID,PRODUCTDATE = @PRODUCTDATE,VALIDDATE = @VALIDDATE,VALIDATIONTERM = @VALIDATIONTERM,COUNT = @COUNT,COUNTLOCK = @COUNTLOCK,COUNTOUT = @COUNTOUT,COUNTIN = @COUNTIN,COUNTOUTING = @COUNTOUTING,ADJUSTINGCNT = @ADJUSTINGCNT,PLATECOUNT = @PLATECOUNT,PRELOCKOUT = @PRELOCKOUT,STATE = @STATE,MAINTAINDATE = @MAINTAINDATE,DESCRIPTION = @DESCRIPTION,OPERATER = @OPERATER,LASTMODIFIED = getdate()  WHERE ID = @ID";
                     _strSql = "UPDATE dbo.T_WMSSTOCK {0} WHERE ID = @ID"; 
                     _strSql = String.Format(_strSql, getChangedFields(tmpObj) );
                     break;
@@ -195,6 +530,8 @@ namespace DeiNiu.wms.Data.Model
              colums+= tmpObj._countOut == null ? "" : "COUNTOUT"  + ",";
              colums+= tmpObj._countIn == null ? "" : "COUNTIN"  + ",";
              colums+= tmpObj._countOuting == null ? "" : "COUNTOUTING"  + ",";
+             colums+= tmpObj._adjustingCnt == null ? "" : "ADJUSTINGCNT"  + ",";
+             colums+= tmpObj._plateCount == null ? "" : "PLATECOUNT"  + ",";
              colums+= tmpObj._preLockOut == null ? "" : "PRELOCKOUT"  + ",";
              colums+= tmpObj._state == null ? "" : "STATE"  + ",";
              colums+= tmpObj._maintainDate == null ? "" : "MAINTAINDATE"  + ",";
@@ -221,6 +558,8 @@ namespace DeiNiu.wms.Data.Model
              values+= tmpObj._countOut == null ? "" : "@COUNTOUT"  + ",";
              values+= tmpObj._countIn == null ? "" : "@COUNTIN"  + ",";
              values+= tmpObj._countOuting == null ? "" : "@COUNTOUTING"  + ",";
+             values+= tmpObj._adjustingCnt == null ? "" : "@ADJUSTINGCNT"  + ",";
+             values+= tmpObj._plateCount == null ? "" : "@PLATECOUNT"  + ",";
              values+= tmpObj._preLockOut == null ? "" : "@PRELOCKOUT"  + ",";
              values+= tmpObj._state == null ? "" : "@STATE"  + ",";
              values+= tmpObj._maintainDate == null ? "" : "@MAINTAINDATE"  + ",";
@@ -289,6 +628,14 @@ namespace DeiNiu.wms.Data.Model
             {
                 updateFields +="COUNTOUTING  = @COUNTOUTING," ; 
             }
+            if (tmpObj._adjustingCnt !=null && tmpObj._adjustingCnt != tmpObj._OadjustingCnt)
+            {
+                updateFields +="ADJUSTINGCNT  = @ADJUSTINGCNT," ; 
+            }
+            if (tmpObj._plateCount !=null && tmpObj._plateCount != tmpObj._OplateCount)
+            {
+                updateFields +="PLATECOUNT  = @PLATECOUNT," ; 
+            }
             if (tmpObj._preLockOut !=null && tmpObj._preLockOut != tmpObj._OpreLockOut)
             {
                 updateFields +="PRELOCKOUT  = @PRELOCKOUT," ; 
@@ -349,6 +696,8 @@ namespace DeiNiu.wms.Data.Model
                           oraCmd.Parameters.AddWithValue("@COUNTOUT",  VerifyDbnull(tmpObj._countOut))  ;
                           oraCmd.Parameters.AddWithValue("@COUNTIN",  VerifyDbnull(tmpObj._countIn))  ;
                           oraCmd.Parameters.AddWithValue("@COUNTOUTING",  VerifyDbnull(tmpObj._countOuting))  ;
+                          oraCmd.Parameters.AddWithValue("@ADJUSTINGCNT",  VerifyDbnull(tmpObj._adjustingCnt))  ;
+                          oraCmd.Parameters.AddWithValue("@PLATECOUNT",  VerifyDbnull(tmpObj._plateCount))  ;
                           oraCmd.Parameters.AddWithValue("@PRELOCKOUT",  VerifyDbnull(tmpObj._preLockOut))  ;
                           oraCmd.Parameters.AddWithValue("@STATE",  VerifyDbnull(tmpObj._state))  ;
                           oraCmd.Parameters.AddWithValue("@MAINTAINDATE",  VerifyDbnull(tmpObj._maintainDate))  ;
@@ -385,6 +734,10 @@ namespace DeiNiu.wms.Data.Model
                        oraCmd.Parameters.AddWithValue("@COUNTIN",  VerifyDbnull(tmpObj._countIn))  ;
                        if(tmpObj._countOuting!=null)
                        oraCmd.Parameters.AddWithValue("@COUNTOUTING",  VerifyDbnull(tmpObj._countOuting))  ;
+                       if(tmpObj._adjustingCnt!=null)
+                       oraCmd.Parameters.AddWithValue("@ADJUSTINGCNT",  VerifyDbnull(tmpObj._adjustingCnt))  ;
+                       if(tmpObj._plateCount!=null)
+                       oraCmd.Parameters.AddWithValue("@PLATECOUNT",  VerifyDbnull(tmpObj._plateCount))  ;
                        if(tmpObj._preLockOut!=null)
                        oraCmd.Parameters.AddWithValue("@PRELOCKOUT",  VerifyDbnull(tmpObj._preLockOut))  ;
                        if(tmpObj._state!=null)

Model/wms/tables/Erp_purch.cs

@@ -219,10 +219,24 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(1400).Tables[0];
         }
 
-        public DataTable getByErpState(enumErpOrderStatus status)
+      
+
+        public DataTable getCusts4InTest()
         {
-            cmdParameters[0] = (int)status;
+            return CustQuery(1600).Tables[0];
+        }
+
+        public DataTable getByErpNoticeFailure()
+        {  
+            cmdParameters[0] = (int)enumErpOrderStatus.通知失败;
             return CustQuery(1500).Tables[0];
+             
+        }
+
+        public DataTable getPreValidResult(string preInNo)
+        {
+            cmdParameters[0] = preInNo;
+            return CustQuery(1700).Tables[0];
         }
     }
 }

Model/wms/tables/Erp_purch_receive_pre.cs

@@ -77,6 +77,11 @@ namespace DeiNiu.wms.Data.Model
             cmdParameters[0] = preInNo;
             return CustQuery(400).Tables[0];
         }
+        public DataTable getPreInSumary(string preInNo)
+        {
+            cmdParameters[0] = preInNo;
+            return CustQuery(410).Tables[0];
+        }
         public DataTable getPreInDetailWindows(string preInNo)
         {
             cmdParameters[0] = preInNo;
@@ -131,10 +136,33 @@ namespace DeiNiu.wms.Data.Model
             return CustOper(800);
         }
 
-        public DataTable getAll4ValinIn()
+        public DataTable getAll4ValinIn(int storeType)
         {
+            cmdParameters[0] = storeType;
             return CustQuery(900).Tables[0];
         }
+
+        public DataTable getAll4ValinIn(string preInOrderNo,int storeType)
+        {
+            cmdParameters[0] = preInOrderNo;
+            cmdParameters[1] = storeType;
+            return CustQuery(910).Tables[0];
+        }
+
+
+        public List<Erp_purch> getPuchObjescts(String preInNo)
+        {
+            cmdParameters[0] = preInNo; 
+
+            DataTable dt= CustQuery(1000).Tables[0];
+            List<Erp_purch> lst = new List<Erp_purch>();
+
+            foreach(DataRow dr in dt.Rows)
+            {
+                lst.Add(new Erp_purch(dr[0].ToString()));
+            }
+            return lst;
+        }
     }
 }
  

Model/wms/tables/Erp_sale.cs

@@ -52,7 +52,27 @@ namespace DeiNiu.wms.Data.Model
             cmdParameters[0] = name;
             return  CustQuery(100);
         }
+        public DataTable getDetailByPickOrder(string pickOrderNo)
+        {
+            cmdParameters[0] = pickOrderNo;
+          return CustQuery(600).Tables[0];
+        }
 
+        public DataTable getSaleOrdersByPickOrder(string pickOrderNo)
+        {
+            cmdParameters[0] = pickOrderNo;
+            return CustQuery(150).Tables[0];
+        }
+
+        public List<Erp_sale> getObjs(DataTable dt)
+        {
+            List<Erp_sale> lst = new List<Erp_sale>();
+            foreach(DataRow dr in dt.Rows)
+            {
+                lst.Add(new Erp_sale(dr));
+            }
+            return lst;
+        }
 
         /// <summary>
         /// 同步新销售订单前
@@ -60,7 +80,7 @@ namespace DeiNiu.wms.Data.Model
         /// 同步后更新erp_sale 表，并删除临时数据
         /// </summary>
         /// <returns></returns>
-         public int prepareSaleInTmpData()
+        public int prepareSaleInTmpData()
          { 
              return CustOper(200); 
          }
@@ -129,6 +149,31 @@ namespace DeiNiu.wms.Data.Model
             return CustOper(300); 
         }
 
+        public DataSet getPickOutDetailSum(string queryStr, int rowStart, int rowEnd)
+        {
+            if (rowEnd > rowStart && rowStart > 0)
+            {
+                this.rownumStart = rowStart;
+                this.rownumEnd = rowEnd;
+            }
+
+            cmdParameters[0] = getCondition(queryStr);
+            return CustQuery(900);
+        }
+
+        public DataSet getPickOutDetail(string queryStr, int rowStart, int rowEnd)
+        {
+            if (rowEnd > rowStart && rowStart > 0)
+            {
+                this.rownumStart = rowStart;
+                this.rownumEnd = rowEnd;
+            }
+
+
+            cmdParameters[0] = getCondition(queryStr);
+            return CustQuery(800);
+        }
+
         public int updateWhType(string orderNo, int whType,enumOutStockRequestStatus status)
         {
             cmdParameters[0] = orderNo;
@@ -142,6 +187,24 @@ namespace DeiNiu.wms.Data.Model
             cmdParameters[0] = _sale_order;
             CustOper(500);
         }
+
+        public DataTable getByErpState()
+        {
+            cmdParameters[0] =(int)enumErpOrderStatus.通知失败;
+            cmdParameters[1] = (int)enumOutStockRequestStatus.已装车;
+
+
+            return CustQuery(700).Tables[0];
+        }
+
+        /// <summary>
+        /// 出入库状态看板数据
+        /// </summary>
+        /// <returns></returns>
+        public DataSet getKanBanOrdersByState()
+        {
+            return CustQuery(1000);
+        }
     }
 }
  

Model/wms/tables/Node.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
+using DeiNiu.Utils;
 
 namespace DeiNiu.wms.Data.Model
 {
@@ -65,7 +66,10 @@ namespace DeiNiu.wms.Data.Model
         {
             return _name;
         }
-
+        public string ToJsonString()
+        {
+            return Util.getJson(this);
+        }
         /// <summary>
         /// query dic that has flag
         /// used for building combox

Model/wms/tables/TmsStock.cs

@@ -101,6 +101,17 @@ namespace DeiNiu.wms.Data.Model
 
         }
 
+        public string getSeedsLocation()
+        {
+        
+            DataTable dt = CustQuery(302).Tables[0];
+            if (dt.Rows.Count > 0)
+            {
+                return dt.Rows[0][0].ToString();
+            }
+            return "分播区未定义";
+        }
+
         /// <summary>
         /// 取零货集货明细
         /// </summary>

Model/wms/tables/TmsTranRequest.cs

@@ -176,6 +176,14 @@ namespace DeiNiu.wms.Data.Model
 
         }
 
+        public DataTable getLatestPickRequestsByViechole( string viechleNo)
+        {
+            cmdParameters[0] = viechleNo; 
+
+            return CustQuery(900).Tables[0];
+
+        }
+
     }
 }
  

Model/wms/tables/WmsFlow.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
+using DeiNiu.Utils;
 
 namespace DeiNiu.wms.Data.Model
 {
@@ -39,18 +40,81 @@ namespace DeiNiu.wms.Data.Model
         ///   
         /// </summary>
         /// <param name="flowNo"></param>
-       /* public WmsFlow(string flowNo)
+        /* public WmsFlow(string flowNo)
+         {
+             cmdParameters[0] = flowNo;
+             getModel(200);
+         } */
+
+        public WmsFlow( string orderNo,string flowNo, enumFlowTaskStatus status )
         {
             cmdParameters[0] = flowNo;
-            getModel(200);
-        } */
-        
-        public WmsFlow(string taskNo, string orderNo)
-        {
-            cmdParameters[0] = taskNo;
             cmdParameters[1] = orderNo;
+            cmdParameters[2] =(int) status;
             getModel(250);
         }
+        public WmsFlow(string orderNo, string flowNo )
+        {
+            cmdParameters[0] = flowNo;
+            cmdParameters[1] = orderNo;
+       
+            getModel(270);
+        }
+
+        public enumRepResult checkFlow(int ownerId,int taskType)
+        {
+            LogHelper.debug("checkFlow", string.Format(" flow task:{3} flow current owner: {0}, to valid ownerId: {1}, taskType: {2} ", owner, ownerId, taskType,task ));
+            if (owner>0 && owner != ownerId)
+            {
+                return enumRepResult.任务已被他人抢占;
+            }else if(owner == 0)
+            {  
+                cmdParameters[0] = ownerId;
+                cmdParameters[1] = taskType;
+                int cnt = queryCount(280);
+                LogHelper.debug("checkFlow", string.Format(" flow current owner: {0}, to valid ownerId: {1}, taskType: {2}, exists cnt {3}", owner,ownerId,taskType,cnt));
+                if (cnt > WmsConstants.MAX_TASKS_OWN)
+                {
+                    return enumRepResult.任务已达到上线;
+                }
+            }
+
+            return enumRepResult.成功;
+
+        }
+   
+        public void finishedTasksPlus(int ownerId,bool isChildTasksOperation=false,bool isDone=false)
+        {
+            if (finishedCnt < taskCnt)
+            {
+                 finishedCnt++;
+            }
+           
+            state = (int)enumFlowTaskStatus.进行中;
+            owner = ownerId;
+            if (isChildTasksOperation) //细分任务比总体任务多，更新原来任务数
+            {
+                if (taskCnt < finishedCnt)
+                {
+                    taskCnt= finishedCnt;
+                }
+                
+
+                if (isDone)
+                {
+                    state = (int)enumFlowTaskStatus.已完成;
+                    finishedCnt = taskCnt;
+                }
+
+            }else
+            if (finishedCnt >= taskCnt)
+            {
+                state = (int)enumFlowTaskStatus.已完成;
+                finishedCnt = taskCnt;
+            }
+            Update();
+        }
+
 
         public WmsFlow(string taskNo)
         { 
@@ -145,9 +209,28 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(601).Tables[0];
         }
 
-        public DataTable getTasks(string orderNo, string flowNo)
+        public Boolean isStarted(string orderNo,string flowNo)
         {
-            throw new NotImplementedException();
+            cmdParameters[0] = orderNo;
+            cmdParameters[1] = flowNo;
+            return CustQuery(1100).Tables[0].Rows.Count>0;
+        }
+
+        public int startAllTask(string orderNo )
+        {
+
+            cmdParameters[0] = orderNo; 
+            return CustOper(1200);
+        }
+
+        public DataTable getTodayTaskSum()
+        {
+            return CustQuery(1300).Tables[0];
+        }
+
+        public DataSet getTodayKanban()
+        {
+            return CustQuery(1600);
         }
     }
 }

Model/wms/tables/WmsGoods.cs

@@ -123,10 +123,16 @@ namespace DeiNiu.wms.Data.Model
 
          public bool isZhitong
          { 
-            get { return !String.IsNullOrEmpty(_isZhitong) &&_isZhitong.Equals("1"); }
+            get { return _canZhitong || !String.IsNullOrEmpty(_isZhitong) &&_isZhitong.Equals("1"); }
          }
+        public bool isZhitongFromStore
+        {
+            get { return canZhitong && WmsConstants.OUT_ZHITONG_FROM_STORE; }
+        }
 
-         public bool isQc
+         
+
+        public bool isQc
          {
              get {
                  return Convert.ToBoolean(_isQc);
@@ -375,7 +381,7 @@ namespace DeiNiu.wms.Data.Model
         /// <returns></returns>
         public decimal getMaxCount(int locVolType)
         {
-            decimal goodsMaxcnt = 0m;
+            decimal goodsMaxcnt = WmsConstants.BULK_MAX_RATE;
             switch (locVolType)
             {
                 case (int)enumWhLocVol.零库:
@@ -394,23 +400,29 @@ namespace DeiNiu.wms.Data.Model
                     goodsMaxcnt = this.batchMax3;
                     goodsMaxcnt = goodsMaxcnt > 0 ? goodsMaxcnt : bigCount * WmsConstants.BATCH3_MAX_RATE;
                     break;
+                     
 
             }
             return goodsMaxcnt;
         }
 
-        private decimal _stockSumCount, _stockBulkCount, _stockBatch1Count, _stockBatch2Count, _stockBatch3Count;
+        private decimal _stockSumCount, _stockBulkCount, _stockBatch1Count, _stockBatch2Count, _stockBatch3Count,_stockSumAjustCount;
         private decimal _stockSumCountIn, _stockBulkCountIn, _stockBatch1CountIn, _stockBatch2CountIn, _stockBatch3CountIn;
         private decimal _stockSumCountOuting, _stockBulkCountOuting, _stockBatch1CountOuting, _stockBatch2CountOuting, _stockBatch3CountOuting;
         public decimal stockSumCountIn
         {
             get { return _stockSumCountIn; }
 
+        }
+        public decimal  stockSumAjustCount
+        {
+            get { return _stockSumAjustCount; }
+
         }
 
         public decimal stockAvCount 
         {
-            get { return _stockSumCount- _stockSumCountOuting>=0? _stockSumCount - _stockSumCountOuting:0; }
+            get { return _stockSumCount- _stockSumCountOuting + _stockSumAjustCount  >= 0? _stockSumCount - _stockSumCountOuting + _stockSumAjustCount : 0; }
 
         }
         public decimal stockBulkCountIn
@@ -587,6 +599,7 @@ namespace DeiNiu.wms.Data.Model
             _stockSumCount = 0m; _stockBulkCount = 0m; _stockBatch1Count = 0m; _stockBatch2Count = 0m;
             _stockSumCountIn = 0m; _stockBulkCountIn = 0m; _stockBatch1CountIn = 0m; _stockBatch2CountIn = 0m;
             _stockSumCountOuting = 0m; _stockBulkCountOuting = 0m; _stockBatch1CountOuting = 0m; _stockBatch2CountOuting = 0m;
+            _stockSumAjustCount = 0m;
             foreach (DataRow dr in dt.Rows){
 
                 WmsStock st = new WmsStock(dr);
@@ -595,8 +608,8 @@ namespace DeiNiu.wms.Data.Model
                 decimal cnt = st.count - st.countOut;
                 _stockSumCount += cnt;
                 _stockSumCountIn +=st.countIn;
-                _stockSumCountOuting += st.countOuting; 
-
+                _stockSumCountOuting += st.countOuting;
+                _stockSumAjustCount += st.adjustingCnt;
                 switch (st.location.volType)
                 {
                     case (int) enumWhLocVol.零库:

Model/wms/tables/WmsInRequest.cs

@@ -215,13 +215,25 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(1200).Tables[0];
         }
 
-        public DataTable getZhiTongOrderByCust(string preNo, string orderBy)
+        public DataTable getZhiTongOrderByCust(string preNo,  string orderBy,string barcoce ="")
         {
             cmdParameters[0] = preNo;
             cmdParameters[1] = orderBy;
-
+            cmdParameters[2] = barcoce;
             return CustQuery(1300).Tables[0];
         }
+
+        public DataSet queryStockInSum(string querystr, int rownumStart, int rownumEnd)
+        {
+            if (rownumEnd > rownumStart && rownumStart > 0)
+            {
+                this.rownumStart = rownumStart;
+                this.rownumEnd = rownumEnd;
+            }
+
+            cmdParameters[0] = getCondition(querystr);
+            return CustQuery(991);
+        }
     }
 }
  

Model/wms/tables/WmsInRequestDetail.cs

@@ -63,6 +63,11 @@ namespace DeiNiu.wms.Data.Model
         {
             throw new NotImplementedException();
         }
+
+        public DataTable getFlows4ZhitongSeedsOut()
+        {
+            return CustQuery(500).Tables[0];
+        }
     }
 }
  

Model/wms/tables/WmsInUpPort.cs

@@ -95,6 +95,16 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(600).Tables[0];
 
         }
+        public DataTable getJobsByFlowSku(string flowNo, string goodsId,string productDate  )
+        {
+            cmdParameters[0] = flowNo;
+            cmdParameters[1] = goodsId;
+            cmdParameters[2] = productDate;
+
+            return CustQuery(610).Tables[0];
+
+        }
+
         public DataTable getAlltasksForInTest( )
         {
             

Model/wms/tables/WmsOrderDetail.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
+using DeiNiu.Utils;
 
 namespace DeiNiu.wms.Data.Model
 {
@@ -53,6 +54,13 @@ namespace DeiNiu.wms.Data.Model
 
             return lst;
         }
+
+        public bool isAllPicked(string orderNo)
+        {
+            cmdParameters[0] = orderNo;
+            cmdParameters[1] = (int)enumOutStockDetailStatus.完成分拣; 
+            return queryCount(400) == 0;
+        }
     }
 }
  

Model/wms/tables/WmsOrderRequest.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Data;
 using System.Transactions;
+using DeiNiu.Utils;
 
 namespace DeiNiu.wms.Data.Model
 {
@@ -65,6 +66,16 @@ namespace DeiNiu.wms.Data.Model
             }
             return rt;
         }
+
+        public DataTable getNoticeFailures()
+        {
+            return getByState( enumOrderStatus.通知ERP失败);
+        }
+        public DataTable getByState(enumOrderStatus state)
+        {
+            cmdParameters[0] =(int) state;
+            return CustQuery(400).Tables[0];
+        }
     }
 }
  

Model/wms/tables/WmsOutPickLable.cs

@@ -120,6 +120,13 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(501);
         }
 
+        public DataTable getDpsPickList(string dpsOrder, enumPickState state)
+        {
+            cmdParameters[0] = dpsOrder;
+            cmdParameters[1] = (int)state;
+            return CustQuery(503).Tables[0];
+        }
+
         /// 分区拣选明细
         /// </summary>
         /// <param name="part"></param>

Model/wms/tables/WmsOutPickLable_tmp.cs

@@ -68,6 +68,22 @@ namespace DeiNiu.wms.Data.Model
             cmdParameters[0] = name;
             return  CustQuery(100);
         }
+
+        public int clearByDpsOrder(string jobNo)
+        {
+            cmdParameters[0] = jobNo;
+          return  CustOper(300);
+        }
+        public DataTable getByDpsOrder(string jobNo)
+        {
+            cmdParameters[0] = jobNo;
+            return CustQuery(400).Tables[0];
+        }
+        public int clearByPartion(int partion)
+        {
+            cmdParameters[0] = partion;
+            return CustOper(500);
+        }
     }
 }
  

Model/wms/tables/WmsOutPickPort.cs

@@ -58,6 +58,15 @@ namespace DeiNiu.wms.Data.Model
             cmdParameters[0] = pickOrderNo;
             return CustQuery(200).Tables[0];
         }
+        public List<WmsOutPickPort> getObjs(DataTable dt)
+        {
+            List<WmsOutPickPort> lst = new List<WmsOutPickPort>();
+            foreach(DataRow dr in dt.Rows)
+            {
+                lst.Add(new WmsOutPickPort(dr));
+            }
+            return lst;
+        }
         /// <summary>
         /// get pick detail by ID
         /// </summary>
@@ -206,7 +215,7 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(1001).Tables[0];
         }
 
-        public DataTable getFreeTasks(int partion, int lineId, bool batchOnly,enumOutOrderType orderType,int empId=0)
+        public DataTable getFreeTasks(int partion, int lineId, bool batchOnly,enumOrderType orderType,int empId=0)
         { 
             cmdParameters[0] = partion;
             cmdParameters[1] = lineId;
@@ -216,8 +225,19 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(1100).Tables[0];
         }
 
+        public DataTable getFreeTasksByJob(int partion, int lineId, bool batchOnly, enumOrderType orderType, int empId = 0)
+        {
+            cmdParameters[0] = partion;
+            cmdParameters[1] = lineId;
+            cmdParameters[2] = batchOnly;
+            cmdParameters[4] = (int)orderType;
+            cmdParameters[5] = empId;
+            return CustQuery(1110).Tables[0];
+        }
+
+
         public DataTable getAssignedTasks(int taskBy, int partion, int lineId, bool batchOnly,
-            enumOutOrderType orderType )
+            enumOrderType orderType )
         {
             cmdParameters[0] = taskBy;
             cmdParameters[1] = partion;
@@ -227,7 +247,7 @@ namespace DeiNiu.wms.Data.Model
             return CustQuery(1200).Tables[0];
         }
         public DataTable getAssignedTasks4Wince(int taskBy, int partion, int lineId , bool batchOnly
-            , enumOutOrderType orderType)
+            , enumOrderType orderType)
         {
             cmdParameters[0] = taskBy;
             cmdParameters[1] = partion;
@@ -311,6 +331,7 @@ namespace DeiNiu.wms.Data.Model
             cmdParameters[1] = (int)state;
             return CustQuery(2000).Tables[0];
         }
+
         public int getCntByDetailId(int pickDetailId, enumPickState state = enumPickState.未拣)
         {
             cmdParameters[0] = pickDetailId;
@@ -326,6 +347,20 @@ namespace DeiNiu.wms.Data.Model
             pickDetailId = wsr.orderDetailId;
         }
 
+        public DataTable getPickLightTasks(int takeBy, int partion, int orderType)
+        {
+            cmdParameters[0] = takeBy;
+            cmdParameters[1] = partion;
+            cmdParameters[2] = orderType;
+            return CustQuery(2200).Tables[0];
+        }
+
+        public DataTable geTasksByJobNo(string jobNo)
+        {
+            cmdParameters[0] = jobNo;  
+            return CustQuery(2300).Tables[0];
+        }
+
     }
 }
  

Model/wms/tables/WmsOutPickRequest.cs

@@ -89,7 +89,8 @@ namespace DeiNiu.wms.Data.Model
                 if (_outDetails == null && !string.IsNullOrEmpty(_pickOrderNo))
                 {
                     _outDetails = new List<WmsOutPickDetail>();
-                    DataTable dt = getOutDetail().Tables[0];
+                    cmdParameters[0] = this._pickOrderNo;
+                    DataTable dt = CustQuery(201).Tables[0];
                     foreach (DataRow dr in dt.Rows)
                     {
                         _outDetails.Add(new WmsOutPickDetail(dr));
@@ -157,7 +158,7 @@ namespace DeiNiu.wms.Data.Model
 
             List<WmsOutPickRequest> lst = new List<WmsOutPickRequest>();
 
-             cmdParameters[1] = (int)enumOutOrderType.销售出库;
+             cmdParameters[1] = (int)enumOrderType.销售出库;
             // cmdParameters[2] = (int)enumOutStockRequestStatus.等待波次;
             WaveRule wr = new WaveRule().getCurrentActiveRule(enumWaveRuleType.DPS灯光波次);
             cmdParameters[0] = wr;
@@ -171,17 +172,12 @@ namespace DeiNiu.wms.Data.Model
             {// t_wmsoutpickport 不生成零货任务
                 dt = CustQuery(301).Tables[0];
             }
-               
-
-            foreach (DataRow dr in dt.Rows)
-            {
-                lst.Add(new WmsOutPickRequest(dr));
-            }
-            return lst;
+            return getObjs(dt);
+ 
 
         }
 
-        public DataSet getRequests4DpsWave(enumOutOrderType orderType, WaveRule wr)
+        public DataSet getRequests4DpsWave(enumOrderType orderType, WaveRule wr)
         { 
 
             cmdParameters[0] = wr; 
@@ -203,7 +199,7 @@ namespace DeiNiu.wms.Data.Model
         /// 获取分区出库单
         /// </summary>
         /// <returns></returns>
-        public List<WmsOutPickRequest> getRequests4PartWave(enumOutOrderType orderType,int part)
+        public List<WmsOutPickRequest> getRequests4PartWave(enumOrderType orderType,int part)
         {
              
             List<WmsOutPickRequest> lst = new List<WmsOutPickRequest>();
@@ -215,18 +211,11 @@ namespace DeiNiu.wms.Data.Model
 
             DataTable dt = CustQuery(303).Tables[0];
 
-            foreach (DataRow dr in dt.Rows)
-            {
-
-                lst.Add(new WmsOutPickRequest(dr));
-
-
-            }
-            return lst;
+            return getObjs(dt);
 
 
         }
-         public List<DataTable> getRecords4PartWave(enumOutOrderType orderType)
+         public List<DataTable> getRecords4PartWave(enumOrderType orderType)
         {
 
             List<DataTable> lst = new List<DataTable>();
@@ -259,7 +248,7 @@ namespace DeiNiu.wms.Data.Model
 
          }
 
-         public List<WmsOutPickRequest> getRequests4PartWave(enumOutOrderType orderType)
+         public List<WmsOutPickRequest> getRequests4PartWave(enumOrderType orderType)
         {
 
             List<WmsOutPickRequest> lst = new List<WmsOutPickRequest>();
@@ -301,8 +290,9 @@ namespace DeiNiu.wms.Data.Model
         {
             return getObjs(getRequests( orderType, orderStatus) );
         }
+     
 
-        List<WmsOutPickRequest> getObjs(DataTable dtPickOrders)
+        public List<WmsOutPickRequest> getObjs(DataTable dtPickOrders)
         {
             List<WmsOutPickRequest> lst = new List<WmsOutPickRequest>();            
 
@@ -830,7 +820,7 @@ namespace DeiNiu.wms.Data.Model
         /// <param name="pickState"></param>
         /// <param name="orderDate">默认当天和昨天两天的</param>
         /// <returns></returns>
-        public DataTable getBatchPickOrderRepDetail(string flowNo,enumOutOrderType orderType, enumPickState pickState,string orderDate = "",int operId=0)
+        public DataTable getBatchPickOrderRepDetail(string flowNo,enumOrderType orderType, enumPickState pickState,string orderDate = "",int operId=0)
         {
             cmdParameters[0] = (int)orderType;
             cmdParameters[1] = (int)pickState;
@@ -916,6 +906,24 @@ namespace DeiNiu.wms.Data.Model
 
             return CustOper(431)>0;
         }
+
+        public List<WmsOutPickRequest> getRequestsReady4Validation()
+        {
+            return getObjs(CustQuery(2800).Tables[0]);
+        }
+
+        public List<WmsOutPickRequest> getRequestsByTransNo(string transNo)
+        {
+         
+            return getObjs(getReqDtByTransNo(  transNo));
+        }
+
+        public DataTable getReqDtByTransNo( string transNo)
+        {
+            cmdParameters[0] = transNo;
+
+            return  CustQuery(2900).Tables[0] ;
+        }
     }
 }
  

Model/wms/tables/WmsOutRequest.cs

@@ -189,7 +189,7 @@ namespace DeiNiu.wms.Data.Model
         /// <param name="orderType">订单类型</param>
         /// <param name="orderStatus">订单状态</param>
         /// <returns></returns>
-        public DataSet getRequests(DeiNiu.Utils.enumOutOrderType orderType,DeiNiu.Utils.enumOutStockRequestStatus orderStatus)
+        public DataSet getRequests(DeiNiu.Utils.enumOrderType orderType,DeiNiu.Utils.enumOutStockRequestStatus orderStatus)
         { 
              cmdParameters[0] =(int)orderType;
              cmdParameters[1] = (int)orderStatus;

Model/wms/tables/WmsPlate.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
+using DeiNiu.Utils;
 
 namespace DeiNiu.wms.Data.Model
 {
@@ -111,7 +112,8 @@ namespace DeiNiu.wms.Data.Model
             }
             return new WmsPlate();
         }
-        public List<WmsPlate> getSubPlates(string plateId)
+       
+  /*public List<WmsPlate> getSubPlates(string plateId)
         {
             List<WmsPlate> lst = new List<WmsPlate>();
             cmdParameters[0] = plateId;
@@ -123,13 +125,39 @@ namespace DeiNiu.wms.Data.Model
             }
             return lst;
         }
+        */
+        public List<string> getSubPlateIds(string plateId)
+        {
+            List<string> lst = new List<string>();
+            cmdParameters[0] = plateId;
+            DataTable dt = CustQuery(800).Tables[0];
+            foreach (DataRow dr in dt.Rows)
+            {
+                lst.Add(dr["subPlateId"].ToString());
+
+            }
+            return lst;
+        }
+
+        public List<WmsPlate> getSubPlates(string plateId)
+        {
+            List<WmsPlate> lstp = new List<WmsPlate>();
+            cmdParameters[0] = plateId;
+            DataTable dt = CustQuery(1000).Tables[0];
+            foreach (DataRow dr in dt.Rows)
+            {
+                lstp.Add(new WmsPlate(dr));
+
+            }
+            return lstp;
+        }
 
         /// <summary>
         /// 迭代取容器里所有商品，包含子容器及其子容器...
         /// </summary>
         /// <param name="plateId"></param>
         /// <returns></returns>
-        public List<WmsPlateStock_tmp> getPlateStoks(string plateId, bool showSub = false)
+       /* public List<WmsPlateStock_tmp> getPlateStoks(string plateId, bool showSub = false)
         {
             List<WmsPlateStock_tmp> stks = new List<WmsPlateStock_tmp>();
 
@@ -152,23 +180,30 @@ namespace DeiNiu.wms.Data.Model
 
             return stks;
         }
+        */
 
-        private List<DataTable> getPlateJobsDts(string plateId, bool showSub = false)
+        private List<DataTable> getPlateJobsDts(List<DataTable> dts,string plateId, bool showSub = false)
         {
-            List<DataTable> dts = new List<DataTable>();
+          //  LogHelper.debug(this.GetType(), string.Format(" plate contents dts size {2}, plateId {0},showSub {1}", plateId, showSub,dts.Count));
+
+         
 
             dts.Add(new WmsPlateStock_tmp().getStockLst(plateId));
 
+            LogHelper.debug(this.GetType(), string.Format(" plate contents dts size {2}, plateId {0},showSub {1}", plateId, showSub, dts.Count));
             if (!showSub)
             {
                 return dts;
             }
 
-            List<WmsPlate> subPlate = getSubPlates(plateId);
+            List<string>   subPlate = getSubPlateIds(plateId);
 
-            foreach (WmsPlate obj in subPlate)
+            LogHelper.debug(this.GetType(), string.Format(" plate {0} sub plate count {1} ",plateId,subPlate.Count  ));
+
+            foreach (string p in subPlate)
             {
-                dts.Concat(getPlateJobsDts(obj.plateId, showSub));
+              //  dts.Concat(getPlateJobsDts(dts,obj.plateId, showSub));
+                dts=(getPlateJobsDts(dts,  p, showSub));
             }
 
 
@@ -177,16 +212,73 @@ namespace DeiNiu.wms.Data.Model
 
         public DataTable getPateJobsDt(string plateId, bool showSub = false) 
         {
-            List<DataTable> dts = getPlateJobsDts(plateId, showSub);
+            List<DataTable> dts = new List<DataTable>();
+            dts = getPlateJobsDts(dts ,plateId, showSub);
 
             DataTable d = dts[0];
             for  (int i = 1; i < dts.Count;i++)
             {
               d=  unionTables(d, dts[i],i+"");
             }
+
             return d;
         }
 
+        private Dictionary<string, List<WmsOutPickRequest>> getPlatePlateRequest(Dictionary<string, List<WmsOutPickRequest>> requests, string plateId, bool showSub = false)
+        {
+           //   LogHelper.debug(this.GetType(), string.Format(" plate contents dts size {2}, plateId {0},showSub {1}", plateId, showSub, requests.Count));
+
+
+
+           List<WmsOutPickRequest> lst = new WmsPlateStock_tmp().getPickRequests(plateId,enumOutStoreType.拣货出库);
+
+            foreach(WmsOutPickRequest p in lst)
+            {
+                if (!requests.ContainsKey(p.pickOrderNo))
+                {
+                    requests.Add(p.pickOrderNo, lst);
+                    
+                  //  LogHelper.debug(this.GetType(), string.Format(" plateId {0} contents request  {1}", plateId, p.pickOrderNo));
+                }
+            }
+
+
+         //   LogHelper.debug(this.GetType(), string.Format(" plateId {0} contents request size {2}, showSub {1}", plateId, showSub, lst.Count));
+            if (!showSub)
+            {
+                return requests;
+            }
+
+            List<string> subPlate = getSubPlateIds(plateId);
+
+           // LogHelper.debug(this.GetType(), string.Format(" plate {0} sub plate count {1} ", plateId, subPlate.Count));
+
+            foreach (string p in subPlate)
+            {
+                //  dts.Concat(getPlateJobsDts(dts,obj.plateId, showSub));
+                requests =  getPlatePlateRequest(requests, p, showSub) ;
+            }
+
+
+            return requests;
+        }
+        public List<WmsOutPickRequest> getPlateRequests(string plateId, bool showSub = false)
+        {
+            List<WmsOutPickRequest> lst = new List<WmsOutPickRequest>();
+            Dictionary<string, List<WmsOutPickRequest>> requests = new Dictionary<string, List<WmsOutPickRequest>>();
+            requests = getPlatePlateRequest(requests, plateId, showSub);
+          
+            // LogHelper.debug(this.GetType(), string.Format(" plate {0} request list count {1} ", plateId, requests.Count));
+           
+            foreach (string p in requests.Keys)
+            {
+              lst= lst.Concat(requests[p]).ToList();    
+            }
+             LogHelper.debug(this.GetType(), string.Format(" plate {0} request  count {1} ", plateId, lst.Count));
+            return lst ;
+        }
+
+
         public static DataTable unionTables(DataTable dt1,DataTable dt2,string newName)
         {
             DataTable dt = dt1.Copy();
@@ -200,6 +292,26 @@ namespace DeiNiu.wms.Data.Model
             return dt;
         }
 
+        public DataTable queryPlate(string flowNo)
+        {
+            cmdParameters[0] = flowNo;
+            return CustQuery(900).Tables[0];
+               
+        }
+
+        
+
+        public int releaseSubPlate(string fromPlate)
+        {
+            cmdParameters[0] = fromPlate;
+            return CustOper(1100);
+        }
+
+        public DataTable getLineId(string customerId)
+        {
+            cmdParameters[0] = customerId;
+            return CustQuery(1200).Tables[0];
+        }
     }
 
 

Model/wms/tables/WmsPlatePack.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
+using DeiNiu.Utils;
 
 namespace DeiNiu.wms.Data.Model
 {
@@ -29,7 +30,16 @@ namespace DeiNiu.wms.Data.Model
         {
 
         }
-      protected override void getImp()
+        public WmsPlatePack(string upPlate,string subPlate)
+        {
+            //LogHelper.debug(this.GetType(), "0  upPlate is " + cmdParameters[0] + ", plate is " + plate);
+            cmdParameters[0] = upPlate;
+            cmdParameters[1] = subPlate; 
+           // LogHelper.debug(this.GetType(), "1  upPlate is " + cmdParameters[0] + ", plate is " + cmdParameters[2]);
+            getModel(300);
+        }
+
+        protected override void getImp()
         {
             model_imp = new WmsPlatePack_Imp();  
         }
@@ -40,6 +50,32 @@ namespace DeiNiu.wms.Data.Model
             cmdParameters[0] = name;
             return  CustQuery(100);
         }
+
+        /// <summary>
+        /// delete exists up level plates 
+        /// </summary>
+        public void removeUp()
+        {
+            cmdParameters[0] = subPlateId;
+            CustOper(200);
+        }
+
+        public DataTable getSubPlates(string fromPlate)
+        {
+            cmdParameters[0] = fromPlate;
+            return CustQuery(400).Tables[0];
+        }
+
+        public string getUpPlateId(string fromPlate)
+        {
+            cmdParameters[0] = fromPlate;
+            DataTable dt = CustQuery(500).Tables[0];
+            foreach(DataRow dr in dt.Rows)
+            {
+                return dr["plateId"].ToString();
+            }
+            return "";
+        }
     }
 }
  

Model/wms/tables/WmsPlateStock_tmp.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
+using DeiNiu.Utils;
 
 namespace DeiNiu.wms.Data.Model
 {
@@ -63,20 +64,42 @@ namespace DeiNiu.wms.Data.Model
             cmdParameters[1] = skuId;
             return CustQuery(10).Tables[0];
         }
-     
 
         public DataTable getByOutPort(int id)
         {
             cmdParameters[0] = id;
-          
-            return CustQuery(300).Tables[0];
+
+           return CustQuery(300).Tables[0];
+           
+        }
+        public DataTable getByInPort(int id)
+        {
+            cmdParameters[0] = id;
+
+            return CustQuery(310).Tables[0];
+
+        }
+        public WmsPlateStock_tmp getModelByOutPort(int id)
+        { 
+            DataTable dt = getByOutPort(id); 
+            foreach (DataRow dr in dt.Rows)
+            {
+                return new WmsPlateStock_tmp(dr);
+             
+            }
+            return new WmsPlateStock_tmp();
         }
         public DataTable getStockLst(string plateId )
         {
             cmdParameters[0] = plateId; 
             return CustQuery(400).Tables[0];
         }
-
+        public List<WmsOutPickRequest> getPickRequests(string plateId, enumOutStoreType outPickType)
+        {
+            cmdParameters[0] = plateId;
+            cmdParameters[1] =(int) outPickType;
+            return new WmsOutPickRequest().getObjs( CustQuery(1000).Tables[0]);
+        }
 
         public DataTable getOutPort(int outPortId)
         {
@@ -103,12 +126,49 @@ namespace DeiNiu.wms.Data.Model
            return CustOper(800);
         }
 
+        public int releasePlateByOrder(string orderNo)
+        {
+            cmdParameters[0] = orderNo;
+            return CustOper(1100);
+        }
+
+        public DataTable getByOrder(string orderNo)
+        {
+            cmdParameters[0] = orderNo;
+            return CustQuery(1200).Tables[0]; 
+        }
+
         public int merge(string fromPlate, string toPlate)
         {
             cmdParameters[0] = fromPlate;
             cmdParameters[1] = toPlate;
            return CustOper(900);
         }
+
+        public string getRelatedCustId(string flowNo)
+        {
+            string custId = new WmsPlate(flowNo).customerId;
+
+            if (!string.IsNullOrEmpty(custId))
+            {
+                return custId;
+            }
+
+            DataTable dt =  getStockLst(flowNo);
+            foreach (DataRow dr in dt.Rows)
+            {
+                WmsPlateStock_tmp ptmp = new WmsPlateStock_tmp(dr);
+                DataTable dt1 = ptmp.getOutPort(ptmp.outPortId);
+                foreach (DataRow dr1 in dt1.Rows)
+                {
+                    custId = dr1["customerId"].ToString();
+                    break;
+                }
+
+                break;
+            }
+            return custId;
+        }
     }
 }
  

Model/wms/tables/WmsStock.cs

@@ -222,12 +222,15 @@ public WmsStock( string locationId)
               //  if (countIn <= 0 && count - countOut <= 0 && countOuting <= 0) //负库存 允许存在
                 if (countIn == 0  //无待上架库存
                     && count - countOut == 0 //架上库存
-                    && countOuting == 0) //待下架库存
+                    && adjustingCnt==0
+                    && countOuting == 0
+                     && plateCount == 0
+                    ) //待下架库存
                     {
 
                     LogHelper.debug(typeof(WmsStock),
-                        string.Format("{0} 库存扣完删除库存记录,countIn: {1} ,count: {2},countOut: {3} ,countIn: {4}",
-                        goodsId, countIn, count, countOut, countIn)
+                        string.Format("{0} 库存扣完删除库存记录,countIn: {1} ,count: {2},countOut: {3} ,countIn: {4},plateCount {5}",
+                        goodsId, countIn, count, countOut, countIn,plateCount)
                         );
                     return Delete(); // 库存扣完，删除记录
                 }
@@ -338,6 +341,19 @@ public WmsStock( string locationId)
             return CustQuery(800).Tables[0];
         }
 
+        public DataTable getLocationDownList4UpFlow(int operId,string flowNo)
+        {
+
+            if (string.IsNullOrEmpty(flowNo))
+            {
+                return getLocationDownList4Up(operId);
+            }
+            cmdParameters[0] = operId;
+            cmdParameters[1] = flowNo;
+
+            return CustQuery(810).Tables[0];
+        }
+
         public DataTable getGoodsERPStoreByBarcode(string barcode)
         {
             cmdParameters[0] = barcode;
@@ -392,10 +408,11 @@ public WmsStock( string locationId)
       
 
 
-        public DataTable getWmsStockDetails(int skuId,string extrQuery)
+        public DataTable getWmsStockDetails(string goodsId, int skuId,string extrQuery)
         {
-            cmdParameters[0] = skuId; 
-            cmdParameters[1] = getCondition(extrQuery); 
+            cmdParameters[0] = skuId;
+            cmdParameters[1] = goodsId;
+            cmdParameters[2] = getCondition(extrQuery); 
             return CustQuery(1200).Tables[0];
 
         }
@@ -520,7 +537,7 @@ public WmsStock( string locationId)
 
         public decimal getAvCount()
         {
-            decimal cnt = count - countOut;
+            decimal cnt = count - countOut +adjustingCnt;
 
             if (WmsConstants.OUT_STOCK_DEDUCT)
             {

Model/wms/tables/WmsStockPandian.cs

@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Data;
+using DeiNiu.Utils;
 
 namespace DeiNiu.wms.Data.Model
 {
@@ -52,24 +53,41 @@ namespace DeiNiu.wms.Data.Model
         }
          
 
-        public void createDetailMirror()
+        public string getPlusCondition()
+        {
+            string wherePlus = " and whtype =0 and shelfCount>0 ";
+            if ((enumPandianType)type == enumPandianType.拣货位盘点)
+            {
+                wherePlus = "  and voltype=0 and ( createtime +1  >= getdate()  or lastmodified +1>=getdate() )";
+            }
+            else if ((enumPandianType)type == enumPandianType.存储位盘点)
+            {
+                wherePlus = "  and voltype>0 and voltype<=3 and ( createtime +1  >= getdate()  or lastmodified +1>=getdate() )";
+            }
+            return wherePlus;
+        }
+
+        public int createDetailMirror( string condition )
         {
             string sqlWhere = getCondition(this.condition);
+         
+            sqlWhere+= getPlusCondition();
 
             //create stock mirror
-            cmdParameters[0] = sqlWhere;
+            cmdParameters[0] = condition;
             cmdParameters[1] = orderNo;
             cmdParameters[2] = operater;
 
-            CustOper(200);
+          return  CustOper(200);
 
         }
 
-        public DataTable getPandianBanlance(string orderNo)
+        public DataSet getPandianBanlance(string orderNo,int startPag,int endPage)
         {
             cmdParameters[0] = orderNo;
-
-            return CustQuery(300).Tables[0];
+            cmdParameters[1] = startPag;
+            cmdParameters[2] = endPage;
+            return CustQuery(300) ;
 
         }
         public DataSet getPandianBanlanceDetail(string orderNo,int startpage,int endpage ,string goodsId ="")
@@ -119,12 +137,77 @@ namespace DeiNiu.wms.Data.Model
             if ( ID == 0)
             {
                 return false;
-            } 
-            cmdParameters[0] = getCondition( condition);
+            }
 
-           return CustOper(900)>0;
+            return updateStockStatus(enumStockLocationStatus.正常, condition)>0;
+          //  cmdParameters[0] = getCondition( condition);
+
+         //  return CustOper(900)>0;
              
         }
+
+       public int updateStockStatus(enumStockLocationStatus state,string condition)
+        {
+            
+            cmdParameters[0] = condition ;
+            cmdParameters[1] = (int)state;
+
+            return CustOper(900);
+        }
+
+        public DataTable getPandianTargetItem(string orderNo, string locationId)
+        {
+            cmdParameters[0] = orderNo;
+            cmdParameters[1] = locationId;
+            return CustQuery(1000).Tables[0];
+        }
+        public DataTable getPandianTargetItems(string orderNo )
+        {
+            cmdParameters[0] = orderNo; 
+            return CustQuery(1100).Tables[0];
+        }
+
+        public DataSet queryPandianResult(string orderNo, int startpage, int endpage, string goodsId="")
+        {
+            cmdParameters[0] = orderNo; 
+            cmdParameters[1] = goodsId;
+            cmdParameters[2] = startpage;
+            cmdParameters[3] = endpage;
+
+            return CustQuery(410);
+        }
+
+        public DataSet queryPandianResultSum(string orderNo, int startpage, int endpage, string goodsId)
+        {
+            cmdParameters[0] = orderNo;
+            cmdParameters[1] = goodsId;
+            cmdParameters[2] = startpage;
+            cmdParameters[3] = endpage; 
+            return CustQuery(420);
+        }
+
+        public WmsOrderRequest createErpOrder()
+        {
+            WmsOrderRequest wor = new WmsOrderRequest();
+            wor.orderNo = orderNo;
+            wor.orderType = (int)enumOrderType.盘点通知;
+
+            wor.orderTypeName =  ((enumPandianType) type). ToString();
+            wor.state = (int)enumOrderStatus.已完成;
+            wor.referOrderNo = orderNo;
+            wor.operater = operater;
+            wor.requestBy = operater;
+            wor.approvedBy = operater;
+            wor.description = String.Format("盘点单号：{0}, 类型：{1},结束时间:{2}, 过滤条件：{3}", orderNo, ((enumPandianType)type).ToString(), endTime, condition);
+
+            wor.Add();
+
+            cmdParameters[0] = orderNo;
+            CustOper(1200);
+
+            return wor;
+
+        }
     }
 }
  

Model/wms/tables/WmsStockPandianResult.cs

@@ -44,7 +44,7 @@ namespace DeiNiu.wms.Data.Model
       {
           cmdParameters[0] = orderNo;
           cmdParameters[1] = locationId;
-         return CustQuery(100).Tables[0];
+         return CustQuery(200).Tables[0];
       }
     }
 }

Utils/Enums.cs

@@ -12,42 +12,42 @@ namespace DeiNiu.Utils
     /// <summary>
     /// 库房类型 合格，不合格，临时，其他
     /// </summary>
-    public enum enumWhType { 合格库 = 0, 不合格库, 越仓收货区, 集货库, 退货库, 返厂库, 报废库, 封存库,虚拟库,盘点库 }
+    public enum enumWhType { 合格库 = 0, 不合格库, 越仓收货区, 集货库, 退货库, 返厂库, 报废库, 封存库,虚拟库,盘点库 ,收货区}
 
     public enum enumInOrderType { 采购入库=0, 销售退仓, 召回返仓, 移库入库,调拨入库 };
 
-    public enum enumInStoreType {普通入库=0, 直通越仓,直接上架 ,虚拟入库冲抵};
+    public enum enumInStoreType {普通入库=0, 直通越仓,直接上架 ,虚拟入库冲抵,不良品入库, 无单入库 };
   
     public enum enumOutStoreType { 销售出库 = 0, 补货出库, 拣货出库, 播种拣货出库, 混合拣货出库, 配货汇总拣货出库,
-                                                                        返厂出库,移库出库,调拨出库,报废出库,直通出库 };
-    public enum enumOutOrderType { 销售出库=0, 供应商退货, 仓间调出 ,补货出库};
+                                                                        返厂出库,移库出库,调拨出库,报废出库,直通出库,领用出库,无单入库 };
+  //  public enum enumOrderType { /* 供应商退货, 仓间调出, */};
 
-    public enum enumOrderType { 报废申请=0,库区转移 ,退供应商, 仓间调拨 };
-    public enum enumOrderStatus { 创建 = 0, 待核准, 已核准, 已驳回 };
+    public enum enumOrderType {销售出库=0, 补货出库,库区转移 ,退供应商, 仓间调拨 ,盘点通知,报废申请,内部领用,无单入库};
+    public enum enumOrderStatus { 创建 = 0, 待核准, 已核准 ,已完成,通知ERP失败,通知ERP成功};
     /// <summary>
     /// 库存进出变化标志 [t_wmsStockRecord].rectype
     /// </summary>
     public enum enumStockRecordType
     {
         普通入库 = 0, 销售出库, 补零出库, 补零入库, 销售退仓, 召回返仓, 仓间调入, 手持盘点, 移库上架, 移库下架, 初始盘点,
-        库存对比, 集货出库, 盘点调整, 直通越仓, 报废出库, 退供应商出库, 退供应商入库, 仓间调出,入库直接上架
+        库存对比, 集货拣货, 盘点调整, 直通越仓, 报废出库, 退供应商出库, 退供应商入库, 仓间调出,入库直接上架,集货分播,不良品入库,领用出库,无单入库
     };
 
 
-    public enum EnumFlowTaskType {入库上架 = 0,直通集货, 储存区补货下架, 拣货区补货上架, 出库拣货下架,移库下架,移库上架, 
-                                    报废下架, 退供应商下架, 退供应商上架,出库检验,装车运输};
+    public enum EnumFlowTaskType { 入库验收= 0,入库上架,播种分货, 补货下架, 补货上架, 出库下架,移库下架,移库上架, 不良品入库,
+                                    报废下架, 退供应商下架, 退供应商上架,出库检验,装车运输,盘点采集,直通分货};
 
     public enum enumFlowTaskStatus{ 未开始=0,进行中,暂停,取消,已完成};
     public enum enumFlowTaskResult { 成功 = 0,失败, 已被他人开始,状态不允许,任务不存在 };
     /// <summary>
     /// 货位批次存储策略
     /// </summary>
-    public enum enumWhLocStoreType { 同品同批=0,混品同批,同品混批,混品混批,虚拟库位};//虚拟库位: 无限制存储，可为负值，可虚拟出入库
+    public enum enumWhLocStoreType { 同品同批=0,混品同批,同品混批,混品混批,虚拟库位,不良品};//虚拟库位: 无限制存储，可为负值，可虚拟出入库
 
     /// <summary>
     /// 库位容积,零库1,零库，整库1，整库2，整库3 
     /// </summary>
-    public enum enumWhLocVol { 零库1 = -1, 零库, 小整, 中整, 大整, 散货拼袋, 散货拼箱, 装车集货, 不合格区,通用 ,虚拟};
+    public enum enumWhLocVol { 零库1 = -1, 零库, 小整, 中整, 大整, 散货拼袋, 散货拼箱, 装车集货, 不合格区,通用 ,虚拟,取总分播区};
     /// <summary>
     ///  
     /// </summary>
@@ -97,9 +97,8 @@ namespace DeiNiu.Utils
     public enum enumOutStockRequestStatus
     {
         待审核 = 0, 订单驳回/*1*/, 待出库/*2*/ , 准备分拣/*3*/, 库存不足/*4*/, 等待补货/*5*/, 待定位/*6*/, 定位完成/*7*/, 等待波次/*8*/,
-        正在分拣/*9*/, 分拣完成/*10*/, 复核完成/*11  */, 集货完成/*12  */, 复核异常/*13*/, 配送中/*14*/,
-        客户签收/*15*/
-            , 客户拒签/*16*/, 订单完成/*17*/, 订单作废/*18*/, 订单异常/*19*/
+        正在分拣/*9*/, 分拣完成/*10*/, 复核完成/*11  */, 集货完成/*12  */, 复核异常/*13*/, 已装车/*14*/, 配送中/*15*/,
+        客户签收/*16*/, 客户拒签/*17*/, 订单完成/*18*/, 订单作废/*19*/, 订单异常/*20*/
     };
     /// <summary>
     /// 散货、整货分拣状态  bulkPickstate,batchpickstate （t_wmsOutPickDetail， t_wmsOutPickRequest）
@@ -183,9 +182,8 @@ namespace DeiNiu.Utils
 
     public enum enumCreateOrderType { repOrderIn = 0, repOrderOut, pickOrder, waveOrder,
                                     dpsOrder, transOrder, seedsPickOrder, pandianOrder, preInOrder,
-                                    pickJobNo,obsolete,transferInternal,transferOutside,returnVender
-                                   
-        ,pickOutInvoice                             
+                                    pickJobNo,obsolete,transferInternal,transferOutside,returnVender                                  
+        ,pickOutInvoice,selfPickOrder  ,stockInWithNoOrder                     
     };
 
 
@@ -227,7 +225,7 @@ namespace DeiNiu.Utils
     }
     public enum enumRepResult { 失败 = -1, 成功, 货位不可用, 货位商品类型不符, 货位非合格库,
     货位已被其他商品占用, 整库只能整进整出, 货位不存在, ABC不符, 货位商品同品不同批,库容不足,
-        状态已完成上架,状态待拣货,上架数量大于应上数量,上架数量错误,分播数量大于剩余数量,临期商品,过期商品,货位库区不符,不适合播种
+        状态已完成上架,状态待拣货,上架数量大于应上数量,上架数量错误,分播数量大于剩余数量,临期商品,过期商品,货位库区不符,不适合播种,容器已被其他客户占用,任务已被他人抢占,任务已达到上线
     }
 
 
@@ -261,9 +259,10 @@ namespace DeiNiu.Utils
     public enum enumLotAttType { 字符 = 0, 数字, 日期 };
 
 
-    public enum enumPandianType { 每周盘点 = 0, 月度盘点, 季度盘点, 年度盘点, 临时盘点 };
-    public enum enumPandianStatus { 未开始 = 0, 已开始, 结束 };
-    public enum enumPandianAdjustStatus { 未调整 = 0, 已调整 };
+   // public enum enumPandianType { 日常盘点 = 0, 月度盘点, 季度盘点, 年度盘点, 临时盘点 };
+    public enum enumPandianType { 拣货位盘点 = 0, 存储位盘点, 全仓盘点 };
+    public enum enumPandianStatus { 未开始 = 0, 开始采集,采集结束,盘点结束 };
+    public enum enumPandianAdjustStatus { 未校正 = 0, 已校正 };
 
     public enum enumRegPlateResult
     {
@@ -273,17 +272,21 @@ namespace DeiNiu.Utils
         容器已被不同库区或类型物品使用/*入库只能存放同一库区类物品*/
             ,
         容器不允许多sku/*上架存储区不可混sku*/
-            , 容器非空闲,容器不存在,容器空间不足
-         ,容器已被其他货区占用,只允许下级容器放入上级容器,客户笼车已占用,集货区线路不同
+            , 容器非空闲,容器不存在,容器空间不足,容器空闲无任务
+         ,容器已被其他货区占用,只允许下级容器放入上级容器,客户容器已被其他客户占用,集货区线路不同,容器非直接包含关系,码头集货需要客户类型的容器,客户已经在其他码头集货,
+        容器已完成客户集货,
+        容器已完成码头集货,容器已完成装车集货,装车集货需要码头类型的容器,完成码头集货后才能装车,完成装车集货后才能装车,  装车需要客户类型的容器,客户货物不属于此车,发车需要运输类型的容器,容器已集货,已发车
     };
     public enum enumRegBoxResult { 成功 = 0, 箱子颜色和订单灯色不符, 当前无拣货订单 };
     public enum enumPlateStatus { 空闲 = 0, 入库待上架, 存储架上, 摘果周转,/* 播种周转, */运输周转, 临时堆放, 不可用 };
 
-    public enum enumPlateLevel { 临时周转 = 0, 客户集货笼车, 线路集货码头,运输车 };
+    public enum enumPlateLevel { 临时容器 = 0, 客户集货, 线路集货,运输车 };
 
-    public enum enumValidInResult { 成功 = 0, 失败, 流水码已使用, 货位不足,请维护效期天数 ,临期商品 ,过期商品,效期错误,已封板,已完验, 无虚拟库抵扣};
+    public enum enumValidInResult { 成功 = 0, 失败, 流水码已使用, 货位不足,请维护效期天数 ,临期商品 ,过期商品,效期错误,已封板,已完验, 无虚拟库抵扣,不允许超收};
 
-    
+    public enum enumPickResult { 成功 = 0, 失败, 流水码已关联其他客户,任务已经分拣完成  };
+
+    public enum enumOutValidResult { 成功 = 0, 失败  };
 
     public enum enumCustomerType { 普通 = 0, 连锁分店 };
     public enum enumOutPriority { 普通 = 0, 中, 高 };
@@ -295,7 +298,7 @@ namespace DeiNiu.Utils
     public enum enumOnlineStatus { 试用 = 0, 正常,过期 };
 
 
-    public enum enumErpOrderType { 报废 = 0, 入库, 出库,盘点 };
+    public enum enumErpOrderType { 报废 = 0, 入库, 出库,盘点, 内部领用 };
     public enum enumErpOrderStatus { 未通知 = 0, 通知成功, 通知失败 };
 
 

Utils/LogHelper.cs

@@ -7,7 +7,7 @@ namespace DeiNiu.Utils
 {
     public class LogHelper
     {
-       static log4net.ILog log =log4net.LogManager.GetLogger("wms");
+       static log4net.ILog log =log4net.LogManager.GetLogger("logCommon");
         /// <summary>
         /// 输出日志到Log4Net
         /// </summary>

Utils/Structs.cs

@@ -81,7 +81,7 @@ namespace DeiNiu.Utils
         public int skuId;
         public string skuCode;
         public string poNo;
-        public int outDetailId;
+        public int outPickDetailId;
         public bool isZhitong;
         public bool isOnLoc;//直接/已经上架
         public string locId; //上架货位

Utils/Utils.cs

@@ -16,6 +16,7 @@ using System.Text.RegularExpressions;
 using System.Globalization;
 using System.Runtime.Serialization.Json;
 using Newtonsoft.Json;
+using ThoughtWorks.QRCode.Codec;
 namespace DeiNiu.Utils
 {
 
@@ -389,10 +390,10 @@ namespace DeiNiu.Utils
 
         }
 
-   
-  
- 
-       public static void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues)
+
+
+
+        public static void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues)
         {
             foreach (TreeNode node in tnc)
             {
@@ -404,7 +405,7 @@ namespace DeiNiu.Utils
                 GetCheckedNode(node.ChildNodes, checkedvalues);
             }
         }
-        public static void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues,ArrayList checkedText)
+        public static void GetCheckedNode(TreeNodeCollection tnc, ArrayList checkedvalues, ArrayList checkedText)
         {
             foreach (TreeNode node in tnc)
             {
@@ -418,7 +419,7 @@ namespace DeiNiu.Utils
             }
         }
 
-      public static  void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
+        public static void SetCheckedNode(TreeNodeCollection tnc, ArrayList setcheckedvalues)
         {
             foreach (TreeNode node in tnc)
             {
@@ -439,7 +440,7 @@ namespace DeiNiu.Utils
 
             for (int i = 0; i < al.Count; i++)
             {
-                whereString += "'"+ al[i] + "',";
+                whereString += "'" + al[i] + "',";
             }
             if (whereString.EndsWith(","))
             {
@@ -452,12 +453,12 @@ namespace DeiNiu.Utils
         {
             DataSet ds = new DataSet();
             ArrayList SheeNames = ExcelSheetName(filepath);
-            for(int i=0;i<SheeNames.Count;i++)
+            for (int i = 0; i < SheeNames.Count; i++)
             {
                 DataTable dt = (ExcelDataSource(filepath, SheeNames[i].ToString())).Tables[0].Copy();
                 dt.TableName = SheeNames[i].ToString();
                 dt.TableName = dt.TableName.Substring(0, dt.TableName.IndexOf("$"));
-                ds.Tables.Add(dt); 
+                ds.Tables.Add(dt);
             }
             return ds;
         }
@@ -492,20 +493,20 @@ namespace DeiNiu.Utils
             return al;
         }
 
-        public　static　DataView　GetTopDataViewRows(DataView　dv,　int　n)
-　  　　　　　{
-　 　　　　　　　　　DataTable　dt　=　dv.Table.Clone();
-　 　
-　 　　　　　　　　　for　(int　i　=　0;　i　<　n　-　1;　i++)
-　 　　　　　　　　　{
-　 　　　　　　　　　　　　　if　(i　>=　dv.Count)
-　 　　　　　　　　　　　　　{
-　 　　　　　　　　　　　　　　　　　break;
- 　　　　　　　　　　　　　}
- 　　　　　　　　　　　　　dt.ImportRow(dv[i].Row);
- 　　　　　　　　　 }
- 　　　　　　　　return　new　DataView(dt,　dv.RowFilter,　dv.Sort,　 dv.RowStateFilter);
- 　　　　　}
+        public static DataView GetTopDataViewRows(DataView dv, int n)
+        {
+            DataTable dt = dv.Table.Clone();
+
+            for (int i = 0; i < n - 1; i++)
+            {
+                if (i >= dv.Count)
+                {
+                    break;
+                }
+                dt.ImportRow(dv[i].Row);
+            }
+            return new DataView(dt, dv.RowFilter, dv.Sort, dv.RowStateFilter);
+        }
 
 
         /// <summary>
@@ -515,19 +516,19 @@ namespace DeiNiu.Utils
         /// <returns>appSettings的Value</returns>
         //public static string GetConfig(string key)
         //{
-            //string _value = string.Empty;
-            //System.Configuration.ConfigurationManager  config =  System.Configuration.ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-            //if (config.AppSettings.Settings[key] != null)
-            //{
-            //    _value = config.AppSettings.Settings[key].Value;
-            //}
-            //return _value;
+        //string _value = string.Empty;
+        //System.Configuration.ConfigurationManager  config =  System.Configuration.ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+        //if (config.AppSettings.Settings[key] != null)
+        //{
+        //    _value = config.AppSettings.Settings[key].Value;
         //}
-        private static char[] constant =   
-      {   
-        '0','1','2','3','4','5','6','7','8','9',  
-        'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',   
-        'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'   
+        //return _value;
+        //}
+        private static char[] constant =
+      {
+        '0','1','2','3','4','5','6','7','8','9',
+        'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z',
+        'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
       };
         public static string GenerateRandomNumber(int Length)
         {
@@ -623,21 +624,25 @@ namespace DeiNiu.Utils
                 case enumCreateOrderType.pickOutInvoice:
                     prefix = WmsConstants.ORDER_PRI_PICK_OUT_INVOICE;//"PREIN";
                     break;
-
-
+                case enumCreateOrderType.selfPickOrder:
+                    prefix = WmsConstants.ORDER_PRI_PICK_SELF;// ITK
+                    break;
+                case enumCreateOrderType.stockInWithNoOrder:
+                    prefix = WmsConstants.ORDER_PRI_STK_IN;// ITK
+                    break;
             }
             return prefix;
         }
 
-        public static string getOrderNo(enumCreateOrderType orderType, int seq )
-        { 
+        public static string getOrderNo(enumCreateOrderType orderType, int seq)
+        {
 
             string prefix = getPrefix(orderType);
 
 
             string orderno = string.Format("{0}{1:D2}{2:D2}{3:D2}{4:D6}", prefix, DateTime.Now.Year - 2000,
-                DateTime.Now.Month, DateTime.Now.Day, seq); 
-           // LogHelper.debug("Utils", string.Format( "create order no ,seq is {0}, orderno is {1}",   seq,orderno));
+                DateTime.Now.Month, DateTime.Now.Day, seq);
+            // LogHelper.debug("Utils", string.Format( "create order no ,seq is {0}, orderno is {1}",   seq,orderno));
             return orderno;
         }
         public static enumStockRecordType getStockRecordType(int outStoretype)
@@ -655,11 +660,16 @@ namespace DeiNiu.Utils
                 case enumOutStoreType.补货出库:
                     return enumStockRecordType.补零出库;
                 case enumOutStoreType.配货汇总拣货出库:
-                    return enumStockRecordType.集货出库;
+                    return enumStockRecordType.集货拣货;
+                case enumOutStoreType.领用出库:
+                    return enumStockRecordType.领用出库;
+                case enumOutStoreType.无单入库:
+                    return enumStockRecordType.无单入库;
+
                 default:
                     return enumStockRecordType.销售出库;
+
             }
-             
         }
 
         public static string getShortDateString(string date)
@@ -674,7 +684,7 @@ namespace DeiNiu.Utils
                 dt = Convert.ToDateTime(date);
                 return string.Format("{0}-{1:d2}-{2:d2}", dt.Year, dt.Month, dt.Day);
             }
-            catch  { }
+            catch { }
 
             try
             {
@@ -702,10 +712,15 @@ namespace DeiNiu.Utils
                     return enumOutStoreType.移库出库;
                 case enumOrderType.退供应商:
                     return enumOutStoreType.返厂出库;
+
+                case enumOrderType.内部领用:
+                    return enumOutStoreType.领用出库;
+                case enumOrderType.无单入库:
+                    return enumOutStoreType.无单入库;
                 default:
-                     return enumOutStoreType.报废出库;;
+                    return enumOutStoreType.报废出库; ;
             }
-             
+
         }
         public static EnumFlowTaskType getTaskType(int recordType)
         {
@@ -716,11 +731,11 @@ namespace DeiNiu.Utils
                 case enumStockRecordType.报废出库:
                     return EnumFlowTaskType.报废下架;
                 case enumStockRecordType.补零出库:
-                    return EnumFlowTaskType.储存区补货下架;
+                    return EnumFlowTaskType.补货下架;
                 case enumStockRecordType.补零入库:
-                    return EnumFlowTaskType.拣货区补货上架;
+                    return EnumFlowTaskType.补货上架;
                 case enumStockRecordType.销售出库:
-                    return EnumFlowTaskType.出库拣货下架;
+                    return EnumFlowTaskType.出库下架;
                 case enumStockRecordType.普通入库:
                     return EnumFlowTaskType.入库上架;
                 case enumStockRecordType.移库上架:
@@ -728,29 +743,36 @@ namespace DeiNiu.Utils
                 case enumStockRecordType.移库下架:
                     return EnumFlowTaskType.移库下架;
                 case enumStockRecordType.退供应商出库:
-                  return EnumFlowTaskType.移库下架;
+                    return EnumFlowTaskType.移库下架;
                 case enumStockRecordType.退供应商入库:
-                  return EnumFlowTaskType.移库上架;
+                    return EnumFlowTaskType.移库上架;
                 case enumStockRecordType.直通越仓:
-                    return EnumFlowTaskType.直通集货;
+                    return EnumFlowTaskType.直通分货;
+
+                case enumStockRecordType.集货分播:
+                    return EnumFlowTaskType.播种分货;
+
+
+                case enumStockRecordType.不良品入库:
+                    return EnumFlowTaskType.不良品入库;
 
                 default:
-                     return   EnumFlowTaskType.出库拣货下架; 
+                    return EnumFlowTaskType.出库下架;
             }
-             
-        }
-        
 
-        public static enumWhType getTargetWhType(enumOrderType orderType,enumWhType fromWh= enumWhType.合格库)
+        }
+
+
+        public static enumWhType getTargetWhType(enumOrderType orderType, enumWhType fromWh = enumWhType.合格库)
         {
             switch (orderType)
             {
-                case enumOrderType.报废申请: 
-                     return enumWhType.报废库;
-                    
-                case enumOrderType.库区转移: 
-                      return fromWh; 
-                   
+                case enumOrderType.报废申请:
+                    return enumWhType.报废库;
+
+                case enumOrderType.库区转移:
+                    return fromWh;
+
                 case enumOrderType.退供应商:
                     return enumWhType.返厂库;
                 default: return enumWhType.不合格库;
@@ -762,24 +784,24 @@ namespace DeiNiu.Utils
             return Convert.ToInt64(ts.TotalMilliseconds);
         }
 
-        public static string getPartLightKey(int color, int labelId, int address,int part)
+        public static string getPartLightKey(int color, int labelId, int address, int part)
         {
             return string.Format("{0}-{1}-{2}", color, labelId, address);
         }
 
 
-        public static string getLightKey(int color,int labelId, int address)
+        public static string getLightKey(int color, int labelId, int address)
         {
             return string.Format("{0}-{1}-{2}", color, labelId, address);
         }
 
-        public static string getBoxId( int type, int color,int id)
+        public static string getBoxId(int type, int color, int id)
         {
-            return string.Format("H-{0}-{1}-{2}",type, color,  id);
+            return string.Format("H-{0}-{1}-{2}", type, color, id);
         }
         public static int getBoxColor(string boxId)
         {
-             string[] s=  boxId.Split('-');
+            string[] s = boxId.Split('-');
             return Convert.ToInt16(s[2].ToString());
         }
         public static int getBoxId(string boxId)
@@ -788,22 +810,24 @@ namespace DeiNiu.Utils
             return Convert.ToInt16(s[3].ToString());
         }
 
-        public static Dictionary<int,string> convertEnumToDic(Type enumType){
+        public static Dictionary<int, string> convertEnumToDic(Type enumType)
+        {
 
             Dictionary<int, string> dic = new Dictionary<int, string>();
-            foreach (int myCode in Enum. GetValues(enumType))
+            foreach (int myCode in Enum.GetValues(enumType))
             {
                 string strName = Enum.GetName(enumType, myCode);//获取名称
                 string strVaule = myCode.ToString();//获取值
                 dic[myCode] = strName;
-               
+
             }
 
             return dic;
-    }
- 
+        }
 
-        public static DateTime pareseDateString(string dateStr){
+
+        public static DateTime pareseDateString(string dateStr)
+        {
             /*
              string[] invailidChars = { ".","-","/"};
 
@@ -833,11 +857,11 @@ namespace DeiNiu.Utils
             catch (Exception)
             {
 
-                return DateTime.ParseExact(dateStr,"yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture);
+                return DateTime.ParseExact(dateStr, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture);
             }
 
 
-          //  return DateTime.ParseExact(dateStr, WmsConstants.GOODS_VALID_DATE_FORMAT, System.Globalization.CultureInfo.CurrentCulture);  
+            //  return DateTime.ParseExact(dateStr, WmsConstants.GOODS_VALID_DATE_FORMAT, System.Globalization.CultureInfo.CurrentCulture);  
 
         }
 
@@ -889,9 +913,9 @@ namespace DeiNiu.Utils
         public static string getJson(Object obj)
         {
             try
-            { 
+            {
 
-               return JsonConvert.SerializeObject(obj);
+                return JsonConvert.SerializeObject(obj);
                 /*
                    DataContractJsonSerializer jsonSerializer
                                = new DataContractJsonSerializer(typeof(Object));
@@ -909,16 +933,44 @@ namespace DeiNiu.Utils
                 return dataString;
                 */
             }
-            catch (Exception e) {
+            catch (Exception e)
+            {
+
+
+                LogHelper.debug("Utls", e.Message);
 
-               
-                LogHelper.debug("Utls", e.Message); 
-                
                 return e.Message;
             }
 
-
-
         }
+         
+            public static string CreateQRcode(string content)
+            {
+            //https://blog.csdn.net/qyr20/article/details/119885812
+
+         
+                System.IO.MemoryStream MStream = new System.IO.MemoryStream();
+                getQrCode(  content).Save(MStream, System.Drawing.Imaging.ImageFormat.Png);
+                byte[] qrByte = MStream.ToArray();
+                string qrStr = Convert.ToBase64String(qrByte);    //需要转化一下
+
+                return  qrStr;
+                //Response.ClearContent();
+                //Response.ContentType = "image/Png";
+                //Response.BinaryWrite(MStream.ToArray());
+            }
+
+         public static System.Drawing.Bitmap getQrCode(string content)
+        {
+            QRCodeEncoder qrCodeEncoder = new QRCodeEncoder();
+            qrCodeEncoder.QRCodeEncodeMode = QRCodeEncoder.ENCODE_MODE.BYTE;
+            qrCodeEncoder.QRCodeScale = 4;
+            qrCodeEncoder.QRCodeVersion = 8;
+            qrCodeEncoder.QRCodeErrorCorrect = QRCodeEncoder.ERROR_CORRECTION.M;
+            System.Drawing.Bitmap image = qrCodeEncoder.Encode(content);
+            return image;
+        }
+
     }
+ 
 }

Utils/Utils.csproj

@@ -77,6 +77,9 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
+    <Reference Include="ThoughtWorks.QRCode, Version=1.0.4778.30637, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ThoughtWorks.QRCode.1.1.0\lib\ThoughtWorks.QRCode.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DeiNiuException.cs" />
@@ -117,6 +120,7 @@
     <None Include="Log4Net.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

Utils/WmsConstants.cs

@@ -15,6 +15,7 @@ namespace DeiNiu.Utils
 
         // public static int CURRENT_USER_ID;
         //public static string CURRENT_USER_TOKEN;
+        public static string CURRENT_USER_ORGID = "LDJNBYXGS";
         public static string CURRENT_USER_NAME = "系统";
         public static string CURRENT_USER_ORG = "贵客集团";//todo 
         public static string CURRENT_WAREHOUSE_ADDRESS = "";
@@ -71,7 +72,7 @@ namespace DeiNiu.Utils
         /// </summary>
         public static int MAX_PICK_BOX_CNT = int.MaxValue;
 
-
+        public static int MAX_TASKS_OWN = 3;
 
         /// <summary>
         /// 统计波次用时，作为取订单间隔的参考
@@ -143,9 +144,9 @@ namespace DeiNiu.Utils
         /// </summary>
         public static bool IN_STOCK_PDA_SCAN = true;
         /// <summary>
-        /// 按订单需一次入库完毕
+        /// 入库不良品是否计入采购明细的validCont
         /// </summary>
-        public static bool IN_STOCK_ONE_TIME = false;
+        public static bool IN_STOCK_BAD_COUNTIN_VALID = false;
 
         /// <summary>
         /// ABC 上架策略
@@ -207,6 +208,7 @@ namespace DeiNiu.Utils
 
         //每次处理待拣货订单数量
         public static int OUT_PROCESS_ORDERS_CNT = 100;
+        public static int OUT_PROCESS_STOCK_DAYS = 2; //处理分拣单库存定位的最大天数，几天内的进行处理，超过期限的不予处理
 
         public static int OUT_MIN_DAYS_VALIDTION_LEFT = 30;
 
@@ -238,6 +240,7 @@ namespace DeiNiu.Utils
         public static int VALIDATION_KEEP_DAYS = 2;
 
         public static string ORDER_PRI_PICK = "PK";
+        public static string ORDER_PRI_PICK_SELF = "ITK";
         public static string ORDER_PRI_RPO = "RP";
         public static string ORDER_PRI_WAVE = "WV";
         public static string ORDER_PRI_TRAN = "TR";
@@ -251,6 +254,7 @@ namespace DeiNiu.Utils
         public static string ORDER_PRI_TRANSFER_OUTSIDE = "TRO";
         public static string ORDER_PRI_RETURN_VENDER = "RTV";
         public static string ORDER_PRI_PICK_OUT_INVOICE = "PKI";
+        public static string ORDER_PRI_STK_IN = "STI";
 
         public static decimal GOODS_IN_VALID_SEEDS_BOXS_STEP = 50;
         public static decimal GOODS_IN_VALID_SEEDS_BOXS_STEP_MIN = 3;
@@ -305,8 +309,9 @@ namespace DeiNiu.Utils
 
         public static int JOB_BASIC_INFO_SYNC_INTERVAL = 10; //每十分钟同步更新基础资料
         public static int JOB_OUT_REQUEST_INTERVAL = 10; //每十分钟同步更新基础资料
-        public static int JOB_IN_REQUEST_INTERVAL = 10; //每十分钟同步更新基础资料
+        public static int JOB_TEST_REQUEST_INTERVAL = 10; //每十分钟同步更新基础资料
         public static int JOB_OUT_REQUEST_NO_STOCK_CHECK_INTERVAL = 60; //每3小时查验缺货订单库存是否已经满足
+        public static int JOB_NOTICE_ERP  = 60; //每3小时查验缺货订单库存是否已经满足
 
 
         //文件服务地址
@@ -343,16 +348,40 @@ namespace DeiNiu.Utils
         public static bool OUT_STOCK_BULK_LACK_OUT_SEEDS = true;//取总分拣单某明细中的零货，（零库）分拣库位货数量不足，其它正常库存的货品可继续分拣
         public static bool OUT_STOCK_WHEN_NO_MORE_REQUEST; //仅当没有新订单时，统一进行分组处理、库存处理
 
+        public static bool OUT_ZHITONG_FROM_STORE = true;  //直通商品 可以从库存出库
+
         public static string ERP_API_ORDER_NOTICE = "http://47.103.159.209:20999/lsyapi/notice?orderNo={0}&orderType={1}";
         public static string ERP_API_KEY="ApiToken:7c6fa52f4da9bb859c2d44b9b40ee929";
 
         public static bool TEST_CREATE_PURCH_IN;
         public static bool TEST_VALIDIN;
+        public static bool TEST_VALID_IN_ZHITONG_TAKEALL;//先收后分
+        public static bool TEST_VALID_IN_ZHITONG_TO_OUTDETAIL;//边收边分
+
         public static bool TEST_ONSHELF;
         public static bool TEST_CREATE_SALES_OUT;
         public static bool TEST_PICK_OUT;
+        public static bool TEST_PICK_OUT_SEEDS;
+        public static bool TEST_PLATE_OUT;
+        public static bool TEST_PLATE_OUT_CUSTOMER;
+        public static bool TEST_PLATE_OUT_LINE;
+        public static bool TEST_PLATE_OUT_VC;
+        public static bool TEST_PLATE_OUT_LOAD_TRUCK;
+        public static bool TEST_PLATE_OUT_START_TRAN;
+        public static bool TEST_PANDIAN_PROCESS;
+        public static int TEST_VALID_IN_ORDER_CNT = 50;
         public static int TEST_VALID_IN_ITEM_CNT=500;
         public static int TEST_PICK_OUT_ITEM_CNT = 500;
         public static object MAX_JOBS_IN_A_WAVE = 1000; //生成出货波次任务时，单个波次包含的最大任务数
+        public static string PDA_MENU_UTILS="Utils";
+        public static string PDA_MENU_STK_OUT="Stk In";
+        public static string PDA_MENU_STK_IN=" Stk out";
+        public static string PDA_MENU_PLATE="Plate relate";
+
+        public static int   ERP_TRANS_DATA_AT_CLOCK;
+        public static int   ERP_TRANS_DATA_SLEEP_MINUES;
+        public static bool SEEDS_PICK_ALL=true;
+
+   
     }
 }

Utils/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net40" />
+</packages>

WcfService1/Android.svc.cs

@@ -9,6 +9,7 @@ using System.Runtime.Serialization;
 using System.ServiceModel;
 using System.ServiceModel.Web;
 using System.Text;
+using System.Transactions;
 using System.Web;
 using DeiNiu.Utils;
 using DeiNiu.wms.Data.Model;
@@ -229,7 +230,7 @@ namespace DeiNiu.Wcf
                         tmp.Add(au.auth_name);
                     }
                     auth.AddRange(tmp);
-
+                    getOperId();
                     ConstAuthourity.setSpecialAuths(userId, tmp);
                 }
             }
@@ -270,13 +271,32 @@ namespace DeiNiu.Wcf
         }
 
 
+      public  FormatedResult getTmpAuthCode()
+        {
+
+            int randomCode = ConstAuthourity.userKeyPares.ContainsKey(getOperId()) 
+                ? ConstAuthourity.userKeyPares[getOperId()] : 0;           
+
+            return new FormatedResult( randomCode +"");
+        }
+
         public FormatedResult login(string account, string passwd)
         {
             LAuthority auth = new LAuthority();
             Employee em = auth.login(account, passwd);
             AuthenticationInspector.authCach[em.ID] = em.token;
 
-            return new FormatedResult(JsonConvert.SerializeObject(em));
+            List<string> tmp = new List<string>();
+
+            foreach (Authority au in em.AuthSpecials)
+            {
+
+                tmp.Add(au.auth_name);
+            }
+            ConstAuthourity.setSpecialAuths(em.ID, tmp);
+
+            //  return new FormatedResult(JsonConvert.SerializeObject(em));
+            return new FormatedResult(em);
 
         }
         public List<String> getSpecialAuths(int userId, int warehouse = -1)
@@ -632,15 +652,15 @@ namespace DeiNiu.Wcf
             }
         }
 
-        public FormatedResult upDownStockLocation(string locId, string goodsId, int skuId, string batch, decimal count, int type, int oldRecId)
+        public FormatedResult upDownStockLocation(string locId, string goodsId, int skuId, string batch, decimal count, int type, int oldRecId,string flowNo)
         {
 
 
             try
             {
 
-                var result = (int)lstock.upDownGoodsCountWithLocation(locId, goodsId, skuId, batch, count, "", (enumStockRecordType)type, oldRecId);
-
+                var result = lstock.upDownGoodsCountWithLocation(locId, goodsId, skuId, batch, count, "", (enumStockRecordType)type, oldRecId,flowNo).ToString();
+                
                 return new FormatedResult(JsonConvert.SerializeObject(result));
 
 
@@ -653,13 +673,13 @@ namespace DeiNiu.Wcf
 
         }
 
-        public FormatedResult getDownStockList4Up(int operId)
+        public FormatedResult getDownStockList4Up(int operId, string flowNo)
         {
 
             try
             {
 
-                var result = DataTableToDicList(lstock.wmsStock.getLocationDownList4Up(operId));
+                var result = DataTableToDicList(lstock.wmsStock.getLocationDownList4UpFlow(operId,flowNo));
 
                 return new FormatedResult(JsonConvert.SerializeObject(result));
 
@@ -672,6 +692,8 @@ namespace DeiNiu.Wcf
             }
         }
 
+  
+
         public FormatedResult locationEleIdCombine(string locId, int eleId)
         {
 
@@ -793,7 +815,7 @@ namespace DeiNiu.Wcf
             {
 
 
-                var result = DataTableToDicList(pandian.getPandianItem(orderNo, locationId));
+                var result = DataTableToDicList(pandian.getPandianResultItem(orderNo, locationId));
 
                 return new FormatedResult(JsonConvert.SerializeObject(result));
 
@@ -805,14 +827,48 @@ namespace DeiNiu.Wcf
             }
         }
 
-        public FormatedResult newPandianItem(string orderNo, string locationId, int skuId, string barcode, string prdDate, string batch, decimal count)
-        {
-
-
+       public FormatedResult postPandianItem(int mirrorId, decimal count) 
+        { 
             try
             {
 
-                var result = pandian.newPandianItem(orderNo, locationId, skuId, barcode, prdDate, batch, count);
+                var result = pandian.postPandianItem(  mirrorId, count);
+
+                return new FormatedResult(JsonConvert.SerializeObject(result));
+
+
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+        } 
+
+        public FormatedResult newPandianItem(string orderNo, string locationId, int mirrroId, string goodsId, string prdDate, string batch, decimal count)
+        { 
+            try
+            {
+
+                var result = pandian.newPandianItem(orderNo, locationId,  mirrroId, goodsId, prdDate, batch, count);
+
+                return new FormatedResult(JsonConvert.SerializeObject(result));
+
+
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+        }
+
+        public FormatedResult getPandianTargetItem(string orderNo, string locationId)
+        {
+            try
+            {
+
+                var result = pandian.getPandianTargetItem(orderNo, locationId );
 
                 return new FormatedResult(JsonConvert.SerializeObject(result));
 
@@ -850,7 +906,7 @@ namespace DeiNiu.Wcf
             {
 
 
-                return new FormatedResult(lir.getPreInDetail(preInNo));
+                return new FormatedResult(lir.getPreInSumary(preInNo));
 
 
             }
@@ -892,6 +948,24 @@ namespace DeiNiu.Wcf
                 return new FormatedResult(e);
             }
         }
+
+
+        static lWmsGoods _lgood;
+
+        lWmsGoods lgood
+        {
+            get
+            {
+                if (_lgood == null || _lgood.operId != getOperId())
+                {
+                    _lgood = new lWmsGoods(getOperId());
+                }
+                return _lgood;
+            }
+        }
+
+
+
         FormatedResult IAndroid.getGoodsPacking(string goodsId)
         {
 
@@ -907,75 +981,27 @@ namespace DeiNiu.Wcf
 
         }
 
-        FormatedResult IAndroid.goodsMaintain(string goodsId, decimal bulkMax, decimal batch1Max, decimal batch2Max, decimal batch3Max, int ABC, int storeType, string barcode, int expiredDays)
+        FormatedResult IAndroid.goodsMaintain(string goodsId, decimal bulkMax, decimal batch1Max, decimal batch2Max, decimal batch3Max, int ABC, int storeType, string barcode, int expiredDays )
         {
-
-
+             
             try
             {
-                WmsGoods goods = new WmsGoods(goodsId);
-                if (bulkMax > 0)
-                    goods.bulkMax = bulkMax;
-                if (batch1Max > 0)
-                    goods.batchMax1 = batch1Max;
-                if (batch2Max > 0)
-                    goods.batchMax2 = batch2Max;
-                if (batch3Max > 0)
-                    goods.batchMax3 = batch3Max;
-                if (ABC > 0)
-                    goods.ABC = ABC;
-                if (storeType > 0)
-                    goods.goodsType = storeType;
-
-                ErpGoods erpgd = new ErpGoods(goodsId);
-                if (erpgd.barCode != barcode || erpgd.expiryDays != expiredDays)
-                {
-                    erpgd.barCode = barcode;
-                    erpgd.expiryDays = expiredDays;
-                    erpgd.Update();
-                }
-
-                bool res = goods.Update() == 1;
-
-                return new FormatedResult(res.ToString());
+                lgood.goodsMaintain(goodsId, bulkMax, batch1Max, batch2Max, batch3Max, ABC, storeType, barcode, expiredDays );
             }
             catch (Exception e)
             {
                 log.Error(e);
                 return new FormatedResult(e);
             }
+            return new FormatedResult(true + "");
         }
 
-        FormatedResult IAndroid.goodsPacking(int id, string goodsId, string barcode, int packQty, string manufacturer2, string spec, decimal chang, decimal kuan, decimal gao, decimal weight, int statckLayers, int stackLayNums, bool isDelete)
+        FormatedResult IAndroid.goodsPacking(int id, string goodsId, string barcode, int packingQty, string manufacturer2, string spec, decimal chang, decimal kuan, decimal gao, decimal weight, int stackLayers, int stackLayNums, bool isDelete)
         {
 
-            Erp_packing packing = new Erp_packing(id);
-            if (isDelete)
-            {
-                return new FormatedResult((packing.Delete() > 0) + "");
-            }
-            packing.barcode = barcode;
-            packing.goodsId = goodsId;
-            packing.weight = weight;
-            packing.chang = chang;
-            packing.kuan = kuan;
-            packing.gao = gao;
-            packing.weight = weight;
-            packing.spec = spec;
-            packing.manufacturer2 = manufacturer2;
-            packing.stackLayers = statckLayers;
-            packing.stackLayNums = stackLayNums;
-            packing.packingQty = packQty;
             try
             {
-                if (id > 0)
-                {
-                    return new FormatedResult((packing.Update() > 0) + "");
-                }
-                else
-                {
-                    return new FormatedResult((packing.Add() > 0) + "");
-                }
+                lgood.updatePackInfo(id,goodsId,barcode,packingQty,manufacturer2,spec,chang,kuan,gao,weight, stackLayers, stackLayNums,isDelete);
             }
             catch (Exception er)
             {
@@ -983,10 +1009,7 @@ namespace DeiNiu.Wcf
                 return new FormatedResult(er);
             }
 
-
-
-
-
+            return new FormatedResult(true + "");
 
 
         }
@@ -1079,7 +1102,7 @@ namespace DeiNiu.Wcf
 
         FormatedResult IAndroid.validIn(string preInNo, string flowNo, string goodsId, decimal batchCount, decimal seedsCount,
            string prdDate, string validDate, string batch, string entiId, bool isPass, bool isIsuLocations, bool isVirtualIn, int secondValidUserId, bool isFlowUni,
-           bool isZhitong = false, string pickOrderNo = null, int zhitongPartion = 0, int outDetailId = 0, int purch_d_id = 0)
+           bool isZhitong = false, string pickOrderNo = null, int zhitongPartion = 0, int outPickDetailId = 0, int purch_d_id = 0)
         {
             //  lir.receivePreDetail(preInNo, goodsId, batchCount, receiveNumber, inType, inRemark, isCache, cachePartion, temperature);
             Dictionary<string, string> sku = new Dictionary<string, string>();
@@ -1091,13 +1114,14 @@ namespace DeiNiu.Wcf
             try
             {
                 // throw new Exception("test....");
-                enumValidInResult result = lir.validIn(preInNo, flowNo, goodsId.Trim(), batchCount, seedsCount, sku, isPass, isIsuLocations, isVirtualIn, secondValidUserId, 0, true, isFlowUni, isZhitong, pickOrderNo, zhitongPartion, outDetailId, purch_d_id);
+                enumValidInResult result = lir.validIn(preInNo, flowNo, goodsId.Trim(), batchCount, seedsCount, sku, isPass, isIsuLocations, isVirtualIn, secondValidUserId, 0, true, isFlowUni, isZhitong, pickOrderNo, zhitongPartion, outPickDetailId, purch_d_id);
 
                 FormatedResult rs = new FormatedResult(result.ToString(), (int)result, result.ToString());
                 return rs;
             }
             catch (Exception e)
             {
+
                 log.Error(e);
                 return new FormatedResult(400, e.Message);
             }
@@ -1155,12 +1179,12 @@ namespace DeiNiu.Wcf
             }
         }
 
-        FormatedResult IAndroid.getZhiTongOrderByCust(string preNo, string orderBy)
+        FormatedResult IAndroid.getZhiTongOrderByCust(string preNo, string barcode, string orderBy)
         {
 
             try
             {
-                return new FormatedResult(lir.getZhiTongOrderByCust(preNo, orderBy));
+                return new FormatedResult(lir.getZhiTongOrderByCust(preNo, orderBy, barcode));
             }
             catch (Exception e)
             {
@@ -1218,15 +1242,9 @@ namespace DeiNiu.Wcf
 
         FormatedResult IAndroid.preInDone(string preInNo)
         {
-
             try
-            {
-                enumRepResult res = lir.preInDone(preInNo);
-                if (enumRepResult.成功 == res)
-                {
-                    // call erp interface ,notice the preIn has been done.
-                }
-                return new FormatedResult(res.ToString());
+            {             
+                return new FormatedResult(lir.preInDone(preInNo).ToString());
             }
             catch (Exception e)
             {
@@ -1330,7 +1348,9 @@ namespace DeiNiu.Wcf
 
             try
             {
-                return new FormatedResult(lop.getPortOutPickOrderDetail(id));
+                DataTable dt = lop.getPortOutPickOrderDetail(id);
+                dt.Columns.Remove("id128");
+                return new FormatedResult(dt);
             }
             catch (Exception e)
             {
@@ -1414,7 +1434,9 @@ namespace DeiNiu.Wcf
 
             try
             {
-                return new FormatedResult(lport.getAssignedOutTasks(operId, partion, lineId, batchOnly, (enumOutOrderType)orderType));
+                DataTable dt = lport.getAssignedOutTasks(operId, partion, lineId, batchOnly, (enumOrderType)orderType);
+                dt.Columns.Remove("id128");
+                return new FormatedResult(dt);
             }
             catch (Exception e)
             {
@@ -1428,8 +1450,10 @@ namespace DeiNiu.Wcf
 
             try
             {
-                lport.taskAssign(takeBy, partion, lineId, 0, 0, WmsConstants.OUT_TASK_ASSIGN_BATCH_ONLY, (enumOutOrderType)orderType);
-                return new FormatedResult(lport.getAssignedOutTasks(takeBy, partion, lineId, batchOnly, (enumOutOrderType)orderType));
+                lport.taskAssignByJob(takeBy, partion, lineId, 0, 0, WmsConstants.OUT_TASK_ASSIGN_BATCH_ONLY, (enumOrderType)orderType);
+                DataTable dt = lport.getAssignedOutTasks(getOperId(), partion, lineId, batchOnly, (enumOrderType)orderType);
+                dt.Columns.Remove("id128");
+                return new FormatedResult(dt);
             }
             catch (Exception e)
             {
@@ -1465,12 +1489,12 @@ namespace DeiNiu.Wcf
             }
         }
 
-        FormatedResult IAndroid.seedsPickOut(string flowNo, string batch, int outDetailId, decimal seedCnt, string toFlowNo)
+        FormatedResult IAndroid.seedsPickOut(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo,int inDetailId)
         {
 
             try
             {
-                enumRepResult result = lport.seedsPickOut(flowNo, batch, outDetailId, seedCnt, toFlowNo);
+                enumRepResult result = lport.seedsPickOut(flowNo,   skuId,   productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId);
                 return new FormatedResult(result.ToString());
             }
             catch (Exception e)
@@ -1514,7 +1538,7 @@ namespace DeiNiu.Wcf
 
 
                 string date = string.Format("{0}{1:D2}", DateTime.Now.Year, DateTime.Now.Month);
-                string sitePath = "d:/image/validation/" + date + "/";
+                string sitePath = "c:/image/validation/" + date + "/";
                 if (!Directory.Exists(sitePath)) Directory.CreateDirectory(sitePath);
 
                 var fileName = "";
@@ -1773,6 +1797,19 @@ namespace DeiNiu.Wcf
             }
         }
 
+        public FormatedResult getPlate(string flowNo)
+        {
+            try
+            {
+                return new FormatedResult(lplate.queryPlate(flowNo));
+
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+        }
 
 
         public FormatedResult getPlateContents(string flowNo, bool isShowSubs)
@@ -1803,7 +1840,7 @@ namespace DeiNiu.Wcf
                 log.Error(e);
                 return new FormatedResult(e);
             }
-            throw new NotImplementedException();
+         
         }
 
         public FormatedResult getSubPlates(string flowNo)
@@ -1811,7 +1848,7 @@ namespace DeiNiu.Wcf
             try
             {
 
-                return new FormatedResult(lplate.getWmsPlate.getSubPlates(flowNo));
+                return new FormatedResult(lplate.getWmsPlate.getSubPlateIds(flowNo));
 
 
             }
@@ -1820,7 +1857,90 @@ namespace DeiNiu.Wcf
                 log.Error(e);
                 return new FormatedResult(e);
             }
-            throw new NotImplementedException();
+          
         }
+
+        public FormatedResult putPlateIntoPlate(string fromPlate, string toPlate)
+        {
+            try
+            {
+
+                return new FormatedResult(lplate.putPlateIntoPlate(fromPlate, toPlate).ToString());
+                 
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+          
+        }
+
+        public FormatedResult takeOutPlate(string fromPlate, string plate)
+        {
+            try
+            {
+                
+
+                return new FormatedResult(lplate.takeOutPlate(fromPlate, plate).ToString());
+
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+
+        }
+
+
+       public FormatedResult plateValidation(int portId, int skuId, string productDate, string validDate, string batch, decimal validationCnt, string validReason)
+        {
+            try
+            {
+                log.Debug(string.Format("do validation .."));
+
+                return new FormatedResult(lplate.plateValidation( portId,   skuId,   productDate,   validDate,   batch, validationCnt,  validReason).ToString());
+
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+        }
+
+        public FormatedResult startTran(string plateId)
+        {
+            try
+            {
+                log.Debug(string.Format("do startTran .."));
+                return new FormatedResult(lplate.startTran(plateId).ToString());
+
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+        }
+        public FormatedResult loadTruck(string fromPlate, string toPlate)
+        {
+            try
+            {
+                log.Debug(string.Format("do loadTruck .."));
+                return new FormatedResult(lplate.loadTruck(fromPlate, toPlate).ToString());
+
+            }
+            catch (Exception e)
+            {
+                log.Error(e);
+                return new FormatedResult(e);
+            }
+        }
+
+
+        //-----------------light pick
+
     }
 }

WcfService1/BLL/ConstAuthourity.cs

@@ -7,12 +7,16 @@ using WcfServiceAuthentication;
 namespace DeiNiu.wms.Logical
 {
     public class ConstAuthourity
-    { 
+    {
+
+        protected static log4net.ILog log = log4net.LogManager.GetLogger("logCommon");
+
         public static Dictionary<int, int> userKeyPares = new Dictionary<int, int>();
         public static Dictionary<int, List<string>> userSpecialAuths = new Dictionary<int, List<string>>()  ;
  
         public static List<string> getAuthorities(int userId)
         {
+          
             int randomCode = 0;
            if(AuthenticationInspector.tmpCodes.ContainsKey(userId))
             {
@@ -49,7 +53,19 @@ namespace DeiNiu.wms.Logical
         }
 
         public static bool havePermission(int userId,string permission)
-        { 
+        {
+            log.Debug(" to check temp token authorition, userid is " + userId);
+            foreach (int key in AuthenticationInspector.tmpCodes.Keys)
+            {
+                log.Debug(String.Format("temp token authorition: userId {0}, tmpToken {1}", key, AuthenticationInspector.tmpCodes[key]));
+            }
+            foreach (int key in  userKeyPares.Keys)
+            {
+                log.Debug(String.Format("userKeypares : userId {0}, tmpToken {1}", key, userKeyPares[key]));
+            }
+
+            
+
             return userSpecialAuths.ContainsKey(userId) && userSpecialAuths[userId].Contains(permission) 
                 ||getAuthorities(userId).Contains(permission);
 

WcfService1/BLL/elelable/ele_base.cs

@@ -98,13 +98,13 @@ namespace elelab
         {
             data = Convert.ToDouble(data).ToString();
             string[] count = data.Split('.');//Out_count
-            int full = Convert.ToInt16(count[0]);
+            int full =  Convert.ToInt32(count[0]);
             int dot_num;
             dot_station = 0;
             total_num = full;
             if (count.Length > 1)
             {
-                dot_num = Convert.ToInt16(count[1]);
+                dot_num =  Convert.ToInt32(count[1]);
                 if (dot_num > 0)
                 {
                     if (dot_num < 10)
@@ -153,7 +153,7 @@ namespace elelab
                 {
                     ele_data_comment[j].channel_id = 0;//暂不使用 默认为0
                     ele_data_comment[j].dis_type = Convert.ToByte(ds.Rows[j]["color"].ToString()); ;// 灯的颜色 0 不亮 1 红灯 2 绿灯 3 蓝灯 4 红闪 5 绿闪 6 蓝闪 
-                    ele_data_comment[j].ele_id = Convert.ToInt16(ds.Rows[j]["ele_lab_id"].ToString());
+                    ele_data_comment[j].ele_id =  Convert.ToInt32(ds.Rows[j]["ele_lab_id"].ToString());
                     ele_data_comment[j].kucun_id = 0;
                     ele_data_comment[j].little_ele_id = Convert.ToByte(ds.Rows[j]["ele_address"].ToString());
                     ele_data_comment[j].order = Convert.ToByte(ele_order_id);
@@ -166,7 +166,7 @@ namespace elelab
 
                     get_data(ds.Rows[j]["send_count"].ToString(), out dot_station, out total_num);
                     //string[] count = ds.Rows[j]["send_count"].ToString().Split('.');//Out_count
-                    //total_num = Convert.ToInt16(count[0]);
+                    //total_num =  Convert.ToInt32(count[0]);
                     ele_data_comment[j].send_count = total_num;//.ToString());
                     ele_data_comment[j].dot = Convert.ToByte(dot_station);
 
@@ -218,16 +218,16 @@ namespace elelab
             }
             else if (str.Count == 2)
             {
-                int len = Convert.ToInt16(str[0]);
-                int len1 = Convert.ToInt16(str[1]);
+                int len =  Convert.ToInt32(str[0]);
+                int len1 =  Convert.ToInt32(str[1]);
                 len = len * 10 + len1;
                 return Convert.ToByte(len);
             }
             else if (str.Count == 3)
             {
-                int len = Convert.ToInt16(str[0]);
-                int len1 = Convert.ToInt16(str[1]);
-                int len2 = Convert.ToInt16(str[2]);
+                int len =  Convert.ToInt32(str[0]);
+                int len1 =  Convert.ToInt32(str[1]);
+                int len2 =  Convert.ToInt32(str[2]);
 
                 len = len * 100 + len1 * 10 + len2;
                 return Convert.ToByte(len);
@@ -356,10 +356,10 @@ namespace elelab
         //    Dal.ele_help sa = new Dal.ele_help();
         //    while (ele_return_receive_address != ele_return_manage_address)
         //    {
-        //        receive_count = receive_data_dot(Convert.ToInt16(ele_return_data[ele_return_manage_address].receive_count), Convert.ToInt16(ele_return_data[ele_return_manage_address].dot));
-        //        ele_id = Convert.ToInt16(ele_return_data[ele_return_manage_address].ele_id.ToString());
+        //        receive_count = receive_data_dot( Convert.ToInt32(ele_return_data[ele_return_manage_address].receive_count),  Convert.ToInt32(ele_return_data[ele_return_manage_address].dot));
+        //        ele_id =  Convert.ToInt32(ele_return_data[ele_return_manage_address].ele_id.ToString());
         //        order = ele_return_data[ele_return_manage_address].order.ToString();
-        //        little_ele_id = Convert.ToInt16(ele_return_data[ele_return_manage_address].little_ele_id.ToString());
+        //        little_ele_id =  Convert.ToInt32(ele_return_data[ele_return_manage_address].little_ele_id.ToString());
         //        int state = elelab.pick.ele_lab[ele_id, little_ele_id];
         //        if (state == 0)
         //        {

WcfService1/BLL/elelable/pick.cs

@@ -63,16 +63,16 @@ namespace elelab
             }
             else if (str.Count == 2)
             {
-                int len = Convert.ToInt16(str[0]);
-                int len1 = Convert.ToInt16(str[1]);
+                int len =  Convert.ToInt32(str[0]);
+                int len1 =  Convert.ToInt32(str[1]);
                 len = len * 10 + len1;
                 return Convert.ToByte(len);
             }
             else if (str.Count == 3)
             {
-                int len = Convert.ToInt16(str[0]);
-                int len1 = Convert.ToInt16(str[1]);
-                int len2 = Convert.ToInt16(str[2]);
+                int len =  Convert.ToInt32(str[0]);
+                int len1 =  Convert.ToInt32(str[1]);
+                int len2 =  Convert.ToInt32(str[2]);
 
                 len = len * 100 + len1 * 10 + len2;
                 return Convert.ToByte(len);
@@ -107,8 +107,8 @@ namespace elelab
                 int com = Convert.ToByte(i);
                 if (elelab.unart_manage.init_com_sys(com, true) == true)
                 {
-                    port = Convert.ToInt16(i);
-                    // order = Convert.ToInt16(dt.Rows[i]["ele_order"]);
+                    port =  Convert.ToInt32(i);
+                    // order =  Convert.ToInt32(dt.Rows[i]["ele_order"]);
                     order.order = Convert.ToByte(i);
                     order.state =Convert.ToByte((int)pickType);
                     if (unart_manage.com_manage[port].clear_order(order))
@@ -127,8 +127,8 @@ namespace elelab
             clear_order order = new clear_order();
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                port = Convert.ToInt16(dt.Rows[i]["port"]);
-                // order = Convert.ToInt16(dt.Rows[i]["ele_order"]);
+                port =  Convert.ToInt32(dt.Rows[i]["port"]);
+                // order =  Convert.ToInt32(dt.Rows[i]["ele_order"]);
                 order.order = Convert.ToByte(dt.Rows[i]["ele_order"]);
                 order.state = 1;
                 unart_manage.com_manage[port].clear_order(order);
@@ -171,7 +171,7 @@ namespace elelab
         public static void wake_thread()
         {
 
-            if (Convert.ToInt16(pick_work.ThreadState) == 68)
+            if ( Convert.ToInt32(pick_work.ThreadState) == 68)
             {
                 try
                 {
@@ -188,20 +188,20 @@ namespace elelab
 
         public static void wake_support_thread()
         {
-            if (Convert.ToInt16(pick_work_support.ThreadState) == 68)
+            if ( Convert.ToInt32(pick_work_support.ThreadState) == 68)
                 pick_work_support.Resume();
         }
         private static void get_data(string data, out int dot_station, out int total_num)
         {
             data = Convert.ToDouble(data).ToString();
             string[] count = data.Split('.');//Out_count
-            int full = Convert.ToInt16(count[0]);
+            int full =  Convert.ToInt32(count[0]);
             int dot_num;
             dot_station = 0;
             total_num = full;
             if (count.Length > 1)
             {
-                dot_num = Convert.ToInt16(count[1]);
+                dot_num =  Convert.ToInt32(count[1]);
                 if (dot_num > 0)
                 {
                     if (dot_num < 10)
@@ -252,7 +252,7 @@ namespace elelab
                 {
                     ele_data_comment[j].channel_id = 0;//暂不使用 默认为0
                     ele_data_comment[j].dis_type = Convert.ToByte(ds.Rows[j]["color"].ToString()); ;// 灯的颜色 0 不亮 1 红灯 2 绿灯 3 蓝灯 4 红闪 5 绿闪 6 蓝闪 
-                    ele_data_comment[j].ele_id =  Convert.ToInt16(ds.Rows[j]["ele_lab_id"].ToString());
+                    ele_data_comment[j].ele_id =   Convert.ToInt32(ds.Rows[j]["ele_lab_id"].ToString());
                     ele_data_comment[j].kucun_id = 0;
                     ele_data_comment[j].little_ele_id = Convert.ToByte(ds.Rows[j]["ele_address"].ToString());
                     ele_data_comment[j].order = Convert.ToByte(ele_order_id);
@@ -265,14 +265,14 @@ namespace elelab
 
                     get_data(ds.Rows[j]["send_count"].ToString(), out dot_station, out total_num);
 
-                    //total_num = Convert.ToInt16(count[0]);
+                    //total_num =  Convert.ToInt32(count[0]);
                     ele_data_comment[j].send_count = total_num;//.ToString());
                     ele_data_comment[j].dot = Convert.ToByte(0);
                     //ele_data_comment[j].dot = 0;
                     ele_data_comment[j].WarehousingID = 0;
                     ele_lab[ele_data_comment[j].ele_id, ele_data_comment[j].little_ele_id] = type;
 
-                    statuKeys.Add(Util.getLightKey(led_color,  Convert.ToInt16(ds.Rows[j]["ele_lab_id"].ToString()), Convert.ToByte(ds.Rows[j]["ele_address"].ToString())));
+                    statuKeys.Add(Util.getLightKey(led_color,   Convert.ToInt32(ds.Rows[j]["ele_lab_id"].ToString()), Convert.ToByte(ds.Rows[j]["ele_address"].ToString())));
 
                 }// //向串口发送数据
                 clear_order order = new clear_order();
@@ -313,18 +313,18 @@ namespace elelab
                 {
                     ele_data_comment[j].channel_id = 0;//暂不使用 默认为0
                     ele_data_comment[j].dis_type = led_color;// 灯的颜色 0 不亮 1 红灯 2 绿灯 3 蓝灯 4 红闪 5 绿闪 6 蓝闪 
-                    ele_data_comment[j].ele_id = Convert.ToInt16(ele_lab_id[j].ToString());
+                    ele_data_comment[j].ele_id =  Convert.ToInt32(ele_lab_id[j].ToString());
                     ele_data_comment[j].kucun_id = 0;
                     ele_data_comment[j].little_ele_id = Convert.ToByte(ele_address[j].ToString());
                     ele_data_comment[j].order = Convert.ToByte(ele_order_id);
                     ele_data_comment[j].port = "1";
                     ele_data_comment[j].receive_count = 0;
                     string[] count = Out_count[j].ToString().Split('.');
-                    ele_data_comment[j].send_count = Convert.ToInt16(count[0]);//.ToString());
+                    ele_data_comment[j].send_count =  Convert.ToInt32(count[0]);//.ToString());
                     ele_data_comment[j].state = 1;
                     ele_data_comment[j].WarehousingID = 0;
                     ele_lab[ele_data_comment[j].ele_id, ele_data_comment[j].little_ele_id] = type;
-                    statuKeys.Add(Util.getLightKey(led_color, Convert.ToInt16(ele_lab_id[j].ToString()), Convert.ToByte(ele_address[j].ToString())));
+                    statuKeys.Add(Util.getLightKey(led_color,  Convert.ToInt32(ele_lab_id[j].ToString()), Convert.ToByte(ele_address[j].ToString())));
                 }// //向串口发送数据
                 clear_order order = new clear_order();
                 order.order = Convert.ToByte(ele_order_id);
@@ -445,17 +445,17 @@ namespace elelab
             {
               //  cnt++;
                 
-                receive_count = receive_data_dot(Convert.ToInt32(ele_lab_data[manage_add].receive_count), Convert.ToInt16(ele_lab_data[manage_add].dot));
+                receive_count = receive_data_dot(Convert.ToInt32(ele_lab_data[manage_add].receive_count),  Convert.ToInt32(ele_lab_data[manage_add].dot));
                 // ele_lab_data[receive_add]
                 //receive_count = "0";
-                ele_id = Convert.ToInt16(ele_lab_data[manage_add].ele_id.ToString()); //label id
+                ele_id =  Convert.ToInt32(ele_lab_data[manage_add].ele_id.ToString()); //label id
                 color = ele_lab_data[manage_add].order.ToString();//color
-                little_ele_id = Convert.ToInt16(ele_lab_data[manage_add].little_ele_id.ToString()); //ele address
+                little_ele_id =  Convert.ToInt32(ele_lab_data[manage_add].little_ele_id.ToString()); //ele address
                 int state = elelab.pick.ele_lab[ele_id, little_ele_id];
                 pickType = (enumLabelPickType)state;
 
           
-                string key = Util.getLightKey(Convert.ToInt16(color), ele_id, little_ele_id);
+                string key = Util.getLightKey( Convert.ToInt32(color), ele_id, little_ele_id);
 
                 if (WmsConstants.WAVE_CURRENT_PICK_STATUS.ContainsKey(key) )
                 {
@@ -477,7 +477,7 @@ namespace elelab
                     case enumLabelPickType.pick:
                        /* using (WmsOutPickRequestClient client = new WmsOutPickRequestClient())
                         {
-                           WmsConstants.WAVE_CURRENT_PICK_STATUS[key] =  client.updatePickingStatus(Convert.ToInt16(color), ele_id, little_ele_id, Convert.ToDecimal(receive_count));//本次拣选完毕
+                           WmsConstants.WAVE_CURRENT_PICK_STATUS[key] =  client.updatePickingStatus( Convert.ToInt32(color), ele_id, little_ele_id, Convert.ToDecimal(receive_count));//本次拣选完毕
                             bool isPickOver = client.getCurrentPickList((int)DeiNiu.Utils.enumPickState.未拣).Rows.Count == 0;//波次是否全部拣选完毕
 
                             elelab.pick.pick_task = isPickOver;
@@ -495,7 +495,7 @@ namespace elelab
                             client.Close();
                         }*/
                            lWmsOutPickRequest lwp = new lWmsOutPickRequest();
-                          //  WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = lwp.updatePickingStatus(Convert.ToInt16(color), ele_id,  Convert.ToDecimal(receive_count),little_ele_id);//本次拣选完毕
+                          //  WmsConstants.WAVE_CURRENT_PICK_STATUS[key] = lwp.updatePickingStatus( Convert.ToInt32(color), ele_id,  Convert.ToDecimal(receive_count),little_ele_id);//本次拣选完毕
                             bool isPickOver = new WmsOutPickLable().getCurrentPickList( DeiNiu.Utils.enumPickState.未拣).Tables[0].Rows.Count == 0;//波次是否全部拣选完毕
 
                             elelab.pick.pick_task = isPickOver;
@@ -636,7 +636,7 @@ namespace elelab
             int port_num;
             try
             {
-                port_num = Convert.ToInt16(port);
+                port_num =  Convert.ToInt32(port);
             }
             catch
             {

WcfService1/BLL/elelable/sjqh.cs

@@ -94,7 +94,7 @@ namespace elelab
         //channel_id 0            1         2        3         4          5        6
         //         通道灯id     发送数量   接收数量  货位1    货位2        货位3     货位4   。。。。。。 货位n
 
-        //  address = Convert.ToInt16(port);
+        //  address =  Convert.ToInt32(port);
         // own_serial_str = serial_num_string[address];
         // own_serial = serial_num[address];
         public bool init_wms_sys(int com_count)
@@ -1401,7 +1401,7 @@ namespace elelab
                 }
                 //mak_dis_pack[count++] = Convert.ToByte((num_base_address << 4) );//地址的位置
                 mak_dis_pack[count++] = dat[i].little_ele_id;//地址
-                int send_num = Convert.ToInt16(dat[i].send_count);
+                int send_num =  Convert.ToInt32(dat[i].send_count);
                 mak_dis_pack[count++] = Convert.ToByte(send_num / 256);//数量
                 mak_dis_pack[count++] = Convert.ToByte(send_num % 256);