乔一指引卡变更 帅威 计划平台功能优化

yangle

2023-09-19 ea64c8992b1345063f95e860fde9d7482150a89b

乔一指引卡变更
帅威 计划平台功能优化

 Model/Model.csproj

@@ -584,6 +584,7 @@
    <Compile Include="生产管理\模具管理\ClsSc_MouldStockBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipConkBookBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipConkBookBillSub.cs" />
    <Compile Include="质检管理\ClsSc_ProcessExchangeBillMain_Note.cs" />
    <Compile Include="质检管理\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
    <Compile Include="质检管理\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
    <Compile Include="质检管理\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />

 Model/Öʼì¹ÜÀí/ClsSc_ProcessExchangeBillMain_Note.cs

New file
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class Sc_ProcessExchangeBillMain_Note : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HSouceID_Original;
        public Int64 HSouceID_Now;
        public Int64 HICMOInterID;
        public String HICMOBillNo;
        public Int64 HProcExchInterID;
        public Int64 HProcExchEntryID;
        public String HProcExchBillNo;
        public Int64 HProcExchQty;
        public Int64 HMaterID;
        public String HBillNo_Note;
        public Int64 HICMOEntryID;
        public Int64 HUnitID;
        public Int64 HProcID;
        public Int64 HOrgID;

    }
}

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -1169,6 +1169,99 @@
        }
        #endregion

        #region æŒ‡å¼•å¡å˜æ›´å• æ–°å¢žä¿å­˜
        [Route("MES_Sc_ProcessExchangeBillMain_Note_PDA/ProcessExchangeBillMain_NoteAddBill")]
        [HttpPost]
        public object ProcessExchangeBillMain_NoteAddBill([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            try
            {
                //反序列化
                string msg2 = "[" + sArray[0].ToString() + "]";
                string user = sArray[1].ToString();//用户名
                string OperationType = sArray[2].ToString();//类型

                //判断是否有编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Change", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无变更权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                List<Model.Sc_ProcessExchangeBillMain_Note> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Sc_ProcessExchangeBillMain_Note>>(msg2);

                long HSouceID_Original = list[0].HSouceID_Original;
                long HSouceID_Now = list[0].HSouceID_Now;
                long HOrgID = list[0].HOrgID;//组织ID
                String HICMOBillNo = list[0].HICMOBillNo;//任务单
                long HICMOInterID = list[0].HICMOInterID;//任务单ID
                long HProcExchInterID = list[0].HProcExchInterID;
                long HProcExchEntryID = list[0].HProcExchEntryID;
                String HProcExchBillNo = list[0].HProcExchBillNo;
                String HBillNo_Note = list[0].HBillNo_Note;//指引卡
                long HMaterID = list[0].HMaterID;//产品ID
                long HUnitID = list[0].HUnitID;//计量单位
                long HProcID = list[0].HProcID;//工序ID
                string HMaker = user;//制单人
                string HMakeDate = list[0].HMakeDate;//制单日期

                //单据完整性判断
                if (HProcExchBillNo == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "流转卡没有选择！请扫描条形码或输入条形码后回车";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();
                if (OperationType == "1")
                {
                    oCN.RunProc("Insert Into Sc_ProcessExchangeBillMain_Note " +
                    "(HBillNo_Note,HSouceID_Original,HSouceID_Now,HOrgID,HICMOInterID,HICMOBillNo,HProcExchBillNo,HProcExchInterID" +
                    ",HProcExchEntryID,HMaterID,HUnitID,HProcID,HMaker,HMakeDate)" +
                    " values('" + HBillNo_Note + "','" + HSouceID_Original + "'," + HSouceID_Now + ",'" + HOrgID + "'," + HICMOInterID + ",'"+ HICMOBillNo + "','" + HProcExchBillNo + "' ," + HProcExchInterID + 
                    "," + HProcExchEntryID + ",'" + HMaterID + "','" + HUnitID + "'," + HProcID + ",'" + HMaker + "','" + HMakeDate + "')" );

                    oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSouceID_Now + " where HInterID=" + HProcExchInterID + " and HEntryID=" + HProcExchEntryID);
                }
                else
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作类型无效！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region å‡ºç«™æ±‡æŠ¥å•æ˜¾ç¤ºè¡¨ä½“明细
        [Route("Cj_StationEntrustInBill/DisBillEntryList")]

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -129,7 +129,7 @@

        public json AddBillMain(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string user = sArray[1].ToString();