From c6d368826e3c197509f075faead2cfb0e8c400db Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 27 八月 2021 22:37:45 +0800
Subject: [PATCH] 条码生成模块新增选源单：生产汇报单功能
---
SCM/条码打印/Gy_BarCodeBill.cs | 20 ++++++++++++++++++++
SCM/源单/Cls_S_IF_ICMOReportBillList.cs | 21 +++++++++++++++++++++
SCM/SCM.csproj | 1 +
SCM/公用类/ClsPub1.cs | 4 ++--
4 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/SCM/SCM.csproj b/SCM/SCM.csproj
index 6a07a6e..84b9aa3 100644
--- a/SCM/SCM.csproj
+++ b/SCM/SCM.csproj
@@ -407,6 +407,7 @@
<Compile Include="鎶ヨ〃\Kf_SellOutReturnedReport.designer.cs">
<DependentUpon>Kf_SellOutReturnedReport.cs</DependentUpon>
</Compile>
+ <Compile Include="婧愬崟\Cls_S_IF_ICMOReportBillList.cs" />
<Compile Include="婧愬崟\Cls_S_IFCLD_ICMOList.cs" />
<Compile Include="鍏敤绫籠Cls_S_K3_PoinStockList.cs" />
<Compile Include="鍏敤绫籠Cls_S_K3_POOrderBillList.cs" />
diff --git "a/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs" "b/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
index f8c0086..cf1bccf 100644
--- "a/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
+++ "b/SCM/\345\205\254\347\224\250\347\261\273/ClsPub1.cs"
@@ -14,7 +14,7 @@
//public static string WEBSURL = "http://124.70.129.242/WEBS-WMS/WebService1.asmx"; //闆呯惇璇�
//public static string WEBSURL = "http://192.168.1.29/WEBS-WMS/WebService1.asmx"; //鍦ｉ緳 鍐呯綉
//public static string WEBSURL = "http://122.227.138.236/WEBS-WMS/WebService1.asmx"; //鍦ｉ緳(涓嶇敤)
- //public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 澶栫綉
+ public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 澶栫綉
//public static string WEBSURL = "http://192.168.0.66/WEBS-WMS/WebService1.asmx"; //鍥涚淮灏� 鍐呯綉
//public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS-TEST/WebService1.asmx"; //鍥涚淮灏旀祴璇�
//public static string WEBSURL = "http://122.227.199.62:5050/LMESWEBS/WebService1.asmx"; //闊╃數 澶栫綉JIT锛堜笉鐢級
@@ -24,7 +24,7 @@
//public static string WEBSURL = "http://192.192.192.13/WMSWEBS/WebService1.asmx"; //鍗撳姏
//public static string WEBSURL = "http://120.195.29.36:1230/WEBS-WMS/WebService1.asmx"; //姹熻嫃榫欎酣
//public static string WEBSURL = "http://192.168.63.139/WEBS-WMS/WebService1.asmx";
- public static string WEBSURL = "http://192.168.2.18/WEBS-WMS/WebService1.asmx"; //鍏徃鍙板紡鏈�
+ //public static string WEBSURL = "http://192.168.2.18/WEBS-WMS/WebService1.asmx"; //鍏徃鍙板紡鏈�
//public static string WEBSURL = "http://192.168.0.108/WEBS-WMS/WebService1.asmx"; //瀹�
public static long HOrgID = 0;
public static string HOrgNumber = "";
diff --git "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index d0644d9..bfa135e 100644
--- "a/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/SCM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -211,6 +211,7 @@
}
//
cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
+ cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
cmbSourceBillType.Items.Add("閲囪喘璁㈠崟");
cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
cmbSourceBillType.Items.Add("濮斿璁㈠崟");
@@ -2641,6 +2642,15 @@
FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
}
}
+ else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+ {
+ sWhere = " and HOrgID =" + sHOrgID.ToString();
+ SCM.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new SCM.Cls_S_IF_ICMOReportBillList();
+ if (oIF_ICMOReportBillList.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
+ }
+ }
else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
{
sWhere = " and HOrgID =" + sHOrgID.ToString();
@@ -2708,6 +2718,16 @@
//鍐欏叆淇℃伅
Sub_WriteInForm(Ds.Tables[0], i);
}
+ //鐢熶骇姹囨姤鍗�
+ if (oSelectRow.BillType == "3711")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oWeb.getDataSetBySQL("select * from h_v_IF_ICMOReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ICMOReportList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
//鏀舵枡閫氱煡鍗�
if (oSelectRow.BillType == "1103")
{
diff --git "a/SCM/\346\272\220\345\215\225/Cls_S_IF_ICMOReportBillList.cs" "b/SCM/\346\272\220\345\215\225/Cls_S_IF_ICMOReportBillList.cs"
new file mode 100644
index 0000000..7f7c0bd
--- /dev/null
+++ "b/SCM/\346\272\220\345\215\225/Cls_S_IF_ICMOReportBillList.cs"
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using DBUtility;
+
+namespace SCM
+{
+ public class Cls_S_IF_ICMOReportBillList : Cls_S_Xt_BaseBill
+ {
+ public Cls_S_IF_ICMOReportBillList()
+ {
+ base.ViewName = "h_v_IF_ICMOReportBillList_Source";
+ base.mvarReportTitle = "鐢熶骇姹囨姤鍗�";
+ base.mvarItemKey = "3711";
+ base.sCondtion = " ";
+ base.sOrderSql = " order by 鍗曟嵁鍙� desc,HSubID ";
+ base.sKeyCol = "閮ㄩ棬";
+ }
+
+ }
+}
--
Gitblit v1.9.1