nothing

zzr99

2022-01-10 15b364b579decda5633197ecb86307a93f6aee78

nothing

 BLL/bin/x86/Release/AxInterop.gregn6Lib.dll

Binary files differ

 BLL/bin/x86/Release/BLL.dll

Binary files differ

 BLL/bin/x86/Release/BLL.pdb

Binary files differ

 BLL/bin/x86/Release/DAL.dll

Binary files differ

 BLL/bin/x86/Release/DAL.pdb

Binary files differ

 BLL/bin/x86/Release/DBUtility.dll

Binary files differ

 BLL/bin/x86/Release/DBUtility.pdb

Binary files differ

 BLL/bin/x86/Release/Kingdee.BOS.WebApi.Client.dll

Binary files differ

 BLL/bin/x86/Release/Kingdee.BOS.WebApi.FormService.dll

Binary files differ

 BLL/bin/x86/Release/Kingdee.BOS.WebApi.ServicesStub.dll

Binary files differ

 BLL/bin/x86/Release/Model.dll

Binary files differ

 BLL/bin/x86/Release/Model.pdb

Binary files differ

 BLL/bin/x86/Release/Newtonsoft.Json.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Class.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/x86/Release/Pub_Control.dll

Binary files differ

 BLL/bin/x86/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/x86/Release/SQLHelper.dll

Binary files differ

 BLL/bin/x86/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/x86/Release/DAL.dll

Binary files differ

 DAL/bin/x86/Release/DAL.pdb

Binary files differ

 DAL/bin/x86/Release/DBUtility.dll

Binary files differ

 DAL/bin/x86/Release/DBUtility.pdb

Binary files differ

 DAL/bin/x86/Release/Model.dll

Binary files differ

 DAL/bin/x86/Release/Model.pdb

Binary files differ

 DAL/bin/x86/Release/Pub_Class.dll

Binary files differ

 DAL/bin/x86/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/x86/Release/Pub_Control.dll

Binary files differ

 DAL/bin/x86/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/x86/Release/SQLHelper.dll

Binary files differ

 DAL/bin/x86/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/x86/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/x86/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/x86/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/x86/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/x86/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/x86/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/x86/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/x86/Release/SQLHelper.pdb

Binary files differ

 LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache

Binary files differ

 Model/bin/x86/Release/DBUtility.dll

Binary files differ

 Model/bin/x86/Release/DBUtility.pdb

Binary files differ

 Model/bin/x86/Release/Model.dll

Binary files differ

 Model/bin/x86/Release/Model.pdb

Binary files differ

 Model/bin/x86/Release/Pub_Class.dll

Binary files differ

 Model/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Model/bin/x86/Release/Pub_Control.dll

Binary files differ

 Model/bin/x86/Release/Pub_Control.pdb

Binary files differ

 Model/bin/x86/Release/SQLHelper.dll

Binary files differ

 Model/bin/x86/Release/SQLHelper.pdb

Binary files differ

 Model/obj/Release/build.force

 Model/obj/x86/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/x86/Release/Model.csproj.CopyComplete

 Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
29d66df13f513c5744a8e9d673bb15ebcf022cba

 Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt

New file
@@ -0,0 +1,15 @@
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Model.dll
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Model.pdb
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\DBUtility.dll
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Pub_Class.dll
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\SQLHelper.dll
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Pub_Control.dll
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\DBUtility.pdb
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Pub_Class.pdb
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\SQLHelper.pdb
D:\智云MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Pub_Control.pdb
D:\智云MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.csproj.AssemblyReference.cache
D:\智云MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CoreCompileInputs.cache
D:\智云MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CopyComplete
D:\智云MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.dll
D:\智云MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.pdb

 Model/obj/x86/Release/Model.dll

Binary files differ

 Model/obj/x86/Release/Model.pdb

Binary files differ

 Pub_Class/bin/x86/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/x86/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/x86/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/x86/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/x86/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/x86/Release/SQLHelper.pdb

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.csproj.CopyComplete

 SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache

New file
@@ -0,0 +1 @@
e8ec5326fcce7dca1a8665f7df1eeeb575e7a0a1

 SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt

New file
@@ -0,0 +1,9 @@
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\bin\x86\Release\SQLHelper.dll
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\bin\x86\Release\SQLHelper.pdb
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\bin\x86\Release\Pub_Class.dll
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\bin\x86\Release\Pub_Class.pdb
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.AssemblyReference.cache
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CoreCompileInputs.cache
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CopyComplete
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.dll
D:\智云MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.pdb

 SQLHelper/obj/x86/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/x86/Release/SQLHelper.pdb

Binary files differ

 WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs

@@ -102,23 +102,57 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                ds = oCn.RunProcReturn("Select * from Sc_PackUnionBillMain where HinterID='" + lngBillKey, "Sc_PackUnionBillMain");
                var HBarCode_Pack = ds.Tables[0].Rows[0]["HBarCode_Pack"].ToString();
                if (ds.Tables.Count < 1)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "不存在箱码";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                    //判断是否入库 
                    ds = oCn.RunProcReturn("select * from Sc_ScanLineInStock where HBarCode_Pack='" + HBarCode_Pack + "'", "Sc_ScanLineInStock");
                    if (ds != null && ds.Tables[0].Rows.Count > 0)
                    {
                        objJsonResult.code = "-1";
                        objJsonResult.Message = "该箱条码已入库不允许取消!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    ds = oCn.RunProcReturn("Select 1 from Gy_BarCodeBill where HBarCode='" + HBarCode_Pack + "'", "Gy_BarCodeBill");
                    if (ds == null && ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "-1";
                        objJsonResult.Message = "无效箱条码!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    ds = oCn.RunProcReturn("Select 1 from Gy_BarCodeBill where HBarCode='" + HBarCode_Pack + "' and HStopflag='1'", "Gy_BarCodeBill");
                    if (ds != null && ds.Tables[0].Rows.Count > 0)
                    {
                        objJsonResult.code = "-1";
                        objJsonResult.Message = "此箱条码已作废!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                oCn.BeginTran();
                oCn.RunProc("Update  Gy_BarCodeBill set HStopflag='1'  where HBarCode='" + HBarCode_Pack + "'");
                oCn.RunProc("Delete From Sc_PackUnionBillSub_Sum  where HBarCode_Pack='" + HBarCode_Pack + "'");
                oCn.RunProc("Delete From Sc_PackUnionBillSub  where HInterID='" + lngBillKey + "'");
                oCn.RunProc("Delete From Sc_PackUnionBillMain  where HInterID='" + lngBillKey + "'");
                oCn.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
@@ -149,4 +183,4 @@
        }
        #endregion
    }
}
}