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

chenhaozhe

5 天以前 67df560647851055aa64aea6c81d1fc4266df5a9

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

# Conflicts:
#	BLL/bin/Release/BLL.dll
#	BLL/bin/Release/BLL.pdb
#	BLL/bin/Release/DAL.dll
#	BLL/bin/Release/DAL.pdb
#	BLL/bin/Release/DBUtility.dll
#	BLL/bin/Release/DBUtility.pdb
#	BLL/bin/Release/Model.dll
#	BLL/bin/Release/Model.pdb
#	BLL/bin/Release/Pub_Class.dll
#	BLL/bin/Release/Pub_Class.pdb
#	BLL/bin/Release/Pub_Control.dll
#	BLL/bin/Release/Pub_Control.pdb
#	BLL/bin/Release/SQLHelper.dll
#	BLL/bin/Release/SQLHelper.pdb
#	DAL/bin/Release/DAL.dll
#	DAL/bin/Release/DAL.pdb
#	DAL/bin/Release/DBUtility.dll
#	DAL/bin/Release/DBUtility.pdb
#	DAL/bin/Release/Model.dll
#	DAL/bin/Release/Model.pdb
#	DAL/bin/Release/Pub_Class.dll
#	DAL/bin/Release/Pub_Class.pdb
#	DAL/bin/Release/Pub_Control.dll
#	DAL/bin/Release/Pub_Control.pdb
#	DAL/bin/Release/SQLHelper.dll
#	DAL/bin/Release/SQLHelper.pdb
#	DBUtility/bin/Release/DBUtility.dll
#	DBUtility/bin/Release/DBUtility.pdb
#	DBUtility/bin/Release/Pub_Class.dll
#	DBUtility/bin/Release/Pub_Class.pdb
#	DBUtility/bin/Release/Pub_Control.dll
#	DBUtility/bin/Release/Pub_Control.pdb
#	DBUtility/bin/Release/SQLHelper.dll
#	DBUtility/bin/Release/SQLHelper.pdb
#	DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
#	DBUtility/obj/Release/DBUtility.dll
#	DBUtility/obj/Release/DBUtility.pdb
#	Model/bin/Release/DBUtility.dll
#	Model/bin/Release/DBUtility.pdb
#	Model/bin/Release/Model.dll
#	Model/bin/Release/Model.pdb
#	Model/bin/Release/Pub_Class.dll
#	Model/bin/Release/Pub_Class.pdb
#	Model/bin/Release/Pub_Control.dll
#	Model/bin/Release/Pub_Control.pdb
#	Model/bin/Release/SQLHelper.dll
#	Model/bin/Release/SQLHelper.pdb
#	Model/obj/Release/Model.csproj.AssemblyReference.cache
#	Model/obj/Release/Model.dll
#	Model/obj/Release/Model.pdb
#	Pub_Class/bin/Release/Pub_Class.dll
#	Pub_Class/bin/Release/Pub_Class.pdb
#	Pub_Control/bin/Release/Pub_Class.dll
#	Pub_Control/bin/Release/Pub_Class.pdb
#	Pub_Control/bin/Release/Pub_Control.dll
#	Pub_Control/bin/Release/Pub_Control.pdb
#	SQLHelper/bin/Release/Pub_Class.dll
#	SQLHelper/bin/Release/Pub_Class.pdb
#	SQLHelper/bin/Release/SQLHelper.dll
#	SQLHelper/bin/Release/SQLHelper.pdb
#	SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
#	SQLHelper/obj/Release/SQLHelper.dll
#	SQLHelper/obj/Release/SQLHelper.pdb
#	sdk_dingding/TopSdk/bin/Release/TopSdk.dll
#	sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
#	sdk_dingding/TopSdk/obj/Release/TopSdk.dll
#	sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

 BLL/bin/Release/BLL.dll

Binary files differ

 BLL/bin/Release/BLL.pdb

Binary files differ

 BLL/bin/Release/DAL.dll

Binary files differ

 BLL/bin/Release/DAL.pdb

Binary files differ

 BLL/bin/Release/DBUtility.dll

Binary files differ

 BLL/bin/Release/DBUtility.pdb

Binary files differ

 BLL/bin/Release/Model.dll

Binary files differ

 BLL/bin/Release/Model.pdb

Binary files differ

 BLL/bin/Release/Pub_Class.dll

Binary files differ

 BLL/bin/Release/Pub_Class.pdb

Binary files differ

 BLL/bin/Release/Pub_Control.dll

Binary files differ

 BLL/bin/Release/Pub_Control.pdb

Binary files differ

 BLL/bin/Release/SQLHelper.dll

Binary files differ

 BLL/bin/Release/SQLHelper.pdb

Binary files differ

 DAL/bin/Release/DAL.dll

Binary files differ

 DAL/bin/Release/DAL.pdb

Binary files differ

 DAL/bin/Release/DBUtility.dll

Binary files differ

 DAL/bin/Release/DBUtility.pdb

Binary files differ

 DAL/bin/Release/Model.dll

Binary files differ

 DAL/bin/Release/Model.pdb

Binary files differ

 DAL/bin/Release/Pub_Class.dll

Binary files differ

 DAL/bin/Release/Pub_Class.pdb

Binary files differ

 DAL/bin/Release/Pub_Control.dll

Binary files differ

 DAL/bin/Release/Pub_Control.pdb

Binary files differ

 DAL/bin/Release/SQLHelper.dll

Binary files differ

 DAL/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/bin/Release/DBUtility.dll

Binary files differ

 DBUtility/bin/Release/DBUtility.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Class.dll

Binary files differ

 DBUtility/bin/Release/Pub_Class.pdb

Binary files differ

 DBUtility/bin/Release/Pub_Control.dll

Binary files differ

 DBUtility/bin/Release/Pub_Control.pdb

Binary files differ

 DBUtility/bin/Release/SQLHelper.dll

Binary files differ

 DBUtility/bin/Release/SQLHelper.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 DBUtility/obj/Release/DBUtility.dll

Binary files differ

 DBUtility/obj/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/DBUtility.dll

Binary files differ

 Model/bin/Release/DBUtility.pdb

Binary files differ

 Model/bin/Release/Model.dll

Binary files differ

 Model/bin/Release/Model.pdb

Binary files differ

 Model/bin/Release/Pub_Class.dll

Binary files differ

 Model/bin/Release/Pub_Class.pdb

Binary files differ

 Model/bin/Release/Pub_Control.dll

Binary files differ

 Model/bin/Release/Pub_Control.pdb

Binary files differ

 Model/bin/Release/SQLHelper.dll

Binary files differ

 Model/bin/Release/SQLHelper.pdb

Binary files differ

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

Binary files differ

 Model/obj/Release/Model.dll

Binary files differ

 Model/obj/Release/Model.pdb

Binary files differ

 Pub_Class/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Class/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Class.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Class.pdb

Binary files differ

 Pub_Control/bin/Release/Pub_Control.dll

Binary files differ

 Pub_Control/bin/Release/Pub_Control.pdb

Binary files differ

 SQLHelper/bin/Release/Pub_Class.dll

Binary files differ

 SQLHelper/bin/Release/Pub_Class.pdb

Binary files differ

 SQLHelper/bin/Release/SQLHelper.dll

Binary files differ

 SQLHelper/bin/Release/SQLHelper.pdb

Binary files differ

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

Binary files differ

 SQLHelper/obj/Release/SQLHelper.dll

Binary files differ

 SQLHelper/obj/Release/SQLHelper.pdb

Binary files differ

 WebAPI/Controllers/BaseSet/Kf_WIPBalController.cs

@@ -365,8 +365,8 @@
                        int HCostItemID = int.Parse(item["HCostItemID"].ToString()); //成本项目ID
                        int HMaterID = int.Parse(item["HMaterID"].ToString());       //物料ID
                        int HProcID = int.Parse(item["HProcID"].ToString());         //工序ID
                        int HBeginQty = int.Parse(item["期初数量"].ToString());
                        int HBeginBal = int.Parse(item["期初金额"].ToString());
                        Double HBeginQty = Double.Parse(item["期初数量"].ToString());
                        Double HBeginBal = Double.Parse(item["期初金额"].ToString());

                        // 1. 检查主表是否存在记录
                        string checkMainSql = $"select HInterID from Kf_WIPBalMain where HOrgID='{HOrgID}' and HWorkShopID={HWorkShopID} and HCostObjID={HCostObjID}";

 sdk_dingding/TopSdk/bin/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Release/TopSdk.pdb

Binary files differ