Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2023-03-23 152a02e90a7da2d431d2ea75499c1d07ef495e1b

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs

@@ -9,6 +9,7 @@
    {
        public Model.ClsSc_ProcessExchangeBillMain omodel = new Model.ClsSc_ProcessExchangeBillMain();
        public List<Model.ClsSc_ProcessExchangeBillSub> DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        public ClsSc_ProcessExchangeBill()
        {
@@ -400,6 +401,37 @@

                sErr = sErr + "7;";

                //工序流转卡保存时自动同步条码信息至条码档案(Y è‡ªåŠ¨åŒæ­¥)
                //获取系统参数
                string sErrMsg = "";
                if (oSystemParameter.ShowBillByOrgID(omodel.HPRDORGID, ref sErrMsg) == true)
                {
                    if (oSystemParameter.omodel.Sc_ProcessExchangeBill_AutoBarCode == "Y") //系统参数  å·¥åºæµè½¬å¡ä¿å­˜æ—¶è‡ªåŠ¨åŒæ­¥æ¡ç ä¿¡æ¯è‡³æ¡ç æ¡£æ¡ˆ
                    {
                        oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
                            ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
                            ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
                            ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
                            ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag" +
                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
                            ") values ("
                            + "'" + omodel.HBillNo + "','唯一条码'," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
                            + ",'" + omodel.HBatchNo + "'," + omodel.HSupID.ToString() + ",0,'" + omodel.HMaker + "',getdate(),0," + omodel.HQty.ToString()
                            + ", " + omodel.HInterID.ToString() + ",1,'" + omodel.HBillNo + "','3772',''"
                            + ",1,1,0,0,0,'工序流转卡保存自动同步'"
                            + ",0,'',getdate(),'',getdate()"
                            + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",'',0,0"
                            + ",'','','',0,'','')");
                    }
                }
                else
                {
                    sReturn = "获取系统参数失败！ " + sErrMsg;
                    oCn.RollBack();
                    return false;
                }

                //
                sReturn = "新增单据成功！";
                oCn.Commit();

 Model/Model.csproj

@@ -714,6 +714,7 @@
    <Compile Include="车间管理\ClsSc_StationInBillSub.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBillMain.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBillSub.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBillSub_Emp.cs" />
    <Compile Include="车间管理\ClsSc_StationOutBillSub_Item.cs" />
    <Compile Include="车间管理\ClsSc_ABJJDMain.cs" />
    <Compile Include="车间管理\ClsWW_EntrustWorkOrderBillMain.cs" />

 Model/³µ¼ä¹ÜÀí/ClsSc_StationOutBillSub_Emp.cs

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


namespace Model
{
    public class ClsSc_StationOutBillSub_Emp : DBUtility.ClsXt_BaseBillSub
    {
        public string HBillNo_bak; //单据号（备份，以免内码丢失，找不到对应主表）
        public Int64 HItemSubID; //自增列(GUID)
        public Int64 HWorkEmpID; //操作员(Gy_Employee)
        public Int64 HWorkSourceID; //生产资源(Gy_Source)
        public decimal HQty ; //生产数量
        public decimal HRate;//员工系数
        public decimal HProcPrice;//工价
        public decimal HMoney; //金额
        public Int64 HWorkProcID; //工序(Gy_Process)
    }
}

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -2764,6 +2764,13 @@
                    }

                    //==============================================================================================
                    //-==================工序流转卡
                    //工序流转卡保存自动同步条码档案
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ProcessExchangeBill_AutoBarCode")
                    {
                        omodel.Sc_ProcessExchangeBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }


                    //-======进站单
                    //先进先出

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -346,6 +346,8 @@
        public string BarCode_PrintQtyCtl;      //条码打印次数控制（是否只允许打印一次控制，Y åªå…è®¸æ‰“印一次）
        public string BarCode_UpdatePrintQtyCtl;//条码打印次数更新(打印条码时，是否更新条码打印次数，Y æ›´æ–°)

        //工序流转卡
        public string Sc_ProcessExchangeBill_AutoBarCode;                //工序流转卡保存自动同步条码档案

        //工序进站接收单 
        public string MES_StationInBill_FIFOCtl;                //工站或工序先进先出（本生产资源 æœ‰å•æ®æ²¡æœ‰å‡ºç«™åˆ™ï¼Œä¸èƒ½è¿›ç«™å…¶ä»–单据）

 WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs

@@ -573,13 +573,13 @@
,HMaker,HMakeDate,HChecker,HCheckDate,HOWNERTYPEID,HOWNERID
,HERPInterID,HERPBillType,HPURCHASEORGID,HSTOCKORGID,HREQUIREORGID
,HSTOCKGROUPID,HSENDBILLNO,HLADBILLNO,HPURDEPTID,HPURGROUPID,HSUPPLYID
,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HSUPPLYADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID,HCurID,HExRate,HAddress,HWHID)
,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HSUPPLYADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID,HCurID,HExRate,HAddress,HWHID,HInnerBillNo)
values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1103 + "','" +
mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "'," + mainList[0].HBillStatus + "," + mainList[0].HSupID +
"," + mainList[0].HManagerID + "," + mainList[0].HEmpID + "," + mainList[0].HDeptID + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker +
"','" + mainList[0].HMakeDate + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HOWNERTYPEID + "'," + mainList[0].HOWNERID + "," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HPURCHASEORGID + "," + mainList[0].HSTOCKORGID + "," + mainList[0].HREQUIREORGID + "," +
mainList[0].HSTOCKGROUPID + ",'" + mainList[0].HSENDBILLNO + "','" + mainList[0].HLADBILLNO + "'," + mainList[0].HPURDEPTID + "," + mainList[0].HPURGROUPID + "," + mainList[0].HSUPPLYID + "," +
mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HSUPPLYADDRESS + "'," + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + ",'" + mainList[0].HAddress + "'," + mainList[0].HWHID + ")";
mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HSUPPLYADDRESS + "'," + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + ",'" + mainList[0].HAddress + "'," + mainList[0].HWHID + "," + mainList[0].HInnerBillNo + ")";
                oCN.RunProc(sql);
                //保存主表
                foreach (var oSub in subList)

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
@@ -2099,7 +2100,137 @@
        }
        #endregion

        #region è¿”回工序出站汇报单明细列表
        [Route("Cj_StationOutBill_Detail/get_Display2")]
        [HttpGet]
        public object get_Display2(string HMaterID, string HWorkProcID, string HProcExchBillNo)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where å·¥åºID = " + HWorkProcID + " and ç‰©æ–™ID = " + HMaterID + " and æµè½¬å¡å· = '" + HProcExchBillNo + "'" , "h_v_GetStationOutBill_Detail");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "工序出站汇报单明细信息获取失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        
        #region æ˜Žç»† ä¿å­˜/编辑功能
        //[Route("Cj_StationOutBill/AddBill_Detail")]
        //[HttpPost]
        //public object AddBill_Detail([FromBody] JObject sMain)
        //{
        //    try
        //    {
        //        var _value = sMain["sMainSub"].ToString();
        //        string msg1 = _value.ToString();
        //        oCN.BeginTran();
        //        //保存主表
        //        objJsonResult = Add_Detail(msg1);
        //        if (objJsonResult.code == "0")
        //        {
        //            oCN.RollBack();
        //            objJsonResult.code = "0";
        //            objJsonResult.count = 0;
        //            objJsonResult.Message = 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 = "保存失败！" + e.ToString();
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}

        //public json Add_Detail(string msg1)
        //{
        //    string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
        //    string msg2 = sArray[0].ToString(); //表头数据
        //    string msg3 = sArray[1].ToString(); //表体数据
        //    int OperationType = int.Parse(sArray[2].ToString()); // æ•°æ®ç±»åž‹ 1添加 3修改
        //    string user = sArray[3].ToString(); //用户名
        //    try
        //    {                              
        //        List<ClsSc_StationOutBillSub_Emp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_StationOutBillSub_Emp>>(msg2);

        //        List<ClsSc_StationOutBillSub_Emp> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_StationOutBillSub_Emp>>(msg3);
             
        //        long HWorkEmpID = subList[0].HWorkEmpID;
        //        long HWorkSourceID = subList[0].HWorkSourceID;
        //        decimal HQty = subList[0].HQty;
        //        decimal HRate = subList[0].HRate;
        //        decimal HProcPrice = subList[0].HProcPrice;
        //        decimal HMoney = subList[0].HMoney;
        //        long HWorkProcID = mainList[0].HWorkProcID;           

        //        foreach (ClsSc_StationOutBillSub_Emp oSub in subList)
        //        {
        //            //ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where hmainid=" + HInterID + " and å•æ®å·='" + HBillNo + "'", "h_v_IF_ICMOBillList");

        //            if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//新增
        //            {
        //                //主表
        //                oCN.RunProc(@"Insert Into Sc_StationOutBillSub_Emp   
        //                    (HBillNo_bak ,HCloseMan ,HEntryCloseDate ,HCloseType ,HRemark ,HSourceInterID
        //                    ,HSourceEntryID ,HSourceBillNo ,HSourceBillType ,HRelationQty ,HRelationMoney 
        //                    ,HWorkEmpID ,HWorkSourceID ,HQty ,HRate ,HProcPrice 
        //                    ,HMoney ,HWorkProcID)
        //                    values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
        //                "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
        //                ",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
        //                "," + HCenterID + ",0,0,0,0," + HBomID + ",'','') ");
        //            }               
        //        }

        //        objJsonResult.code = "1";
        //        objJsonResult.count = 1;
        //        objJsonResult.Message = null;
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //    catch (Exception e)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "Exception！" + e.ToString();
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}
        #endregion
    }
}

 WebAPI/Web.config

@@ -22,7 +22,7 @@
    <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
    <add key="FileIP" value="http://localhost:8080/" />
      <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
      <add key="sUrl" value="http://192.168.63.7/WEBS-WMS/WebService1.asmx"/>     <!--颜台式机-->
      <add key="sUrl" value="http://192.168.63.3/WEBS-WMS/WebService1.asmx"/>     <!--颜台式机-->
      <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
      <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
      <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -97,7 +97,7 @@
      </basicHttpBinding>
    </bindings>
    <client>
      <endpoint address="http://192.168.63.7/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
      <endpoint address="http://192.168.63.3/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
        bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
        name="WebService1Soap" />
    </client>
@@ -106,10 +106,10 @@
  <applicationSettings>
    <WebAPI.Properties.Settings>
      <setting name="WebAPI_WebS_WebService1" serializeAs="String">
        <value>http://192.168.63.7/WEBS-WMS/WebService1.asmx</value>
        <value>http://192.168.63.3/WEBS-WMS/WebService1.asmx</value>
      </setting>
      <setting name="WebAPI_WebS2_WebService1" serializeAs="String">
        <value>http://192.168.63.7/WEBS-WMS/WebService1.asmx</value>
        <value>http://192.168.63.3/WEBS-WMS/WebService1.asmx</value>
      </setting>
    </WebAPI.Properties.Settings>
  </applicationSettings>