diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 67e5afe..4753fb1 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -3,50 +3,14 @@
+
-
-
-
-
-
-
-
-
-
-
-
- -->
-
-
-
-
-
-
-
@@ -57,11 +21,18 @@
-
+
+
+
+
+
+
+
+
@@ -179,7 +150,7 @@
-
+
@@ -240,31 +211,20 @@
-
-
-
-
+
+
-
-
+
+
+
+
-
-
diff --git a/APPQ5/QMAPP.WinForm/Forms/DisPatch/DPShipment.cs b/APPQ5/QMAPP.WinForm/Forms/DisPatch/DPShipment.cs
index 369ace8..fbc994d 100644
--- a/APPQ5/QMAPP.WinForm/Forms/DisPatch/DPShipment.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/DisPatch/DPShipment.cs
@@ -1483,11 +1483,20 @@ namespace QMAPP.WinForm.Forms.DisPatch
}
else
{
- PlaySound.PlaySounds.Play(@errorSoundPath);
- lberror.Text = "未查询到该产品零件信息:" + Code + "。";
- //清理文本框
- ArragetxtCode();
- return;
+ product = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCodeMP4.ToString(), Code);
+ if (product != null)
+ {
+ Code = string.IsNullOrEmpty(product.MAINCODE) ? product.PRODUCTCODE : product.MAINCODE;
+ }
+ else
+ {
+ PlaySound.PlaySounds.Play(@errorSoundPath);
+ lberror.Text = "未查询到该产品零件信息:" + Code + "。";
+ //清理文本框
+ ArragetxtCode();
+ return;
+ }
+
}
#region 校验是否有重复的扫过的条码
diff --git a/APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
index b5e3fed..5aef530 100644
--- a/APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
@@ -1527,7 +1527,7 @@ namespace QMAPP.WinForm.Forms.DisPatch
if (System.Text.RegularExpressions.Regex.IsMatch(Code, "^BCP"))
{
//BCP开头的是BC316-MP4的包覆件
- product = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCodeMP4.ToString(), Code);
+
}
else
{
@@ -1540,10 +1540,19 @@ namespace QMAPP.WinForm.Forms.DisPatch
}
else
{
- Alert("未查询到该产品零件信息:" + Code + "。");
- //清理文本框
- ArragetxtCode();
- return;
+ product = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCodeMP4.ToString(), Code);
+ if (product != null)
+ {
+ Code = string.IsNullOrEmpty(product.MAINCODE) ? product.PRODUCTCODE : product.MAINCODE;
+ }
+ else
+ {
+ Alert("未查询到该产品零件信息:" + Code + "。");
+ //清理文本框
+ ArragetxtCode();
+ return;
+ }
+
}
#region 校验是否有重复的扫过的条码
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
index 942b03c..515075e 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
@@ -895,7 +895,7 @@ namespace QMAPP.WinForm.Forms.Operation
this.txtCode.Text = "";
//PlaySound.PlaySounds.Play(@okSoundPath);
- if (!"770,018,278".Contains(productCode.Substring(0, 3)))
+ if (!"770,018,278,304".Contains(productCode.Substring(0, 3)))
{
if(File.Exists(@okSoundPath))
{
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
index b446bb9..84aefb0 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
@@ -108,6 +108,8 @@ namespace QMAPP.WinForm.Forms.Operation
private string _AutoMachineCode = string.Empty; //自动扫码的配置设备编号
+ private string _Line = string.Empty; //自动扫码的配置设备编号
+
private string _firstBoxA = "true";
private int _containCount = 6;
@@ -135,6 +137,7 @@ namespace QMAPP.WinForm.Forms.Operation
_052printWorkloc = System.Configuration.ConfigurationManager.AppSettings["052打印工位"];
_371BiaoPiBarCodeRegex = System.Configuration.ConfigurationManager.AppSettings["052打印条码规则371"];
_316BiaoPiBarCodeRegex = System.Configuration.ConfigurationManager.AppSettings["052打印条码规则316"];
+ _Line = System.Configuration.ConfigurationManager.AppSettings["产线信息"];
string firstA = System.Configuration.ConfigurationManager.AppSettings["先装A面"]?.Trim();
_firstBoxA = string.IsNullOrEmpty(firstA) == true ? "true" : firstA.ToLower();
@@ -749,9 +752,13 @@ namespace QMAPP.WinForm.Forms.Operation
List list1 =
this.dgvPlan.DataSource as List;
var PbomItem = _agent.InvokeServiceFunction>(B9IPCService.PbomItemBLL_Get.ToString(), result.MATERIAL_CODE);
+
+ var bom = tBMat.Text.Substring(tBMat.Text.ToString().Length - 5, 5).Replace(" ","");
+ PbomItem = PbomItem.Where(p => p.PBOM_CODE.Contains(bom)).ToList();
var BomCodes = "";
if (PbomItem != null && PbomItem.Count > 0)
{
+
BomCodes = PbomItem[0].PBOM_CODE;
var SSS = _agent.InvokeServiceFunction(B9IPCService.PbomItemBLL_GetBom.ToString(), BomCodes);
@@ -819,17 +826,11 @@ namespace QMAPP.WinForm.Forms.Operation
#region 20220429 QDZhang BC316装车排序起始号记录
//if (result.Success)
- if (result.Actions.Count>0)
+ if (string.IsNullOrEmpty(_Line))
{
- if (fisPlanTable.Rows.Count > 0)
- {
- int initNo = 0;
- int.TryParse(fisPlanRow["No"].ToString(), out initNo);
- if (!cboxSort.Checked)
- initNo = 0;
- WorkOrderBLL.SaveStartIndex(initNo);
- }
+
}
+
#endregion
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index f948115..115d986 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -62,28 +62,28 @@
-
+
-
+ -->
-