11

APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs

@@ -1230,33 +1230,37 @@ namespace QMAPP.WinForm.Forms.TianJin
                         var mach = inputstring.Substring(4, inputstring.Length - 4);
                         var plan = new TJOrderPlan();
                        
-                        plan.PID = Guid.NewGuid().ToString();
                         plan.PLAN_DATE = DateTime.Now;
-                        plan.MATERIAL_CODE = mach;
-                        plan.QTY = defaultNum;
+                        plan.QTY = defaultNum/2;
                         if (mach.Substring(0, 3) == "770")
                             plan.LINENO = "770B";
                         else
                             plan.LINENO = "018D";
-
-                        foreach (var rule in _barcodeRules)
+                        foreach (var s in "F,R".Split(','))
                         {
-                            if (System.Text.RegularExpressions.Regex.IsMatch(mach+"1", rule.REGEX))
+                            plan.PID = Guid.NewGuid().ToString();
+
+                            plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + s + mach.Substring(mach.Length - 1,1);
+
+                            foreach (var rule in _barcodeRules)
                             {
-                                plan.MATERIAL_CODE = rule.MATERIAL_CODE;
+                                if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX))
+                                {
+                                    plan.MATERIAL_CODE = rule.MATERIAL_CODE;
 
+                                }
                             }
-                        }
 
-                        var list = agent.InvokeServiceFunction<List<Materiel>>("TJDoorPlankPlanBLL_GetListMachine", plan.MATERIAL_CODE);
-                        if (list != null)
-                            plan.MATERIAL_NAME = list[0].MATERIALNAME;
+                            //var list = agent.InvokeServiceFunction<List<Materiel>>("TJDoorPlankPlanBLL_GetListMachine", plan.MATERIAL_CODE);
+                            //if (list != null)
+                            //    plan.MATERIAL_NAME = list[0].MATERIALNAME;
 
-                        //QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
-                        var RESULT = agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Insert", plan);
-                        if (RESULT.IsSuccess == true)
-                        {
-                            agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_PutOut", plan.PID);
+                            //QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
+                            var RESULT = agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Insert", plan);
+                            if (RESULT.IsSuccess == true)
+                            {
+                                agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_PutOut", plan.PID);
+                            }
                         }
                         return;
                     }

APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2022.08.09.01")]
-[assembly: AssemblyFileVersion("2022.08.09.01")]
+[assembly: AssemblyVersion("2022.08.10.01")]
+[assembly: AssemblyFileVersion("2022.08.10.01")]