zgq
2021-04-23 523086c6262bddd439e030c8a6507b2b34404cb5
工序出站
3个文件已修改
121 ■■■■ 已修改文件
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/StationBill.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/API.pubxml.user 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -10,7 +10,7 @@
namespace WebAPI.Controllers
{
    //工序出站发出单Controller
    //工序出站汇报单Controller
    public class Cj_StationOutBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -38,63 +38,93 @@
                //反序列化
                msg1 = "[" + msg1.ToString() + "]";
                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
                string BillType = "3790";
                string BillType = "3791";
                string HBillSubType = "3791";
                long HInterID = list[0].HInterID;//递入type得到的单据ID
                string HBillNo = list[0].HBillNo;//递入type得到的单据号
                int HBillStatus = 0;
                string HMaker = list[0].HMaker;//制单人
                string HMouldNum = list[0].HMouldNum;//模穴号
                int HYear = 2021;
                double HPeriod = 1;
                string HRemark = list[0].HRemark;//备注
                string HSourceName = list[0].HSourceName;//生产资源名称
                double HPieceQty = list[0].HPieceQty;//进站PCS数
                double HWasterQty = list[0].HWasterQty;//报废数量
                double HPlanPieceQty = list[0].HPlanPieceQty;//进站PNL数
                double HBadPNL = list[0].HBadPNL;//报废PNL数
                long HICMOInterID = list[0].HICMOInterID;//任务单ID
                string HICMOBillNo = list[0].HICMOBillNo;//任务单
                int HProcPlanInterID = 0;
                int HProcPlanEntryID = 0;
                string HProcPlanBillNo = "";
                int HProcExchInterID = 0;
                int HProcExchEntryID = 0;
                long HProcExchInterID = list[0].lngBillKey;
                long HProcExchEntryID = list[0].lngBillSubKey;
                string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
                long HMaterID = list[0].HMaterID;//产品ID
                long HProcID = list[0].HProcID;//当前工序
                long HProcID = list[0].HProcID;//当前工序ID
                double HICMOQty = list[0].HICMOQty;//任务单数量
                double HPlanQty = list[0].HPlanQty;//流转卡数量
                double HPlanQty = list[0].HPlanQty;//移交PNL数
                DateTime HStationOutTime = list[0].HStationOutTime;//汇报时间
                long HSourceID = list[0].HSourceID;//生产资源ID
                long HPayProcID = list[0].HPayProcID;//核算工序ID
                long HGroupID = list[0].HGroupID;//班组ID
                long HDeptID = 0;
                long HEmpID = list[0].HEmpID;//接收人ID
                long HEmpID = list[0].HEmpID;//操作员ID
                string HBarCode = list[0].HBarCode;//条形码
                string HAddr = "";
                string HBarCodeMaker = "";
                long HSourceID2 = list[0].HSourceID2;//生产资源2ID
                long HSourceID3 = list[0].HSourceID3;//生产资源3ID
                long HSourceID4 = list[0].HSourceID4;//生产资源4ID
                long HSourceID5 = list[0].HSourceID5;//生产资源5ID
                long HSupID = 0;
                double HQty = list[0].HQty;//接收数量
                double HQty = list[0].HQty;//合格数量
                double HPrice = 0;
                double HMoney = 0;
                double HPieceQty = list[0].HPieceQty;//接收件数
                string HSourceName = list[0].HSourceName;//生产资源名称
                double HBadCount = list[0].HBadCount;//不良数量
                long HCenterID = list[0].HCenterID;//工作中心ID
                string HProcNo = list[0].HProcNo;//流水号
                string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                string HSourceNameList = list[0].HSourceNameList;//设备清单
                long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
                string HMainSourceBillNo = list[0].HBillNo;//递入type得到的单据号
                string HMainSourceBillType = "3790";
                bool HLastSubProc = list[0].HLastSubProc;//转下工序
                long HEmpID2 = list[0].HEmpID2;//操作员2ID
                long HEmpID3 = list[0].HEmpID3;//操作员3ID
                long HEmpID4 = list[0].HEmpID4;//操作员4ID
                long HEmpID5 = list[0].HEmpID5;//操作员5ID
                double HDSQty = list[0].HDSQty;//折弯刀数
                double HChongQty = list[0].HChongQty;//NCT冲次数
                double HPriceRate = list[0].HPriceRate;//系数
                double HWorkTimes = list[0].HWorkTimes;//工时
                long HQCCheckID = list[0].HQCCheckID;//检验员ID
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
                oCN.RunProc("Insert Into Sc_StationInBillMain " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark" +
                oCN.RunProc("Insert Into Sc_StationOutBillMain " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
                ",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
                ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
                ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
                ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
                ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
                ",HProcNo,HOrderProcNO" +
                ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
                ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
                ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
                ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
                ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID" +
                ") " +
                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
                " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
                "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
                ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
                "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
                "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
                ",'" + HProcNo + "','" + HOrderProcNO + "'" +
              ") ");
                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
                ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",'" + HStationOutTime + "'," + HSourceID + "," + HPayProcID +
                "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
                "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
                "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
                "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID +
                ") ");
                ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl");
                if (ds == null)
                {
                    oCN.RollBack();
@@ -118,20 +148,22 @@
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.Message = "数量控制," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
                //判断是否是 首道工序
                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");
                oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus  " + HInterID + " ");
                oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode  " + HInterID + " ");
                //判断是否是 末道工序
                ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a  " +
                                    " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID  " +
                                    " Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
                if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
                if (ds1 == null || ds1.Tables[0].Rows.Count == 0 || HLastSubProc == false)
                {
                    
                }
                else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "是")
                else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HLastProc"]) == "是")
                { 
                }
@@ -155,7 +187,7 @@
        /// <summary>
        /// 返回工序出站发出单列表
        /// 返回工序出站汇报单列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
WebAPI/Models/StationBill.cs
@@ -47,6 +47,27 @@
        public double HPrice_BHS { get; set; }
        public double HMoney_BHS { get; set; }
        public long HCenterID { get; set; }
        public string HMouldNum { get; set; }
        public long lngBillKey { get; set; }
        public long lngBillSubKey { get; set; }
        public DateTime HStationOutTime { get; set; }
        public long HPayProcID { get; set; }
        public long HSourceID2 { get; set; }
        public long HSourceID3 { get; set; }
        public long HSourceID4 { get; set; }
        public long HSourceID5 { get; set; }
        public double HBadCount { get; set; }
        public string HSourceNameList { get; set; }
        public bool HLastSubProc { get; set; }
        public long HEmpID2 { get; set; }
        public long HEmpID3 { get; set; }
        public long HEmpID4 { get; set; }
        public long HEmpID5 { get; set; }
        public double HDSQty { get; set; }
        public double HChongQty { get; set; }
        public double HPriceRate { get; set; }
        public double HWorkTimes { get; set; }
        public long HQCCheckID { get; set; }
    }
WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -164,10 +164,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>04/19/2021 15:30:26</publishTime>
      <publishTime>04/23/2021 14:25:28</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>04/19/2021 15:30:26</publishTime>
      <publishTime>04/23/2021 14:25:28</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2021 21:35:21</publishTime>
@@ -341,7 +341,7 @@
      <publishTime>02/22/2021 09:25:20</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/19/2021 15:30:33</publishTime>
      <publishTime>04/23/2021 14:25:47</publishTime>
    </File>
  </ItemGroup>
</Project>