Merge branch 'master' of https://e.coding.net/ccwin-in/JBLEAR-STD/jbLear-STD

Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_BillAsn.cs

@@ -24,7 +24,7 @@ namespace Stone.DataService.Biz.Bill
             Entity_t_JIS_VDA t_JIS_VDA = new Entity_t_JIS_VDA();
 
             DataSet dsData = t_JIS_VDA.GetData(
-                $"PackageNo, 0 as IsCheck, AsnNumber, IsShipingVerification", 
+                $"PackageNo, 0 as IsCheck, AsnNumber, IsShipingVerification,IsPrintASN", 
                 $"[AsnNumber]='{AsnNumber}'", 
                 $"[PackageNo] desc");
 
@@ -33,6 +33,8 @@ namespace Stone.DataService.Biz.Bill
                 throw new Exception($"ASN编号{AsnNumber}不存在");
             }
 
+            if (dsData.Tables[0].Select("[IsPrintASN]=True").Length == 0)
+                throw new Exception($"{AsnNumber} 未打印");
 
             if (dsData.Tables[0].Select("[IsShipingVerification]=False").Length == 0)
                 throw new Exception($"{AsnNumber} 已经完成发货校验");

Stone.WinForm/Stone.DataService/Stone.DataService.Biz/Bill/F_STD_Check.cs

@@ -61,6 +61,9 @@ namespace Stone.DataService.Biz.Bill
                 if (dtVDA.Rows.Count == 0)
                     throw new Exception($"装箱单号 {PackageNo} 在系统中不存在");
 
+                if (!Convert.ToBoolean(dtVDA.Rows[0]["IsPrintLabel"]))
+                    throw new Exception($"装箱单号 {PackageNo} 未打印");
+
                 if (Convert.ToBoolean(dtVDA.Rows[0]["IsPackingVerification"]))
                     throw new Exception($"装箱单号 {PackageNo} 已经做过装箱校验了");
 

Stone.WinForm/Stone.WinModule/BasicData/frmBaseMain.cs

@@ -142,7 +142,8 @@ namespace Stone.WinModule.BasicData
                 if (frmFilter.SelectString != "")
                 {
                     strWhere = frmFilter.SelectString;
-                    UpdateGridView();
+                    // UpdateGridView();
+                    UpdateGridViewByFilter();
                 }
                 else
                 {
@@ -241,7 +242,6 @@ namespace Stone.WinModule.BasicData
         {
             try
             {
-
                 this.txtCode.Focus();
                 this.txtCode.SelectAll();
                 UpdateGridView();
@@ -280,10 +280,16 @@ namespace Stone.WinModule.BasicData
         /// </summary>
         public virtual void UpdateGridView()
         {
-
             string code = this.txtCode.Text.Trim();
             Search(code);
+            m_Base.BindPageData(strWhere);
+            m_Base.GetView(this.dgrdView);
+            this.tlbAllCount.Text = "记录数：" + m_Base.dsMain.Tables["Data"].Rows.Count;
+        }
 
+        public virtual void UpdateGridViewByFilter()
+        {
+            string code = this.txtCode.Text.Trim();
             m_Base.BindPageData(strWhere);
             m_Base.GetView(this.dgrdView);
             this.tlbAllCount.Text = "记录数：" + m_Base.dsMain.Tables["Data"].Rows.Count;

Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs

@@ -403,7 +403,8 @@ namespace Stone.WinModule.Standard
                         Odd = Convert.ToInt32(drData["quantity_new"]) -
                               Convert.ToInt32(PageQty * Convert.ToInt32(drData["PackNumer"])); //计算零头
                     }
-
+                    //存储需求日期
+                    Date = drData["StartDate"].ToString();
 
                     for (int i = 1; i <= PageQty; i++)
                     {

Stone.WinForm/Stone.WinModule/Standard/frmJISVDAASN.cs

@@ -423,7 +423,7 @@ namespace Stone.WinModule.Standard
 
                 Entity_t_JIS_VDA t_JIS_VDA = new Entity_t_JIS_VDA(db);
 
-                t_JIS_VDA.Edit($"[IsUpload]=0, [UploadTime]=null", $"[AsnNumber]='{AsnNumber}'");
+                t_JIS_VDA.Edit($"[IsUpload]=0, [UploadTime]=null,IsShipingVerification = 0,IsPrintASN = 0", $"[AsnNumber]='{AsnNumber}'");
 
                 db.Commit();
             }
@@ -544,6 +544,9 @@ namespace Stone.WinModule.Standard
                 if (dsData.Tables[0].Rows.Count == 0)
                     throw new Exception($"{AsnNumber} 不存在");
 
+                if (dsData.Tables[0].Select("[IsPackingVerification]=False").Length > 0)
+                    throw new Exception(AsnNumber + " 所属VDA未完成装箱校验");
+
                 if (dsData.Tables[0].Select("[IsPrintASN]=True").Length == dsData.Tables[0].Rows.Count)
                     throw new Exception(AsnNumber + " 已经打印过了");
 

Stone.WinForm/Stone.WinModule/Standard/frmMessageQuestion.cs

@@ -33,7 +33,8 @@ namespace Stone.WinModule.Standard
             if (BillType == 0)
             {
                 frmPasswordVerify frm = new frmPasswordVerify();
-                frm.UserName = User.UserInfo.UserName;
+                // frm.UserName = User.UserInfo.UserName;
+                frm.UserName = "wping";
                 if (frm.ShowDialog() == DialogResult.OK)
                 {
                     this.DialogResult = DialogResult.OK;