1

wtt

11 小时以前 d82756d630f5f9bcc588fee772b68bc2a7725cb0

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -536,7 +536,7 @@
            foreach (Gy_RoutingBillSub oSub in DetailColl)
            {
                i++;
                if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配" && oSystemParameter.omodel.WMS_CampanyName != "添康科技" && oSystemParameter.omodel.WMS_CampanyName != "宝工")
                if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配" && oSystemParameter.omodel.WMS_CampanyName != "添康科技" && oSystemParameter.omodel.WMS_CampanyName != "宝工" && oSystemParameter.omodel.WMS_CampanyName != "三升")
                {
                    if (oSub.HWorkQty <= 0)
                    {
@@ -563,7 +563,7 @@
                    ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
                    ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                    ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HIsTime,HEstimate " +
                    ",HWorkTimes_S,HSortProcFlag,HSubStdEmpAvg_S" +
                    ",HWorkTimes_S,HSortProcFlag,HSubStdEmpAvg_S,HYDCoefficient" +
                    ") values("
                    + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                    "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -577,6 +577,7 @@
                   ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
                   "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HEstimate.ToString() +
                   ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) + "," + oSub.HSubStdEmpAvg_S +
                   "," + oSub.HYDCoefficient +
                    ") ");
                    //计价方式不为计时，则把计时暂估字段更新为空
                    if (oSub.HIsTime == false)
@@ -606,7 +607,7 @@
                    ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                    ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HEstimate,HIsTime" +
                    ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
                    ",HWorkTimes_S,HSortProcFlag,HSNCtrl,HQCFst,HQCProc,HQCPatrol,HMaterToSourceCtrl,HSubStdEmpAvg_S" +
                    ",HWorkTimes_S,HSortProcFlag,HSNCtrl,HQCFst,HQCProc,HQCPatrol,HMaterToSourceCtrl,HSubStdEmpAvg_S,HYDCoefficient" +
                    ") values("
                    + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                    "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -620,7 +621,7 @@
                   ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
                   "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HEstimate.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HQCSchemeID_Fst + "," +
                     oSub.HQCSchemeID_Proc + "," + oSub.HQCSchemeID_Patrol +
                   ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) + "," + Convert.ToString(oSub.HQCFst ? 1 : 0) + "," + Convert.ToString(oSub.HQCProc ? 1 : 0) + "," + Convert.ToString(oSub.HQCPatrol ? 1 : 0) + "," + Convert.ToString(oSub.HMaterToSourceCtrl ? 1 : 0) + "," + oSub.HSubStdEmpAvg_S +
                   ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) + "," + Convert.ToString(oSub.HQCFst ? 1 : 0) + "," + Convert.ToString(oSub.HQCProc ? 1 : 0) + "," + Convert.ToString(oSub.HQCPatrol ? 1 : 0) + "," + Convert.ToString(oSub.HMaterToSourceCtrl ? 1 : 0) + "," + oSub.HSubStdEmpAvg_S + "," + oSub.HYDCoefficient +
                    ") ");
                    //计价方式不为计时，则把计时暂估字段更新为空
                    if (oSub.HIsTime == false)
@@ -1821,7 +1822,7 @@
                {
                    for(int i=0;i< dsMain.Tables[0].Rows.Count; i++)
                    {
                        string HMaterNumber = DBUtility.ClsPub.isStrNull(dsMain.Tables[0].Rows[0]["产品代码"]);
                        string HMaterNumber = DBUtility.ClsPub.isStrNull(dsMain.Tables[0].Rows[i]["产品代码"]);
                        if (!oMaterHlp.GetInfoByNumber(HMaterNumber))
                        {
                            string sMsg = "物料【" + HMaterNumber + "】不存在！";
@@ -1909,14 +1910,14 @@
                        DataSet dsSub = oCN.RunProcReturn("select * from diyipi_WorkQty where 产品代码 = '" + HMaterNumber + "' order by 工序序号", "diyipi_WorkQty");
                        for(int j = 0; j < dsSub.Tables[0].Rows.Count; j++)
                        {
                            string HProcNumber = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["工序代码"]);
                            string HProcName = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["工序"]);
                            //得到工序内码
                            if (!oProcHlp.GetInfoByNumber(HProcNumber))
                            if (!oProcHlp.GetInfoByName(HProcName))
                            {
                                string sMsg = "工序【" + HProcNumber + "】不存在！";
                                string sMsg = "工序【" + HProcName + "】不存在！";
                                if (finalErrMsg.Contains(sMsg) == false)
                                {
                                    finalErrMsg = finalErrMsg + "工序【" + HProcNumber + "】不存在！\r\n";
                                    finalErrMsg = finalErrMsg + "工序【" + HProcName + "】不存在！\r\n";
                                }
                                continue;
                            }
@@ -1947,10 +1948,10 @@
                                    //得到生产资源内码
                                    if (!oSourceHlp.GetInfoByNumber(sHNumberSourceList[t]))
                                    {
                                        string sMsg = "生产资源【" + HProcNumber + "】不存在！";
                                        string sMsg = "生产资源【" + sHNumberSourceList[t] + "】不存在！";
                                        if (finalErrMsg.Contains(sMsg) == false)
                                        {
                                            finalErrMsg = finalErrMsg + "生产资源【" + HProcNumber + "】不存在！\r\n";
                                            finalErrMsg = finalErrMsg + "生产资源【" + sHNumberSourceList[t] + "】不存在！\r\n";
                                        }
                                        continue;
                                    }