zgq
2021-06-30 ad7bec1313df110892242c6dab7848b8df61a1e0
调拨单新增参数‘源单号’
3个文件已修改
71 ■■■■ 已修改文件
WebAPI/Controllers/MoveStockBillController.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Xs_CutWorkSendBillController.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MoveStockBillController.cs
@@ -221,7 +221,7 @@
        /// <returns></returns>
        [Route("MoveStockBill/get_InfoByBarCode_Source_Json")]
        [HttpGet]
        public object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
        public object get_InfoByBarCode_Source_Json(string HSourceBillNo, string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
        {
            try
            {
@@ -230,7 +230,7 @@
                dal.GetInfoByNumber_View(sCode);
                if (dal.omodel_View.HBarCodeType != "托盘条码")
                {
                    return get_InfoByBarCode_Source_Json_s(sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
                    return get_InfoByBarCode_Source_Json_s(HSourceBillNo, sCode, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
                }
                else
                {
@@ -256,7 +256,7 @@
                        for (int i = 0; i < dsTBarCode.Tables[0].Rows.Count; i++)
                        {
                            sBarCode_MX = DBUtility.ClsPub.isStrNull(dsTBarCode.Tables[0].Rows[i]["HBarCodeMX"]);
                            objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
                            objJsonResult = (JsonResult)get_InfoByBarCode_Source_Json_s(HSourceBillNo, sBarCode_MX, sInterID, sBillNo, sQty, HWHID, HSPID, SCWhID, SCSPID);
                            if (objJsonResult.code == "0")
                            {
                                return objJsonResult;
@@ -277,7 +277,7 @@
            }
        }
        public object get_InfoByBarCode_Source_Json_s(string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
        public object get_InfoByBarCode_Source_Json_s(string HSourceBillNo, string sCode, Int64 sInterID, string sBillNo, Double sQty, Int64 HWHID, Int64 HSPID, Int64 SCWhID, Int64 SCSPID)
        {
            try
            {
@@ -294,6 +294,18 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //有源单 判断列表中是否存在所扫描的物料
                if (Pub_Class.ClsPub.isStrNull(HSourceBillNo) != "")
                {
                    if (sBool == false)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据号:" + sBillNo + ",单据ID:" + sInterID + ";该物料并不存在于此调拨单中,请确认物料无误后重新扫描!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                if (oView.HBarCodeType == "唯一条码" && sQty > 0 && oView.HQty < sQty)
                {
                    sRelQty = oView.HQty;
WebAPI/Controllers/Xs_CutWorkSendBillController.cs
@@ -101,7 +101,7 @@
                    + list[i].HMainSourceBillNo + "'," + list[i].HMainSourceInterID + ")";
                    oCN.RunProc(subSql);
                    //反写金蝶销售订单的裁切派工班组
                    var HGroupSql = "update AIS20200908101915zs..T_SAL_ORDER set F_XSDD_PGSJ=GETDATE(),F_XSDD_PGBZ=(select HName from Gy_Group where HItemID=" + list[i].HGroupID + ") where FID = " + list[i].HMainSourceInterID + "";
                    var HGroupSql = "update AIS20200908101915zs..T_SAL_ORDERENTRY set F_XSDD_PGSJ=GETDATE(),F_XSDD_PGBZ=(select HName from Gy_Group where HItemID=" + list[i].HGroupID + ") where FID = " + list[i].HMainSourceInterID + "";
                    oCN.RunProc(HGroupSql);
                }
                oCN.Commit();
@@ -122,6 +122,44 @@
            }
        }
        /// <summary>
        /// 上下架单列表
        /// </summary>
        /// <returns></returns>
        [Route("Xs_CutWorkSendBill/List")]
        [HttpGet]
        public object List(string sWhere)
        {
            try
            {
                ds = List_s(sWhere);
                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 = "返回记录成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #region sql语句
@@ -132,7 +170,10 @@
                "select FID HMainSourceInterID,FBILLNO HMainSourceBillNo,1 pages,'' HMaker from AIS20200908101915zs..T_SAL_ORDER where FBILLNO ='" + HSEOrderBillNo + "'"
                , "AIS20200908101915zs..T_SAL_ORDER");
        }
        public static DataSet List_s(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Xs_CutWorkSendBillList where 1=1 " + sWhere , "h_v_Xs_CutWorkSendBillList");
        }
        #endregion
WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -157,10 +157,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>06/10/2021 10:32:01</publishTime>
      <publishTime>06/29/2021 17:37:49</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>06/10/2021 10:32:01</publishTime>
      <publishTime>06/29/2021 17:37:49</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2021 21:35:21</publishTime>
@@ -334,7 +334,7 @@
      <publishTime>04/23/2021 13:11:40</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/10/2021 10:32:25</publishTime>
      <publishTime>06/29/2021 17:37:52</publishTime>
    </File>
  </ItemGroup>
</Project>