Merge branch 'master' of http://git.dongkesoft.com:9001/hg5020/dk.hg5020.wcf

DK.Service/PCModuleService/FinishedCheckLogic.cs

@@ -3518,10 +3518,10 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                 result = oracleTrConn.ExecuteNonQuery(sql, paras);
 
                 // 失败
-                if (result == Constant.INT_IS_ZERO)
-                {
-                    return string.Format(Messages.MSG_CMN_W007, "生产工号[" + workUserCode + "]没有配置生产员工");
-                }
+                //if (result == Constant.INT_IS_ZERO)
+                //{
+                //    return string.Format(Messages.MSG_CMN_W007, "生产工号[" + workUserCode + "]没有配置生产员工");
+                //}
 
                 #endregion
             }
@@ -6779,6 +6779,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                 // 没有错误 提交事务
                 if (string.IsNullOrEmpty(errMsg))
                 {
+                    sre.Result = 1;
                     oracleTrConn.Commit();
                 }
             }
@@ -10045,7 +10046,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                     for (int i = 0; i < bomDetailTable.Rows.Count; i++)
 					{
                         //单报损（只插入报损表，原材料表不动）
-                        if (Convert.ToBoolean(bomDetailTable.Rows[i]["FrmLossCheck"]))
+                        if (bomDetailTable.Rows[i]["FrmLossCheck"] + "" == "1")
 						{
 
                             #region SQL
@@ -10090,7 +10091,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                             #region OracleParameter
                             OracleParameter[] paras = new OracleParameter[] {
                                 new OracleParameter(":SCRAPTYPE","1"),
-                                new OracleParameter(":BARCODE",bomDetailTable.Rows[i]["BARCODE"]+""),
+                                new OracleParameter(":BARCODE",productionData.Barcode),
                                 new OracleParameter(":MATNR",bomDetailTable.Rows[i]["MATNR"]+""),
                                 new OracleParameter(":IDNRK",bomDetailTable.Rows[i]["IDNRK"]+""),
                                 new OracleParameter(":MEINS",bomDetailTable.Rows[i]["MEINS"]+""),
@@ -10112,7 +10113,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
 
                         }
                         //回收(删除原材料表中对应的组件，报损表不动)
-                        else if (Convert.ToBoolean(bomDetailTable.Rows[i]["RecoverCheck"]))
+                        else if (bomDetailTable.Rows[i]["RecoverCheck"] + "" == "1")
                         {
                             string sqlString =
                                    "UPDATE TP_PM_BARCODEIDNRKREL t\n" +
@@ -10123,7 +10124,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
 
                         }
                         //报损并换新（更新原材料表（新编码），旧编码插入报损表）
-                        else if (Convert.ToBoolean(bomDetailTable.Rows[i]["NewCheck"]))
+                        else if (bomDetailTable.Rows[i]["NewCheck"] + "" == "1")
                         {
                             string sqlString = string.Empty;
                            int result = 0;
@@ -10180,7 +10181,7 @@ namespace Dongke.IBOSS.PRD.Service.PCModuleService
                             #region OracleParameter
                             OracleParameter[] paras = new OracleParameter[] {
                                 new OracleParameter(":SCRAPTYPE","1"),
-                                new OracleParameter(":BARCODE",bomDetailTable.Rows[i]["BARCODE"]+""),
+                                new OracleParameter(":BARCODE",productionData.Barcode),
                                 new OracleParameter(":MATNR",bomDetailTable.Rows[i]["MATNR"]+""),
                                 new OracleParameter(":IDNRK",bomDetailTable.Rows[i]["IDNRK"]+""),
                                 new OracleParameter(":MEINS",bomDetailTable.Rows[i]["MEINS"]+""),

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -10630,6 +10630,40 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 
                 if (productionData.IdnrkScrapList != null)
                 {
+                    //取大件小件-》成本中心
+                    string costcenter = string.Empty;
+                    string costcenterName = string.Empty;
+                    string sqlStrings = @"
+                    SELECT SUBSTR(GT.GOODSTYPECODE, 0, 6) AS GOODSTYPECODE
+                      FROM TP_PM_GROUTINGDAILYDETAIL GDD
+                     INNER JOIN TP_MST_GOODS G
+                        ON G.GOODSID = GDD.GOODSID
+                     INNER JOIN TP_MST_GOODSTYPE GT
+                        ON GT.GOODSTYPEID = G.GOODSTYPEID
+                     WHERE BARCODE = :BARCODE ";
+
+                    OracleParameter[] parmetersSql = new OracleParameter[]
+                    {
+                        new OracleParameter(":BARCODE", OracleDbType.NVarchar2,  productionData.Barcode, ParameterDirection.Input),
+                    };
+                    DataTable dtGoodsTypeCode = oracleTrConn.GetSqlResultToDt(sqlStrings, parmetersSql);
+
+                    if (dtGoodsTypeCode.Rows.Count > 0)
+                    {
+                        //大件
+                        if (dtGoodsTypeCode.Rows[0]["GOODSTYPECODE"] + "" == "001001")
+                        {
+                            costcenter = "5000600206";
+                            costcenterName = "成检部-一科（大件）";
+                        }
+                        else if (dtGoodsTypeCode.Rows[0]["GOODSTYPECODE"] + "" == "001002")
+                        {
+                            //小件
+                            costcenter = "5000600106";
+                            costcenterName = "成检部-一科（小件）";
+                        }
+                    }
+
                     string barcodeidnrkscrap = @"
                     INSERT INTO TP_PM_BARCODEIDNRKSCRAP
                         (PROCEDUREID,
@@ -10643,6 +10677,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                          CHARG,
                          LGORT,
                          ACCOUNTID,
+                         COSTCENTER,
+                         COSTCENTERNAME,
                          CREATEUSERID,
                          UPDATEUSERID)
                     VALUES
@@ -10657,6 +10693,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                          :CHARG,
                          :LGORT,
                          :ACCOUNTID,
+                         :COSTCENTER,
+                         :COSTCENTERNAME,
                          :USERID,
                          :USERID) ";
 
@@ -10675,6 +10713,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                             new OracleParameter(":IDNRKONLYCODE", entity.IDNRKONLYCODE),
                             new OracleParameter(":CHARG", entity.CHARG),
                             new OracleParameter(":LGORT", entity.LGORT),
+                            new OracleParameter(":COSTCENTER", costcenter),
+                            new OracleParameter(":COSTCENTERNAME", costcenterName),
                             new OracleParameter(":ACCOUNTID", sUserInfo.AccountID),
                             new OracleParameter(":USERID", sUserInfo.UserID)
                         });

WCF.Service/WCF.WebHosting/Web.config

@@ -92,11 +92,14 @@
         </binding>
       </customBinding>
 
-	    <!--HEGII WMS系统同步-->
-	    <basicHttpBinding>
-		    <binding name="CERPWSService2ServiceSoapBinding_TEST" />
-		    <binding name="CERPWSService2ServiceSoapBinding" />
-	    </basicHttpBinding>
+		<basicHttpBinding>
+			<!--HEGII WMS系统同步-->
+			<binding name="CERPWSService2ServiceSoapBinding_TEST" />
+			<binding name="CERPWSService2ServiceSoapBinding" />
+
+			<!--HEGII BPM系统同步-->
+			<binding name="ProcessServiceSoap" />
+		</basicHttpBinding>
     </bindings>
     <services>
       <!--xuwei add 2019-10-22-->
@@ -210,6 +213,9 @@
         bindingConfiguration="CERPWSService2ServiceSoapBinding_TEST" contract="WMS_putBARCODEData.IERPWSService2" name="CERPWSService2Port_TEST" />
 	  <endpoint address="http://wms.hegii.com:18080/datahubWeb/WMSSOAP" binding="basicHttpBinding" 
         bindingConfiguration="CERPWSService2ServiceSoapBinding" contract="WMS_putBARCODEData.IERPWSService2" name="CERPWSService2Port" />
+		
+	  <endpoint address="http://bpmtest.hegii.com:8010/Hegii.BPMWebService.WorkFlowProcess.asmx" binding="basicHttpBinding" 
+	    bindingConfiguration="ProcessServiceSoap" contract="BPMWebService.ProcessServiceSoap" name="ProcessServiceSoap" />
     </client>-->
     <!--HEGII SAP同步 测试 230-->
     <!--<client>