yangle
2023-01-09 b822fd7406716e9a8d5ea6c237c51c28d195857e
工艺路线 转工序
功能维护
4个文件已修改
2 文件已重命名
23 ■■■■■ 已修改文件
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillSController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckSBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_ProcessMangementController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/Gy_RoutingBill.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -120,7 +120,7 @@
            string msg3 = sArray[1].ToString();
            //int hentryid = int.Parse(sArray[2].ToString());//子表的顺序id
            int OperationType = int.Parse(sArray[2].ToString());//数据类型 1添加 3修改
            int OperationType = int.Parse(sArray[2].ToString());//数据类型 1添加 3修改 2 复制
            string user = sArray[3].ToString();//用户名
            try
            {
@@ -169,6 +169,7 @@
                string HMaterTexture = mainList[0].HMaterTexture;//材质
                string HProductNum = mainList[0].HProductNum;//成品编号
                string HVerNum = mainList[0].HVerNum;//版本
                int IsProNo = mainList[0].IsProNo;//是否转工序
                if (OperationType == 2)
                {
@@ -227,6 +228,14 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (IsProNo == 1 && OperationType == 1)
                {
                    //设置转工序
                    oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
                }
                //设置默认工艺路线
                oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID);  //设置默认工艺路线
                //判断是否重复工序号
                ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillSController.cs
File was renamed from WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillController.cs
@@ -11,7 +11,7 @@
namespace WebAPI.Controllers.SBGL
{
    public class Sb_EquipStockInCheckBillController : ApiController
    public class Sb_EquipStockInCheckBillSController : ApiController
    {
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckSBillController.cs
File was renamed from WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckBillController.cs
@@ -11,7 +11,7 @@
namespace WebAPI.Controllers.SBGL
{
    public class Sb_EquipWorkBeforeCheckBillController : ApiController
    public class Sb_EquipWorkBeforeCheckSBillController : ApiController
    {
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -858,7 +858,7 @@
                    return objJsonResult;
                }
                 oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where  HBillNo='" + BillNo + "'");
                 //oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where  HBillNo='" + BillNo + "'");
                oCN.Commit();
                oCN.RunProc("update  sc_stationoutbillmain set HBFFlag =1 where HProcExchBillNo = '" + BillNo + "'");
WebAPI/Models/Gy_RoutingBill.cs
@@ -37,6 +37,7 @@
        public int HPRDORGID { get; set; }
        public int HOrgID { get; set; }
        public int IsProNo { get; set; }//是否转工序
    }
}
WebAPI/WebAPI.csproj
@@ -402,8 +402,8 @@
    <Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" />
    <Compile Include="Controllers\SBGL\SBTC\Sb_EquipStockInCheckBillController.cs" />
    <Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckSBillController.cs" />
    <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\DataHelper.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\JIT_Cg_PODemandPlanBillController.cs" />
@@ -958,7 +958,6 @@
    <Folder Include="Views\Sb_EquipStatusChangeBill\" />
    <Folder Include="Views\Sb_EquipStockInCheckBill\" />
    <Folder Include="Views\Sb_EquipWorkBeforeCheckBill\" />
    <Folder Include="Views\Sb_EquipStockInCheckBill\" />
    <Folder Include="Views\Sc_CallGoodsBackRequestBill\" />
    <Folder Include="Views\Sc_ComplementGoodBill\" />
    <Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" />