yxj
2023-12-05 6d9a7e0caaab8fd38f445bfacb3ee044bdfe42f8
工艺路线新增模块,子表增加产品单件工时HWorkTimes_S字段
6个文件已修改
48 ■■■■■ 已修改文件
DAL/计划管理/ClsGy_RoutingBill.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/计划管理/ClsGy_RoutingBillSub.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/计划管理/Gy_RoutingBill.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/Gy_RoutingBillSub.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/¼Æ»®¹ÜÀí/ClsGy_RoutingBill.cs
@@ -92,7 +92,7 @@
                      ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
                      ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
                      ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                      ",HOverRate" +
                      ",HOverRate,HWorkTimes_S" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HProcNo.ToString() + "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                      "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -104,7 +104,7 @@
                     "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + "," + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
                     ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() + 
                     ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
                     "', " + oSub.HOverRate.ToString() +
                     "', " + oSub.HOverRate.ToString() + "," + oSub.HWorkTimes_S.ToString() +
                      ") ");
                }
                //
@@ -226,7 +226,7 @@
                      ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
                      ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
                      ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                      ",HOverRate,HProcWorkNum" +
                      ",HOverRate,HProcWorkNum,HWorkTimes_S" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HProcNo.ToString() + "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                      "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -238,7 +238,7 @@
                     "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
                     ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
                     ",'"+ oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
                     "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
                     "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HWorkTimes_S.ToString() +
                      ") ");
                }
                //
@@ -405,6 +405,7 @@
                    oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
                    oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
                    oSub.HOverRate = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HOverRate"]);
                    oSub.HWorkTimes_S = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HWorkTimes_S"]);
                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功!";
Model/¼Æ»®¹ÜÀí/ClsGy_RoutingBillSub.cs
@@ -63,6 +63,7 @@
        public string HPicNum = "";        // varchar(200)  å›¾çº¸ç¼–号
        public string HProcCheckNote = "";        // varchar(2000)  æœ¬å·¥åºç¡®è®¤è®°å½•
        public string HProcWorkNum = "";        // varchar(100)  ç¨‹åºå·
        public double HWorkTimes_S;     //产品单件工时
    }
}
PlanM/¼Æ»®¹ÜÀí/Gy_RoutingBill.cs
@@ -82,16 +82,17 @@
        public const Int16 HSumPassRateCol = 52;
        public const Int16 HRemarkCol = 53;
        public const Int16 HSourceInterIDCol = 53;
        public const Int16 HSourceEntryIDCol = 54;
        public const Int16 HSourceBillNoCol = 55;
        public const Int16 HSourceBillTypeCol = 56;
        public const Int16 HRelationQtyCol = 57;
        public const Int16 HRelationMoneyCol = 58;
        public const Int16 HTechnologyParameterCol = 59;
        public const Int16 HPicNumCol = 60;
        public const Int16 HProcCheckNoteCol = 61;
        public const Int16 HProcWorkNumCol = 62;
        public const Int16 HSourceInterIDCol = 54;
        public const Int16 HSourceEntryIDCol = 55;
        public const Int16 HSourceBillNoCol = 56;
        public const Int16 HSourceBillTypeCol = 57;
        public const Int16 HRelationQtyCol = 58;
        public const Int16 HRelationMoneyCol = 59;
        public const Int16 HTechnologyParameterCol = 60;
        public const Int16 HPicNumCol = 61;
        public const Int16 HProcCheckNoteCol = 62;
        public const Int16 HProcWorkNumCol = 63;
        public const Int16 HWorkTimes_SCol = 64;
        //
        public  string ModName = "3301";
@@ -1111,6 +1112,7 @@
                grdMain.Rows[i].Cells[HPassRateCol].Value = oSub.HPassRate.ToString();
                grdMain.Rows[i].Cells[HSumPassRateCol].Value = oSub.HSumPassRate.ToString();
                grdMain.Rows[i].Cells[HOverRateCol].Value = oSub.HOverRate.ToString();
                grdMain.Rows[i].Cells[HWorkTimes_SCol].Value = oSub.HWorkTimes_S.ToString();
                //下道流转工序
                grdMain.Rows[i].Cells[HNextProcFlagCol].Value = DBUtility.ClsPub.isBool(oSub.HNextProcFlag);
                grdMain.Rows[i].Cells[HFlowProcCol].Value = DBUtility.ClsPub.isBool(oSub.HFlowProc);
@@ -1351,6 +1353,7 @@
                    oSub.HStdFlag = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HStdFlagCol].Value);
                    oSub.HAutoTrunFlag = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HAutoTrunFlagCol].Value);
                    oSub.HProcType = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcTypeCol].Value);
                    oSub.HWorkTimes_S = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells[HWorkTimes_SCol].Value);
                    oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
                    if (DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value) > 0)
@@ -1425,7 +1428,7 @@
        private void initGrid()
        {
            //
            grdMain.ColumnCount = 63;                       //总列数
            grdMain.ColumnCount = 65;                       //总列数
            DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
            //
            grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True;
@@ -1489,6 +1492,7 @@
            grdMain.Columns[HNextProcFlagCol].HeaderText = "下道流转工序";
            grdMain.Columns[HFlowProcCol].HeaderText = "流转工序";
            grdMain.Columns[HOverRateCol].HeaderText = "超额比例";
            grdMain.Columns[HWorkTimes_SCol].HeaderText = "产品单件工时";
            ////固定赋值=====================================================
            grdMain.Columns[HSnoCol].HeaderText = "序号";
            grdMain.Columns[HRemarkCol].HeaderText = "备注";
@@ -1555,7 +1559,8 @@
                            "," + HRemarkCol.ToString() +
                            "," + HTechnologyParameterCol.ToString() +
                             "," + HPicNumCol.ToString() +
                             "," + HProcCheckNoteCol.ToString()+
                             "," + HProcCheckNoteCol.ToString() +
                             "," + HWorkTimes_SCol.ToString() +
                            "," + HOverRateCol.ToString();
            //设置合计列
            string sTotalCol = HTimeUnitCol.ToString();
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -430,6 +430,7 @@
                    ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
                    ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                    ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HIsTime,HEstimate " +
                    ",HWorkTimes_S " +
                    ") 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() +
@@ -442,6 +443,7 @@
                   ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
                   ",'" + 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() +
                    ") ");
                    //计价方式不为计时,则把计时暂估字段更新为空
                    if (oSub.HIsTime == false)
@@ -471,6 +473,7 @@
                    ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                    ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HEstimate,HIsTime" +
                    ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
                    ",HWorkTimes_S " +
                    ") 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() +
@@ -484,6 +487,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() +
                    ") ");
                    //计价方式不为计时,则把计时暂估字段更新为空
                    if (oSub.HIsTime == false)
WebAPI/Models/Gy_RoutingBillSub.cs
@@ -64,6 +64,7 @@
        public string HPicNum = "";        // varchar(200)  å›¾çº¸ç¼–号
        public string HProcCheckNote = "";        // varchar(2000)  æœ¬å·¥åºç¡®è®¤è®°å½•
        public string HProcWorkNum = "";        // varchar(100)  ç¨‹åºå·
        public double HWorkTimes_S;     //产品单件工时
        //瑞琪新加字段
        public int HBadWHID { get; set; }  //不良品仓
WebAPI/Web.config
@@ -104,7 +104,7 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
            <endpoint address="http://192.168.63.20/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
     bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
     name="WebService1Soap" />
        </client>
@@ -113,7 +113,7 @@
 <applicationSettings>
  <WebAPI.Properties.Settings>
   <setting name="WebAPI_WebS_WebService1" serializeAs="String">
    <value>http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx</value>
    <value>http://192.168.63.20/WEBS-WMS/WebService1.asmx</value>
   </setting>
  </WebAPI.Properties.Settings>
 </applicationSettings>