zgq
2021-04-09 b2c7f60a602414e506fee1b4b125322e745676b2
委外工序-保存方法
4个文件已修改
153 ■■■■■ 已修改文件
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs 96 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/StationEntrustInBill.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/API.pubxml.user 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -140,46 +140,46 @@
                msg1 = "[" + msg1.ToString() + "]";
                List<StationEntrustInBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationEntrustInBill>>(msg1);
                var HInterID = list[0].HInterID;//递入type得到的单据ID
                var HYear = 2021;
                var HPeriod = list[0].HPeriod;//单价
                var HBillNo = list[0].HBillNo;//递入type得到的单据号
                var HBillStatus = 0;
                var HInnerBillNo = list[0].HInnerBillNo;//送货单号
                var HICMOBillNo = list[0].HICMOBillNo;//生产订单号
                long HICMOInterID = DBUtility.ClsPub.isLong(list[0].HICMOInterID);//生产订单号ID
                var HProcExchInterID = 0;
                var HProcExchEntryID = 0;
                var HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
                var HProcID = list[0].HProcID;//当前工序
                var HMaterID = list[0].HMaterID;//产品ID
                var HStationInTime = list[0].HStationInTime;//
                var HEmpID = list[0].HEmpID;//操作员ID
                var HSourceID = list[0].HSourceID;//生产资源ID
                var HGroupID = list[0].HGroupID;//班组ID
                var HICMOQty = list[0].HICMOQty;//任务单数量
                var HPlanQty = list[0].HPlanQty;//流转卡数量
                var HQty = list[0].HQty;//发出数量
                var HSupID = list[0].HSupID;//供应商ID
                var HPieceQty = list[0].HPieceQty;//发出件数
                var HSourceName = list[0].HSourceName;//
                var HPrice = list[0].HPrice;//单价
                var HMoney = list[0].HMoney;//金额
                var HRemark = list[0].HRemark;//备注
                var HTaxRate = list[0].HTaxRate;//税率
                var HProcNo = list[0].HProcNo;//流水号
                var HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                var HWWWorkOrderInterID = 0;//委外工单号子内码
                var HWWWorkOrderEntryID = 0;//委外工单号主内吗
                var HWWWorkOrderBillNo = list[0].HWWWorkOrderBillNo;//委外工单号
                var HMaker = list[0].HMaker;//制单人
                var HProcPlanInterID = 0;
                var HProcPlanEntryID = 0;
                var HProcPlanBillNo = "";
                var HDeptID = list[0].HDeptID;//部门ID
                var HBarCode = list[0].HBarCode;//条形码
                var HAddr = "";
                var HBarCodeMaker = "";
                long HInterID = list[0].HInterID;//递入type得到的单据ID
                int HYear = 2021;
                double HPeriod = list[0].HPeriod;//单价
                string HBillNo = list[0].HBillNo;//递入type得到的单据号
                int HBillStatus = 0;
                string HInnerBillNo = list[0].HInnerBillNo;//送货单号
                string HICMOBillNo = list[0].HICMOBillNo;//生产订单号
                long HICMOInterID = list[0].HICMOInterID;//生产订单号ID
                int HProcExchInterID = 0;
                int HProcExchEntryID = 0;
                string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
                long HProcID = list[0].HProcID;//当前工序
                long HMaterID = list[0].HMaterID;//产品ID
                DateTime HStationInTime = list[0].HStationInTime;//
                long HEmpID = list[0].HEmpID;//操作员ID
                long HSourceID = list[0].HSourceID;//生产资源ID
                long HGroupID = list[0].HGroupID;//班组ID
                double HICMOQty = list[0].HICMOQty;//任务单数量
                double HPlanQty = list[0].HPlanQty;//流转卡数量
                double HQty = list[0].HQty;//发出数量
                long HSupID = list[0].HSupID;//供应商ID
                double HPieceQty = list[0].HPieceQty;//发出件数
                string HSourceName = list[0].HSourceName;//
                double HPrice = list[0].HPrice;//单价
                double HMoney = list[0].HMoney;//金额
                string HRemark = list[0].HRemark;//备注
                double HTaxRate = list[0].HTaxRate;//税率
                string HProcNo = list[0].HProcNo;//流水号
                string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                int HWWWorkOrderInterID = 0;//委外工单号子内码
                int HWWWorkOrderEntryID = 0;//委外工单号主内吗
                string HWWWorkOrderBillNo = list[0].HWWWorkOrderBillNo;//委外工单号
                string HMaker = list[0].HMaker;//制单人
                int HProcPlanInterID = 0;
                int HProcPlanEntryID = 0;
                string HProcPlanBillNo = "";
                long HDeptID = list[0].HDeptID;//部门ID
                string HBarCode = list[0].HBarCode;//条形码
                string HAddr = "";
                string HBarCodeMaker = "";
                //若MAINDI重复则重新获取
                oCN.BeginTran();
@@ -193,15 +193,15 @@
                ",HSupID,HTaxRate,HQty,HPrice,HMoney,HPieceQty" +
                ",HProcNo,HOrderProcNO,HWWWorkOrderBillNo,HWWWorkOrderInterID,HWWWorkOrderEntryID" +
                ") " +
                " values('3792','3792'," + HInterID.ToString() + ",'" + HBillNo + "'," + HBillStatus.ToString() + ",getdate(),'" + HMaker + "',getdate()" +
                "," + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "','" + HInnerBillNo + "'" +
                "," + HICMOInterID.ToString() + ",'" + HICMOBillNo + "'," + HProcPlanInterID.ToString() + "," + HProcPlanEntryID.ToString() + ",'" + HProcPlanBillNo + "'," + HProcExchInterID.ToString() + "," + HProcExchEntryID.ToString() +
                ",'" + HProcExchBillNo + "'," + HMaterID.ToString() + "," + HProcID.ToString() + "," + HICMOQty.ToString() + "," + HPlanQty.ToString() + ",getdate()," + HSourceID.ToString() +
                "," + HGroupID.ToString() + "," + HDeptID.ToString() + "," + HEmpID.ToString() + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
                "," + HSupID.ToString() + "," + HTaxRate.ToString() + "," + HQty.ToString() + "," + HPrice.ToString() + "," + HMoney.ToString() + "," + HPieceQty.ToString() +
                "," + HProcNo.ToString() + ",'" + HOrderProcNO.ToString() + "'" + ",'" + HWWWorkOrderBillNo.ToString() + "'" + "," + HWWWorkOrderInterID.ToString() + "" + "," + HWWWorkOrderEntryID.ToString() + "" +
                " values('3792','3792'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillStatus.ToString() + "',getdate(),'" + HMaker + "',getdate()" +
                ",'" + HYear.ToString() + "','" + HPeriod.ToString() + "','" + HRemark + "','" + HInnerBillNo + "'" +
                "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
                ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
                "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
                "," + HSupID + "," + HTaxRate + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty +
                ",'" + HProcNo + "','" + HOrderProcNO + "'" + ",'" + HWWWorkOrderBillNo + "'" + "," + HWWWorkOrderInterID + "" + "," + HWWWorkOrderEntryID + "" +
              ") ");
                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID.ToString() + "", "h_p_MES_StationInBill_QtyCtrl");
                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
                if (ds == null)
                {
                    oCN.RollBack();
WebAPI/Controllers/WebAPIController.cs
@@ -855,6 +855,55 @@
        }
        /// <summary>
        /// 获取工序列表
        /// <summary>
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Web/GetProcList_Json")]
        [HttpGet]
        public object GetProcList_Json(string sWhere)
        {
            DataSet ds;
            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (sWhere != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("Select HItemID,HNumber 工序代码,HName 工序 from Gy_Process where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Process");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// 获取当前数据库名
        /// </summary>
        /// <returns></returns>
WebAPI/Models/StationEntrustInBill.cs
@@ -32,7 +32,7 @@
        public double HPrice { get; set; }
        public double HMoney { get; set; }
        public string HRemark { get; set; }
        public string HTaxRate { get; set; }
        public double HTaxRate { get; set; }
        public string HProcNo { get; set; }
        public string HOrderProcNO { get; set; }
        public long HWWWorkOrderInterID { get; set; }
WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -163,10 +163,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>04/08/2021 08:55:08</publishTime>
      <publishTime>04/08/2021 15:31:05</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>04/08/2021 08:55:08</publishTime>
      <publishTime>04/08/2021 15:31:05</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2021 21:35:21</publishTime>
@@ -340,7 +340,7 @@
      <publishTime>02/22/2021 09:25:20</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/08/2021 08:55:12</publishTime>
      <publishTime>04/08/2021 15:31:28</publishTime>
    </File>
  </ItemGroup>
</Project>