WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -10,6 +10,7 @@
using System.Web.Http;
using WebAPI.Models;
using Model;
using WebAPI.Utility;
namespace WebAPI.Controllers
{
@@ -219,6 +220,15 @@
                    sBillBarCode = NewBarCode[0];
                }
                string sBillNo = sBillBarCode;
                //截取条码类型 前两位
                string BillNoType1 = sBillNo.Substring(0, Math.Min(2, sBillNo.Length));
                switch (BillNoType1)
                {
                    case "OP"://流转卡
                        //同步工序流转卡
                        oCN.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_ProcExchAndRouting '" + sBillNo + "'");
                        break;
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + sBillNo + "'", "h_v_Sc_ProcessExchangeBillList");
                //写入信息
@@ -980,6 +990,7 @@
        #region  试样记录 查询列表
        [Route("MES_SampleRecordBill_PDA/SampleRecordList")]
        [HttpGet]
        [Permission(HModName = "QC_TestSampleCheckBill", Operate = "_Query")]
        public object SampleRecordList(string sWhere,string user)
        {
            try
@@ -1031,6 +1042,7 @@
        #region 试样记录新增保存
        [Route("MES_SampleRecordBill_PDA/SampleRecordAddBill")]
        [HttpPost]
        [Permission(HModName = "QC_TestSampleCheckBill", Operate = "_Edit")]
        public object SampleRecordAddBill([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
@@ -1141,6 +1153,7 @@
        #region 试样记录 审核/反审核功能
        [Route("MES_SampleRecordBill_PDA/CheckSampleRecordBill")]
        [HttpGet]
        [Permission(HModName = "QC_TestSampleCheckBill", Operate = "_Check")]
        public object CheckSampleRecordBill(string HInterID, int Type, string user)
        {
            try
@@ -1233,6 +1246,7 @@
        #region 试样记录 删除功能
        [Route("MES_SampleRecordBill_PDA/DelSampleRecordBill")]
        [HttpGet]
        [Permission(HModName = "QC_TestSampleCheckBill", Operate = "_Detete")]
        public object DelSampleRecordBill(Int64 lngBillKey, string user)
        {
            DataSet ds;
@@ -1878,6 +1892,7 @@
        #region 指引卡变更单 新增保存
        [Route("MES_Sc_ProcessExchangeBillMain_Note_PDA/ProcessExchangeBillMain_NoteAddBill")]
        [HttpPost]
        [Permission(HModName = "Sc_ProcessExchangeBill_Change")]
        public object ProcessExchangeBillMain_NoteAddBill([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
@@ -3479,7 +3494,7 @@
                "\"FOutPurOrgId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOutPurOrgId"]) + "\" }," +
                "\"FInProOrgId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInProOrgId"]) + "\" }," +
                "\"FInOPBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInOPBillNo"]) + "\"," +
                "\"FOutSupplier\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOutSupplier"]) + "\" }," +
                "\"FOutSupplier\":{ \"FNAME\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOutSupplier"]) + "\" }," +
                "\"FOutOperId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOutOperId"]) + "\"," +
                "\"FInProcessId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInProcessId"]) + "\" }," +
                "\"FInDeptId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInDeptId"]) + "\" }," +
@@ -3852,7 +3867,7 @@
                "\"FOutPurOrgId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOutPurOrgId"]) + "\" }," +
                "\"FInProOrgId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInProOrgId"]) + "\" }," +
                "\"FInOPBillNo\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInOPBillNo"]) + "\"," +
                "\"FOutSupplier\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOutSupplier"]) + "\" }," +
                "\"FOutSupplier\":{ \"FNAME\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOutSupplier"]) + "\" }," +
                "\"FOutOperId\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FOutOperId"]) + "\"," +
                "\"FInProcessId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInProcessId"]) + "\" }," +
                "\"FInDeptId\":{ \"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["FInDeptId"]) + "\" }," +