Merge branch 'master' of http://deiniusoft.com:3000/root/ldj

WcfService1/BLL/lWmsOutPickPort.cs

@@ -1463,12 +1463,12 @@ namespace DeiNiu.wms.Logical
             /// <param name="toFlowNo">周转箱号</param>
             /// <returns></returns>
             internal enumRepResult seedsPickOut(string flowNo,int skuId,string productDate, string batch, int outDetailId,
-            decimal seedCnt, string toFlowNo,int inDetailId, bool isForceClose)
+            decimal seedCnt, string toFlowNo,int inDetailId, bool isForceClose, int lightOperid=0)
         {
-              logTest.Debug(string.Format("  flowNo:{0} ，batch :{1} , outDetailId:{2} , seedsCnt:{3}, toFlowNo {4} ",  flowNo, batch ,outDetailId, seedCnt,toFlowNo));
+              logTest.Debug(string.Format("  flowNo:{0} ，batch :{1} , outDetailId:{2} , seedsCnt:{3}, toFlowNo {4} , lightOperid {5}",  flowNo, batch ,outDetailId, seedCnt,toFlowNo, lightOperid));
             //  WmsOutDetail wod = new WmsOutDetail(outDetailId);
             //   WmsOutRequest wor = new WmsOutRequest(wod.orderNo);
-
+            this.operId = lightOperid;
 
             bool isZhitongSeed = inDetailId > 0;
 

WcfService1/IWmsOutPickRequest.cs

@@ -220,7 +220,7 @@ namespace DeiNiu.Wcf
 
 
         [OperationContract]
-        enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose);
+        enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose, int userId);
     
     
     

WcfService1/WmsOutPickRequestService.svc.cs

@@ -627,9 +627,11 @@ namespace DeiNiu.Wcf
             return lopp.prePareLightSeeds(deskId, flowno, barcode, userId, isValid);
         }
 
-       public enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose)
+       public enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose,int userId)
         {
-            return lopp.seedsPickOut(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose);
+            if(userId>0)  lopp.operId = userId;
+
+            return lopp.seedsPickOut(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose,userId);
         }
     }
 }

deiniuWMS.sln

@@ -110,6 +110,11 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "view", "view\", "{8288A0EA-
 		SlnRelativePath = "view\"
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{0733D196-F4F2-4152-ADFA-3903E897C0C6}"
+	ProjectSection(SolutionItems) = preProject
+		得牛WMS.pptx = 得牛WMS.pptx
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -475,7 +480,7 @@ Global
 		{8288A0EA-E086-4EB8-AD75-D4038F5E5243} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		VisualSVNWorkingCopyRoot = .
 		SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A}
+		VisualSVNWorkingCopyRoot = .
 	EndGlobalSection
 EndGlobal

winform/Service References/ServiceReferenceStockOutPickRequest/Reference.cs

@@ -266,7 +266,7 @@ namespace DeiNiu.wms.win.ServiceReferenceStockOutPickRequest {
         System.Data.DataTable getLightTasks(string query, int wareHouse, int partion, int lineId, int state, string date, bool isLight);
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWmsOutPickRequest/seedsPickOut2", ReplyAction="http://tempuri.org/IWmsOutPickRequest/seedsPickOut2Response")]
-        DeiNiu.Utils.enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose);
+        DeiNiu.Utils.enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose, int userId);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -628,8 +628,8 @@ namespace DeiNiu.wms.win.ServiceReferenceStockOutPickRequest {
             return base.Channel.getLightTasks(query, wareHouse, partion, lineId, state, date, isLight);
         }
         
-        public DeiNiu.Utils.enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose) {
+        public DeiNiu.Utils.enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose, int userId) {
-            return base.Channel.seedsPickOut2(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose);
+            return base.Channel.seedsPickOut2(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose, userId);
         }
     }
 }

winform/Service References/ServiceReferenceStockOutPickRequest/WmsOutPickRequestService65.xsd

@@ -1845,6 +1845,7 @@
         <xs:element minOccurs="0" name="toFlowNo" nillable="true" type="xs:string" />
         <xs:element minOccurs="0" name="inDetailId" type="xs:int" />
         <xs:element minOccurs="0" name="isForceClose" type="xs:boolean" />
+        <xs:element minOccurs="0" name="userId" type="xs:int" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>

winform/epick/SeedsOutService.cs

@@ -834,7 +834,7 @@ namespace DeiNiu.wms.win
             }
 
             int  order = port;
-            enumLabelPickType pickType = enumLabelPickType.seed; 
+            enumLabelPickType pickType = enumLabelPickType.seedsDesk; 
             
           
            if (port == 0)//一次分播
@@ -849,7 +849,7 @@ namespace DeiNiu.wms.win
 #if DEBUG
           //  port = 17;
 #endif
-          //  int order =getOrder(port);
+            //  order =getOrder(port);
           
              
             elelab.pick.init_port(pickType);
@@ -860,14 +860,14 @@ namespace DeiNiu.wms.win
             {
                 this.Invoke(new showStatus(delegate ()
                 {
-                    startQuery();
+                    //startQuery();
                 }));
 
             }
             else
             {
 
-                startQuery();
+                //startQuery();
             }
             /*
             if (elelab.pick.activeComports.Count == 0)

winform/epick/elelable/pick.cs

@@ -623,9 +623,9 @@ namespace elelab
                
                  SeedsLabel lb = currentElables[orderId][lableId];
 
-                LogHelper.debug(typeof(pick), string.Format(" .........deskId {0}, lable id {1} , trying to update db, userId is  ", lb.deskId,lableId, userId));
+                LogHelper.debug(typeof(pick), string.Format(" .........deskId {0}, lable id {1} , trying to update db, userId is {2} ", lb.deskId,lableId, lb.userId));
 
-                enumRepResult rs = client.seedsPickOut2(lb.flowNo,lb.skuId,lb.productDate,lb.batch,lb.outDetailId,lb.count,lb.toFlowNo,lb.inDetailId,false);//本次拣选完毕
+                enumRepResult rs = client.seedsPickOut2(lb.flowNo,lb.skuId,lb.productDate,lb.batch,lb.outDetailId,lb.count,lb.toFlowNo,lb.inDetailId,false, lb.userId);//本次拣选完毕
                 LogHelper.debug(typeof(pick), string.Format(" ......... update result {0}", rs ));
 
                 isOkay = rs == enumRepResult.成功;
@@ -904,7 +904,7 @@ namespace elelab
 
              if (!clearOrder(orderPort, orderId))
              {
-                 return false;
+                // return false;
              }
 
              unart_manage.com_manage[orderPort].write_data(ele_data_comment);

winform/epick/wcf/ServiceLight.cs

@@ -202,6 +202,7 @@ namespace DeiNiu.wms.win.epick
                         el.inDetailId = Convert.ToInt32(dr["inDetailId"].ToString());
                         el.userId = userId;
                         el.isValid = isValid;
+                        el.name = dr["goodsName"].ToString();
                         els.Add(el);
                     }
 

winform/wms.csproj

@@ -29,7 +29,7 @@
     <PublisherName>得牛软件</PublisherName>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>336</ApplicationRevision>
+    <ApplicationRevision>340</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>