root
/
ldj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

库位维护、及存储数量维护

This commit is contained in:
bobwang 2023-05-23 23:33:56 +08:00
parent 356c3000ab
commit 2fcc07e050
13 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Model/wms/data/TmsStock_Imp.cs
View File

@ -35,7 +35,7 @@ namespace DeiNiu.wms.Data.Model
case 200: //to find free location case 200: //to find free location
string locationId = mObj.CmdParameters[0].ToString(); string locationId = mObj.CmdParameters[0].ToString();
_strSql = " SELECT TOP (@cnt) LOC.* FROM t_wmsLocation LOC WHERE LOC.STATE = " + (int)DeiNiu.Utils.enumStockLocationState.正常 _strSql = " SELECT TOP (@cnt) LOC.* FROM t_wmsLocation LOC WHERE LOC.STATE = " + (int)DeiNiu.Utils.enumStockLocationStatus.正常
+ " AND (isnull(loc.transLine,0) =@transLine or isnull(loc.transLine,0) = 0)" + " AND (isnull(loc.transLine,0) =@transLine or isnull(loc.transLine,0) = 0)"
+ " AND LOC.VOLTYPE = @VOLTYPE AND LOC.WHTYPE =@WHTYPE AND NOT EXISTS (SELECT 1 FROM T_TMSSTOCK WHERE LOCATIONID = LOC.LOCATIONID) " + " AND LOC.VOLTYPE = @VOLTYPE AND LOC.WHTYPE =@WHTYPE AND NOT EXISTS (SELECT 1 FROM T_TMSSTOCK WHERE LOCATIONID = LOC.LOCATIONID) "
; ;

2
Model/wms/data/WmsStockMaintain_Imp.cs
View File

@ -64,7 +64,7 @@ namespace DeiNiu.wms.Data.Model
case 300: //issue data for maintain case 300: //issue data for maintain
_strSql = "SELECT * FROM [v_stockMaintain4wince] WHERE state =" + (int)DeiNiu.Utils.enumStockLocationState.养护异常; _strSql = "SELECT * FROM [v_stockMaintain4wince] WHERE state =" + (int)DeiNiu.Utils.enumStockLocationStatus.养护异常;
if (!string.IsNullOrEmpty(mObj.CmdParameters[0].ToString())) if (!string.IsNullOrEmpty(mObj.CmdParameters[0].ToString()))
{ {
_strSql += " and skuId =@skuId "; _strSql += " and skuId =@skuId ";

4
Model/wms/data/WmsStockPandian_Imp.cs
View File

@ -42,7 +42,7 @@ namespace DeiNiu.wms.Data.Model
//to update stock set loctation to be disabled //to update stock set loctation to be disabled
_strSql += "; update v_stockGoods set locState =@status where 1=1 " + mObj.CmdParameters[0].ToString(); _strSql += "; update v_stockGoods set locState =@status where 1=1 " + mObj.CmdParameters[0].ToString();
_strSql += "; update v_stockGoods set state =@status where 1=1 " + mObj.CmdParameters[0].ToString(); _strSql += "; update v_stockGoods set state =@status where 1=1 " + mObj.CmdParameters[0].ToString();
sqlCmd.Parameters.AddWithValue("@status", enumStockLocationState.盘点锁定); sqlCmd.Parameters.AddWithValue("@status", enumStockLocationStatus.盘点锁定);
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;
break; break;
@ -115,7 +115,7 @@ namespace DeiNiu.wms.Data.Model
_strSql = " update v_stockGoods set locState =@status where 1=1 " + mObj.CmdParameters[0].ToString(); _strSql = " update v_stockGoods set locState =@status where 1=1 " + mObj.CmdParameters[0].ToString();
_strSql += "; update v_stockGoods set state =@status where 1=1 " + mObj.CmdParameters[0].ToString(); _strSql += "; update v_stockGoods set state =@status where 1=1 " + mObj.CmdParameters[0].ToString();
sqlCmd.Parameters.AddWithValue("@status", (int) enumStockLocationState.正常); sqlCmd.Parameters.AddWithValue("@status", (int) enumStockLocationStatus.正常);
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;
break; break;

6
Model/wms/data/WmsStock_Imp.cs
View File

@ -208,8 +208,8 @@ namespace DeiNiu.wms.Data.Model
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;
sqlCmd.Parameters.AddWithValue("@goodsId", mObj.CmdParameters[0]); sqlCmd.Parameters.AddWithValue("@goodsId", mObj.CmdParameters[0]);
sqlCmd.Parameters.AddWithValue("@whType", mObj.CmdParameters[3]); sqlCmd.Parameters.AddWithValue("@whType", mObj.CmdParameters[3]);
sqlCmd.Parameters.AddWithValue("@state1", (int)enumStockLocationState.养护异常); sqlCmd.Parameters.AddWithValue("@state1", (int)enumStockLocationStatus.养护异常);
sqlCmd.Parameters.AddWithValue("@state2", (int)enumStockLocationState.不可用); sqlCmd.Parameters.AddWithValue("@state2", (int)enumStockLocationStatus.不可用);
break; break;
case 500: //query by goodsId, string batch, enumWhLocVol locVolType, enumWhType whType case 500: //query by goodsId, string batch, enumWhLocVol locVolType, enumWhType whType
@ -317,7 +317,7 @@ namespace DeiNiu.wms.Data.Model
case 1000: //养护异常停售/停售解除 case 1000: //养护异常停售/停售解除
string d = string.Format("\n养护异常操作:{0}，操作人{1},时间{2}", ((enumStockLocationState)mObj.CmdParameters[1]).ToString(), mObj.CmdParameters[2], DateTime.Now.ToShortDateString()); string d = string.Format("\n养护异常操作:{0}，操作人{1},时间{2}", ((enumStockLocationStatus)mObj.CmdParameters[1]).ToString(), mObj.CmdParameters[2], DateTime.Now.ToShortDateString());
// _strSql = " update v_stockGoods set state =@state,locState=@state, operater = @operId , lastmodified = getdate(), description +=@desc " // _strSql = " update v_stockGoods set state =@state,locState=@state, operater = @operId , lastmodified = getdate(), description +=@desc "
// +" where skuId=@skuId"; // +" where skuId=@skuId";

4
Model/wms/data/Wmslocation_Imp.cs
View File

@ -55,7 +55,7 @@ namespace DeiNiu.wms.Data.Model
case 300: //to find free location //TODO:考虑重量因素，重量大放下层 case 300: //to find free location //TODO:考虑重量因素，重量大放下层
int warehouse = Convert.ToInt16( mObj.CmdParameters[7].ToString()); int warehouse = Convert.ToInt16( mObj.CmdParameters[7].ToString());
string locationId = mObj.CmdParameters[0].ToString(); string locationId = mObj.CmdParameters[0].ToString();
_strSql = " SELECT TOP (@cnt) LOC.* FROM t_wmsLocation LOC WHERE LOC.STATE = " + (int)DeiNiu.Utils.enumStockLocationState.正常 _strSql = " SELECT TOP (@cnt) LOC.* FROM t_wmsLocation LOC WHERE LOC.STATE = " + (int)DeiNiu.Utils.enumStockLocationStatus.正常
+ " and (isnull(ownerCode,@ownerCode) =@ownerCode or ownerCode ='') " + " and (isnull(ownerCode,@ownerCode) =@ownerCode or ownerCode ='') "
+ " AND (LOC.WHTYPE>0 or goodsType =@GOODTYPE) AND LOC.VOLTYPE = @VOLTYPE AND LOC.WHTYPE =@WHTYPE " + " AND (LOC.WHTYPE>0 or goodsType =@GOODTYPE) AND LOC.VOLTYPE = @VOLTYPE AND LOC.WHTYPE =@WHTYPE "
+ " AND NOT EXISTS (SELECT 1 FROM T_WMSSTOCK WHERE LOCATIONID = LOC.LOCATIONID) "; + " AND NOT EXISTS (SELECT 1 FROM T_WMSSTOCK WHERE LOCATIONID = LOC.LOCATIONID) ";
@ -89,7 +89,7 @@ namespace DeiNiu.wms.Data.Model
break; break;
case 301: //to find free location case 301: //to find free location
_strSql = " SELECT TOP (@cnt) LOC.* FROM t_wmsLocation LOC WHERE LOC.STATE = " + (int)DeiNiu.Utils.enumStockLocationState.正常 _strSql = " SELECT TOP (@cnt) LOC.* FROM t_wmsLocation LOC WHERE LOC.STATE = " + (int)DeiNiu.Utils.enumStockLocationStatus.正常
+ " AND LOC.WHTYPE =@WHTYPE "; + " AND LOC.WHTYPE =@WHTYPE ";
sqlCmd.CommandText = _strSql; sqlCmd.CommandText = _strSql;

2
Model/wms/tables/WmsStock.cs
View File

@ -329,7 +329,7 @@ namespace DeiNiu.wms.Data.Model
return CustQuery(900).Tables[0]; return CustQuery(900).Tables[0];
} }
public int maintainIssue(int skuId ,enumStockLocationState state, int operId) public int maintainIssue(int skuId ,enumStockLocationStatus state, int operId)
{ {
cmdParameters[0] = skuId; cmdParameters[0] = skuId;
cmdParameters[1] = (int)state; cmdParameters[1] = (int)state;

2
Utils/Enums.cs
View File

@ -187,7 +187,7 @@ namespace DeiNiu.Utils
/// <summary> /// <summary>
/// 货位状态 /// 货位状态
/// </summary> /// </summary>
public enum enumStockLocationState { 正常 = 0, 入库受限, 不可用, 养护异常,盘点锁定 }; public enum enumStockLocationStatus { 正常 = 0, 入库受限, 不可用, 养护异常,盘点锁定 };
/// <summary> /// <summary>
/// 复合台状态 /// 复合台状态

2
WcfService1/Android.svc.cs
View File

@ -409,7 +409,7 @@ namespace DeiNiu.Wcf
{ {
var result = DataTableToDicList(loc.getWmslocation.getLocations(locId)); var result = DataTableToDicList(loc.getWmslocation.getLocations(locId));
return new FormatedResult(JsonConvert.SerializeObject(1)); return new FormatedResult(JsonConvert.SerializeObject(result));
} }
public FormatedResult getStockCompareErp(string goodsId, string barcode) public FormatedResult getStockCompareErp(string goodsId, string barcode)

2
WcfService1/BLL/lWmsInRequest.cs
View File

@ -1399,7 +1399,7 @@ namespace DeiNiu.wms.Logical
stock.validDate = requestDetail.validDate; stock.validDate = requestDetail.validDate;
stock.validationTerm = 1; stock.validationTerm = 1;
stock.operater = this.operId; stock.operater = this.operId;
stock.state = (int)enumStockLocationState.正常; stock.state = (int)enumStockLocationStatus.正常;
stock.skuCode = skuCode; stock.skuCode = skuCode;
stock.skuId = skuId; stock.skuId = skuId;
stock.maintainDate = stock.getDateTime(); stock.maintainDate = stock.getDateTime();

4
WcfService1/BLL/lWmsOrderRequest.cs
View File

@ -246,8 +246,8 @@ namespace DeiNiu.wms.Logical
WmsLocation loc = new WmsLocation(od.locationId); WmsLocation loc = new WmsLocation(od.locationId);
WmsStock stk = new WmsStock(od.locationId,od.skuId); WmsStock stk = new WmsStock(od.locationId,od.skuId);
stk.countOuting += od.count; stk.countOuting += od.count;
stk.state = (int)enumStockLocationState.不可用; stk.state = (int)enumStockLocationStatus.不可用;
loc.state = (int)enumStockLocationState.不可用; loc.state = (int)enumStockLocationStatus.不可用;
stk.Update(); stk.Update();
loc.Update(); loc.Update();

12
WcfService1/BLL/lWmsStock.cs
View File

@ -166,7 +166,7 @@ namespace DeiNiu.wms.Logical
if(loc.ID ==0){ if(loc.ID ==0){
return enumRepResult.货位不存在; return enumRepResult.货位不存在;
} }
if (loc.state != (int)enumStockLocationState.正常) if (loc.state != (int)enumStockLocationStatus.正常)
{ {
return enumRepResult.货位不可用; return enumRepResult.货位不可用;
} }
@ -554,7 +554,7 @@ namespace DeiNiu.wms.Logical
{ {
return enumRepResult.货位不存在; return enumRepResult.货位不存在;
} }
if (loc.state != (int)enumStockLocationState.正常) if (loc.state != (int)enumStockLocationStatus.正常)
{ {
return enumRepResult.货位不可用; return enumRepResult.货位不可用;
} }
@ -565,7 +565,7 @@ namespace DeiNiu.wms.Logical
if(WmsConstants.VALID_LOC_CAPICITY) if(WmsConstants.VALID_LOC_CAPICITY)
return enumRepResult.库容不足; return enumRepResult.库容不足;
} }
if (loc.state != (int)enumStockLocationState.正常) if (loc.state != (int)enumStockLocationStatus.正常)
{ {
return (enumRepResult)loc.state; return (enumRepResult)loc.state;
} }
@ -925,7 +925,7 @@ namespace DeiNiu.wms.Logical
public bool newMaintain(int stockId, decimal mCount, decimal issueCount, string details ) public bool newMaintain(int stockId, decimal mCount, decimal issueCount, string details )
{ {
enumStockLocationState type = issueCount > 0 ? enumStockLocationState.养护异常 : enumStockLocationState.正常; enumStockLocationStatus type = issueCount > 0 ? enumStockLocationStatus.养护异常 : enumStockLocationStatus.正常;
WmsStock stk = new WmsStock(stockId); WmsStock stk = new WmsStock(stockId);
WmsStockMaintain wm = new WmsStockMaintain(); WmsStockMaintain wm = new WmsStockMaintain();
@ -949,7 +949,7 @@ namespace DeiNiu.wms.Logical
wm.Add(); wm.Add();
if (issueCount > 0) if (issueCount > 0)
{ {
stk.maintainIssue(stk.skuId, enumStockLocationState.养护异常, operId); stk.maintainIssue(stk.skuId, enumStockLocationStatus.养护异常, operId);
} }
stk.recordMaintain(stk.locationId,operId); stk.recordMaintain(stk.locationId,operId);
@ -967,7 +967,7 @@ namespace DeiNiu.wms.Logical
internal bool fixIssueData(int skuId) internal bool fixIssueData(int skuId)
{ {
return _obj.maintainIssue(skuId, enumStockLocationState.正常, operId) > 1; return _obj.maintainIssue(skuId, enumStockLocationStatus.正常, operId) > 1;
} }

2
WcfService1/BLL/lWmslocation.cs
View File

@ -213,7 +213,7 @@ namespace DeiNiu.wms.Logical
loc.whType = locs.whType; loc.whType = locs.whType;
loc.whVolType = locs.whVoltype; loc.whVolType = locs.whVoltype;
loc.volType = locs.volType; loc.volType = locs.volType;
loc.state = (int)enumStockLocationState.正常;//locs.state;//default 1 loc.state = (int)enumStockLocationStatus.正常;//locs.state;//default 1
loc.tranState = locs.tranState; loc.tranState = locs.tranState;
loc.warehouse = locs.warehouse; loc.warehouse = locs.warehouse;
loc.goodsType = locs.goodsType; loc.goodsType = locs.goodsType;

2
winform/基础资料/基类/BasicRibbonForm.cs
View File

@ -497,7 +497,7 @@ namespace DeiNiu.wms.win
{ {
if (_stockState == null) if (_stockState == null)
{ {
_stockState = Utils.Util.convertEnumToDic(typeof(enumStockLocationState)); _stockState = Utils.Util.convertEnumToDic(typeof(enumStockLocationStatus));
} }
return _stockState; return _stockState;
} }