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

advance version 

商品新增属性 绩效系数等

Merge branch 'master' of http://deiniusoft.com:3000/root/ldj
This commit is contained in:
bobwang 2024-10-27 22:20:04 +08:00
parent 10002f5d81 68774ba57a
commit c9c4c00866
44 changed files with 2862 additions and 1863 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Model/base/BaseOperModel.cs
View File

@ -13,7 +13,7 @@ namespace DeiNiu.Data.BaseObject
internal int _operater;
internal string _create_time = String.Empty;
internal string _lastmodified = String.Empty;
protected static log4net.ILog log = log4net.LogManager.GetLogger("logCommon");
public Object[] CmdParameters
{
get

1
Model/base/BaseOperModel_Imp.cs
View File

@ -6,6 +6,7 @@ namespace DeiNiu.Data.BaseObject
[Serializable]
public class BaseOperModel_Imp
{
protected static log4net.ILog log = log4net.LogManager.GetLogger("logCommon");
public BaseOperModel_Imp()
{

4
Model/base/Execution.cs
View File

@ -13,7 +13,7 @@ namespace DeiNiu.Data.BaseObject
[Serializable]
public class Execution : IDisposable
{
protected static log4net.ILog log = log4net.LogManager.GetLogger("logCommon");
private String _Sql = null;
// private SqlConnection _Conn = null;
@ -22,6 +22,8 @@ namespace DeiNiu.Data.BaseObject
private bool isBatchExcute; // true: not to handle connection close.
private enumDbInstance instance;
private int operater;
public Execution(enumDbInstance instance)
{

19
Model/wms/data/WmsOutPickPort_Imp.cs
View File

@ -335,7 +335,7 @@ namespace DeiNiu.wms.Data.Model
sqlCmd.Parameters.AddWithValue("@empId", mObj.CmdParameters[5]);
}
_strSql += " order by priority desc,pickorderno,locationid";
_strSql += " order by goodsPickPriority desc, priority desc,pickorderno,locationid";
sqlCmd.CommandText = _strSql;
@ -346,7 +346,7 @@ namespace DeiNiu.wms.Data.Model
_strSql = "SELECT top (@cnt) * FROM [v_stockOutBatchPickDetail] a WHERE cast(createtime as date) = cast(getdate() as date) " +
" and jobNo is not null" +
" and elabId =0 " +
" and isnull(takeBy,0) =0 " +
" and isnull(takeBy,0) =0 " +
" and ( isWeightSeeds=0 or isWeightSeeds =1 and partion =@partion )"; //区的任务可跨区获取，或获取指定区的任务
@ -385,8 +385,8 @@ namespace DeiNiu.wms.Data.Model
sqlCmd.Parameters.AddWithValue("@orderType", mObj.CmdParameters[4]);
}catch(Exception er)
{
LogHelper.WriteLog(this.GetType(), er);
LogHelper.debug("wmsoutpickport_imp",er.StackTrace);
log.Error( er);
}
}
@ -417,7 +417,7 @@ namespace DeiNiu.wms.Data.Model
_strSql += " and volType>0 ";
}
_strSql += " and state = " + (int)enumPickState.未拣;
_strSql += " and state = " + (int)enumPickState.未拣;
if (Convert.ToInt32(mObj.CmdParameters[0]) > 0)
@ -445,11 +445,11 @@ namespace DeiNiu.wms.Data.Model
if (Convert.ToBoolean(mObj.CmdParameters[8]))
{
// _strSql += " order by priority desc,seedspickno desc, goodsid";
_strSql += " order by priority desc, goodsid";
_strSql += " order by goodsPickPriority desc, priority desc, goodsid";
}
else
{
_strSql += " order by priority desc,lineId,lineorder, pickorderNo , virtialCnt, warehouse,partion,channel,shelf,col,layer,goodsid";
_strSql += " order by goodsPickPriority desc, priority desc,lineId,lineorder, pickorderNo , virtialCnt, warehouse,partion,channel,shelf,col,layer,goodsid";
}
@ -479,7 +479,8 @@ namespace DeiNiu.wms.Data.Model
case 1200: //getAssignedTasks by takeby
_strSql = "SELECT top (@cnt) * FROM [v_stockOutBatchPickDetail] WHERE 1=1 ";
_strSql = "SELECT top (@cnt) * FROM [v_stockOutBatchPickDetail] WHERE 1=1 " +
" and cast(createtime as date) = cast(getdate() as date) ";
// + " and elabId = 0 " ;
if (Convert.ToInt32(mObj.CmdParameters[10]) <= 0)
@ -543,7 +544,7 @@ namespace DeiNiu.wms.Data.Model
// _strSql += " order by priority desc,linepriority desc, pickorderNo ,/* virtialCnt,*/ warehouse,partion,locationId,channel,shelf,col,layer,goodsid";
_strSql += " order by priority desc,lineId,lineorder, pickorderNo , /* virtialCnt,*/ warehouse,partion,channel,shelf,col,layer,goodsid";
_strSql += " order by goodsPickPriority desc, priority desc,lineId,lineorder, pickorderNo , /* virtialCnt,*/ warehouse,partion,channel,shelf,col,layer,goodsid";
}

16
Model/wms/data/basic/WmsFlow_base.cs
View File

@ -2,7 +2,7 @@
///Data Object
///BASIC CLASS FOR TABLE t_wmsFlow
///By wm
///on 01/09/2024
///on 12/27/2024
/// </summary>
using System;
@ -37,6 +37,8 @@ namespace DeiNiu.wms.Data.Model
internal decimal _finishedPcs,_OfinishedPcs;
internal int _progress,_Oprogress;
internal int _Ooperater;
internal string _goodsId = String.Empty,_OgoodsId= String.Empty;
internal decimal _factor,_Ofactor;
internal string _createtime = String.Empty,_Ocreatetime= String.Empty;
@ -146,6 +148,16 @@ namespace DeiNiu.wms.Data.Model
set {_operater = value;}
}
public string goodsId{
get {return _goodsId;}
set {_goodsId = value;}
}
public decimal factor{
get {return _factor;}
set {_factor = value;}
}
public bool dr{
get {return _dr;}
@ -165,7 +177,7 @@ namespace DeiNiu.wms.Data.Model
#endregion
#region fieldNames
public enum fields{task,flowNo,orderNo,type,typeName,state,fromPartion,toPartion,fromLocationId,toLocationId,taskPartion,owner,taskCnt,finishedCnt,finishedPcs,progress,operater}
public enum fields{task,flowNo,orderNo,type,typeName,state,fromPartion,toPartion,fromLocationId,toLocationId,taskPartion,owner,taskCnt,finishedCnt,finishedPcs,progress,operater,goodsId,factor}
#endregion

607
Model/wms/data/basic/WmsFlow_base_Imp.cs
View File

@ -2,7 +2,7 @@
///Data Implemention Object
///BASIC CRUD CLASS FOR TABLE t_wmsFlow
///By wm
///on 01/09/2024
///on 12/27/2024
/// </summary>
@ -22,378 +22,299 @@ namespace DeiNiu.wms.Data.Model
{
WmsFlow_base tmpObj = (WmsFlow_base)obj;
if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
{
try
{
tmpObj.ID = Convert.ToInt32(dr["id"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["id"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj.ID = Convert.ToInt32(dr["id"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["id"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("task") && !(dr["task"] is DBNull))
{
try
{
tmpObj._task = dr["task"].ToString() ;
tmpObj._Otask = dr["task"].ToString() ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["task"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._task = dr["task"].ToString() ;
tmpObj._Otask = dr["task"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["task"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("flowNo") && !(dr["flowNo"] is DBNull))
{
try
{
tmpObj._flowNo = dr["flowNo"].ToString() ;
tmpObj._OflowNo = dr["flowNo"].ToString() ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["flowNo"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._flowNo = dr["flowNo"].ToString() ;
tmpObj._OflowNo = dr["flowNo"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["flowNo"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("orderNo") && !(dr["orderNo"] is DBNull))
{
try
{
tmpObj._orderNo = dr["orderNo"].ToString() ;
tmpObj._OorderNo = dr["orderNo"].ToString() ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["orderNo"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._orderNo = dr["orderNo"].ToString() ;
tmpObj._OorderNo = dr["orderNo"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["orderNo"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("type") && !(dr["type"] is DBNull))
{
try
{
tmpObj._type = Convert.ToInt32(dr["type"].ToString()); ;
tmpObj._Otype = Convert.ToInt32(dr["type"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["type"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._type = Convert.ToInt32(dr["type"].ToString()); ;
tmpObj._Otype = Convert.ToInt32(dr["type"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["type"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("typeName") && !(dr["typeName"] is DBNull))
{
try
{
tmpObj._typeName = dr["typeName"].ToString() ;
tmpObj._OtypeName = dr["typeName"].ToString() ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["typeName"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._typeName = dr["typeName"].ToString() ;
tmpObj._OtypeName = dr["typeName"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["typeName"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
{
try
{
tmpObj._state = Convert.ToInt32(dr["state"].ToString()); ;
tmpObj._Ostate = Convert.ToInt32(dr["state"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["state"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._state = Convert.ToInt32(dr["state"].ToString()); ;
tmpObj._Ostate = Convert.ToInt32(dr["state"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["state"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("fromPartion") && !(dr["fromPartion"] is DBNull))
{
try
{
tmpObj._fromPartion = Convert.ToInt32(dr["fromPartion"].ToString()); ;
tmpObj._OfromPartion = Convert.ToInt32(dr["fromPartion"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["fromPartion"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._fromPartion = Convert.ToInt32(dr["fromPartion"].ToString()); ;
tmpObj._OfromPartion = Convert.ToInt32(dr["fromPartion"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["fromPartion"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("toPartion") && !(dr["toPartion"] is DBNull))
{
try
{
tmpObj._toPartion = Convert.ToInt32(dr["toPartion"].ToString()); ;
tmpObj._OtoPartion = Convert.ToInt32(dr["toPartion"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["toPartion"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._toPartion = Convert.ToInt32(dr["toPartion"].ToString()); ;
tmpObj._OtoPartion = Convert.ToInt32(dr["toPartion"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["toPartion"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("fromLocationId") && !(dr["fromLocationId"] is DBNull))
{
try
{
tmpObj._fromLocationId = dr["fromLocationId"].ToString() ;
tmpObj._OfromLocationId = dr["fromLocationId"].ToString() ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["fromLocationId"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._fromLocationId = dr["fromLocationId"].ToString() ;
tmpObj._OfromLocationId = dr["fromLocationId"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["fromLocationId"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("toLocationId") && !(dr["toLocationId"] is DBNull))
{
try
{
tmpObj._toLocationId = dr["toLocationId"].ToString() ;
tmpObj._OtoLocationId = dr["toLocationId"].ToString() ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["toLocationId"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._toLocationId = dr["toLocationId"].ToString() ;
tmpObj._OtoLocationId = dr["toLocationId"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["toLocationId"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("taskPartion") && !(dr["taskPartion"] is DBNull))
{
try
{
tmpObj._taskPartion = Convert.ToInt32(dr["taskPartion"].ToString()); ;
tmpObj._OtaskPartion = Convert.ToInt32(dr["taskPartion"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["taskPartion"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._taskPartion = Convert.ToInt32(dr["taskPartion"].ToString()); ;
tmpObj._OtaskPartion = Convert.ToInt32(dr["taskPartion"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["taskPartion"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("owner") && !(dr["owner"] is DBNull))
{
try
{
tmpObj._owner = Convert.ToInt32(dr["owner"].ToString()); ;
tmpObj._Oowner = Convert.ToInt32(dr["owner"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["owner"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._owner = Convert.ToInt32(dr["owner"].ToString()); ;
tmpObj._Oowner = Convert.ToInt32(dr["owner"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["owner"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("taskCnt") && !(dr["taskCnt"] is DBNull))
{
try
{
tmpObj._taskCnt = Convert.ToInt32(dr["taskCnt"].ToString()); ;
tmpObj._OtaskCnt = Convert.ToInt32(dr["taskCnt"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["taskCnt"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._taskCnt = Convert.ToInt32(dr["taskCnt"].ToString()); ;
tmpObj._OtaskCnt = Convert.ToInt32(dr["taskCnt"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["taskCnt"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("finishedCnt") && !(dr["finishedCnt"] is DBNull))
{
try
{
tmpObj._finishedCnt = Convert.ToInt32(dr["finishedCnt"].ToString()); ;
tmpObj._OfinishedCnt = Convert.ToInt32(dr["finishedCnt"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["finishedCnt"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._finishedCnt = Convert.ToInt32(dr["finishedCnt"].ToString()); ;
tmpObj._OfinishedCnt = Convert.ToInt32(dr["finishedCnt"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["finishedCnt"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("finishedPcs") && !(dr["finishedPcs"] is DBNull))
{
try
{
tmpObj._finishedPcs = Convert.ToDecimal(dr["finishedPcs"].ToString()); ;
tmpObj._OfinishedPcs = Convert.ToDecimal(dr["finishedPcs"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["finishedPcs"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._finishedPcs = Convert.ToDecimal(dr["finishedPcs"].ToString()); ;
tmpObj._OfinishedPcs = Convert.ToDecimal(dr["finishedPcs"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["finishedPcs"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("progress") && !(dr["progress"] is DBNull))
{
try
{
tmpObj._progress = Convert.ToInt32(dr["progress"].ToString()); ;
tmpObj._Oprogress = Convert.ToInt32(dr["progress"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["progress"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._progress = Convert.ToInt32(dr["progress"].ToString()); ;
tmpObj._Oprogress = Convert.ToInt32(dr["progress"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["progress"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
{
try
{
tmpObj._operater = Convert.ToInt32(dr["operater"].ToString()); ;
tmpObj._Ooperater = Convert.ToInt32(dr["operater"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["operater"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._operater = Convert.ToInt32(dr["operater"].ToString()); ;
tmpObj._Ooperater = Convert.ToInt32(dr["operater"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["operater"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("goodsId") && !(dr["goodsId"] is DBNull))
{
try
{
tmpObj._goodsId = dr["goodsId"].ToString() ;
tmpObj._OgoodsId = dr["goodsId"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["goodsId"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("factor") && !(dr["factor"] is DBNull))
{
try
{
tmpObj._factor = Convert.ToDecimal(dr["factor"].ToString()); ;
tmpObj._Ofactor = Convert.ToDecimal(dr["factor"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["factor"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
{
try
{
tmpObj._dr = Convert.ToBoolean(dr["dr"].ToString()); ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["dr"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._dr = Convert.ToBoolean(dr["dr"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["dr"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
{
try
{
tmpObj._createtime = dr["createtime"].ToString() ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["createtime"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._createtime = dr["createtime"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["createtime"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
{
try
{
tmpObj._lastmodified = dr["lastmodified"].ToString() ;
}
catch (Exception er)
{
LogHelper.debug(this.GetType(), "value :"+ dr["lastmodified"].ToString());
LogHelper.debug(this.GetType(), er.Message);
}
{
try
{
tmpObj._lastmodified = dr["lastmodified"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["lastmodified"].ToString());
log.Error( er);
}
}
}
}
@ -407,7 +328,7 @@ namespace DeiNiu.wms.Data.Model
break;
case (int)op_flag.update:
// _strSql = "UPDATE dbo.T_WMSFLOW SET TASK = @TASK,FLOWNO = @FLOWNO,ORDERNO = @ORDERNO,TYPE = @TYPE,TYPENAME = @TYPENAME,STATE = @STATE,FROMPARTION = @FROMPARTION,TOPARTION = @TOPARTION,FROMLOCATIONID = @FROMLOCATIONID,TOLOCATIONID = @TOLOCATIONID,TASKPARTION = @TASKPARTION,OWNER = @OWNER,TASKCNT = @TASKCNT,FINISHEDCNT = @FINISHEDCNT,FINISHEDPCS = @FINISHEDPCS,PROGRESS = @PROGRESS,OPERATER = @OPERATER,LASTMODIFIED = getdate() WHERE ID = @ID";
// _strSql = "UPDATE dbo.T_WMSFLOW SET TASK = @TASK,FLOWNO = @FLOWNO,ORDERNO = @ORDERNO,TYPE = @TYPE,TYPENAME = @TYPENAME,STATE = @STATE,FROMPARTION = @FROMPARTION,TOPARTION = @TOPARTION,FROMLOCATIONID = @FROMLOCATIONID,TOLOCATIONID = @TOLOCATIONID,TASKPARTION = @TASKPARTION,OWNER = @OWNER,TASKCNT = @TASKCNT,FINISHEDCNT = @FINISHEDCNT,FINISHEDPCS = @FINISHEDPCS,PROGRESS = @PROGRESS,OPERATER = @OPERATER,GOODSID = @GOODSID,FACTOR = @FACTOR,LASTMODIFIED = getdate() WHERE ID = @ID";
_strSql = "UPDATE dbo.T_WMSFLOW {0} WHERE ID = @ID";
_strSql = String.Format(_strSql, getChangedFields(tmpObj) );
break;
@ -461,6 +382,8 @@ namespace DeiNiu.wms.Data.Model
colums+= tmpObj._finishedPcs == null ? "" : "FINISHEDPCS" + ",";
colums+= tmpObj._progress == null ? "" : "PROGRESS" + ",";
colums+= tmpObj._operater == null ? "" : "OPERATER" + ",";
colums+= tmpObj._goodsId == null ? "" : "GOODSID" + ",";
colums+= tmpObj._factor == null ? "" : "FACTOR" + ",";
return colums.Substring(0,colums.Length -1) ;
}
@ -485,6 +408,8 @@ namespace DeiNiu.wms.Data.Model
values+= tmpObj._finishedPcs == null ? "" : "@FINISHEDPCS" + ",";
values+= tmpObj._progress == null ? "" : "@PROGRESS" + ",";
values+= tmpObj._operater == null ? "" : "@OPERATER" + ",";
values+= tmpObj._goodsId == null ? "" : "@GOODSID" + ",";
values+= tmpObj._factor == null ? "" : "@FACTOR" + ",";
return values.Substring(0,values.Length -1) ;
}
@ -559,6 +484,14 @@ namespace DeiNiu.wms.Data.Model
if (tmpObj._operater !=null && tmpObj._operater != tmpObj._Ooperater)
{
updateFields +="OPERATER = @OPERATER," ;
}
if (tmpObj._goodsId !=null && tmpObj._goodsId != tmpObj._OgoodsId)
{
updateFields +="GOODSID = @GOODSID," ;
}
if (tmpObj._factor !=null && tmpObj._factor != tmpObj._Ofactor)
{
updateFields +="FACTOR = @FACTOR," ;
}
updateFields +="LASTMODIFIED = getdate()" ;
return updateFields ;
@ -603,6 +536,8 @@ namespace DeiNiu.wms.Data.Model
oraCmd.Parameters.AddWithValue("@FINISHEDPCS", VerifyDbnull(tmpObj._finishedPcs)) ;
oraCmd.Parameters.AddWithValue("@PROGRESS", VerifyDbnull(tmpObj._progress)) ;
oraCmd.Parameters.AddWithValue("@OPERATER", VerifyDbnull(tmpObj._operater)) ;
oraCmd.Parameters.AddWithValue("@GOODSID", VerifyDbnull(tmpObj._goodsId)) ;
oraCmd.Parameters.AddWithValue("@FACTOR", VerifyDbnull(tmpObj._factor)) ;
// oraCmd.Parameters.AddWithValue("@LASTMODIFIED", "getdate()") ;
return;
case (int)op_flag.add:
@ -640,6 +575,10 @@ namespace DeiNiu.wms.Data.Model
oraCmd.Parameters.AddWithValue("@PROGRESS", VerifyDbnull(tmpObj._progress)) ;
if(tmpObj._operater!=null)
oraCmd.Parameters.AddWithValue("@OPERATER", VerifyDbnull(tmpObj._operater)) ;
if(tmpObj._goodsId!=null)
oraCmd.Parameters.AddWithValue("@GOODSID", VerifyDbnull(tmpObj._goodsId)) ;
if(tmpObj._factor!=null)
oraCmd.Parameters.AddWithValue("@FACTOR", VerifyDbnull(tmpObj._factor)) ;
return;
}

22
Model/wms/data/basic/WmsGoods_base.cs
View File

@ -2,7 +2,7 @@
///Data Object
///BASIC CLASS FOR TABLE t_wmsGoods
///By wm
///on 11/27/2023
///on 01/03/2025
/// </summary>
using System;
@ -52,6 +52,9 @@ namespace DeiNiu.wms.Data.Model
internal decimal _minOperateCount,_OminOperateCount;
internal string _barcode = String.Empty,_Obarcode= String.Empty;
internal int _expiryDays,_OexpiryDays;
internal int _pickPriority,_OpickPriority;
internal decimal _taskFactor,_OtaskFactor;
internal bool _canLackOut,_OcanLackOut;
internal string _createtime = String.Empty,_Ocreatetime= String.Empty;
@ -236,6 +239,21 @@ namespace DeiNiu.wms.Data.Model
set {_expiryDays = value;}
}
public int pickPriority{
get {return _pickPriority;}
set {_pickPriority = value;}
}
public decimal taskFactor{
get {return _taskFactor;}
set {_taskFactor = value;}
}
public bool canLackOut{
get {return _canLackOut;}
set {_canLackOut = value;}
}
public string lastmodified{
get {return _lastmodified;}
@ -255,7 +273,7 @@ namespace DeiNiu.wms.Data.Model
#endregion
#region fieldNames
public enum fields{goodsId,goodsType,ownerCode,plotId,pIsDateValid,part,full_max,bulkMax,bulkMax1,batchMax1,batchMax2,batchMax3,batchMax4,length,width,height,weight,validTermDays,bigCount,repType,ABC,lowStore,highStore,tempRequired,temperature,canSeedOut,canZhitong,operater,minOperateUnit,minOperateCount,barcode,expiryDays}
public enum fields{goodsId,goodsType,ownerCode,plotId,pIsDateValid,part,full_max,bulkMax,bulkMax1,batchMax1,batchMax2,batchMax3,batchMax4,length,width,height,weight,validTermDays,bigCount,repType,ABC,lowStore,highStore,tempRequired,temperature,canSeedOut,canZhitong,operater,minOperateUnit,minOperateCount,barcode,expiryDays,pickPriority,taskFactor,canLackOut}
#endregion

1034
Model/wms/data/basic/WmsGoods_base_Imp.cs
View File

File diff suppressed because it is too large Load Diff

2
Model/wms/data/basic/WmsOutDesk_base.cs
View File

@ -2,7 +2,7 @@
///Data Object
///BASIC CLASS FOR TABLE t_wmsOutDesk
///By wm
///on 08/04/2023
///on 01/08/2025
/// </summary>
using System;

232
Model/wms/data/basic/WmsOutDesk_base_Imp.cs
View File

@ -2,7 +2,7 @@
///Data Implemention Object
///BASIC CRUD CLASS FOR TABLE t_wmsOutDesk
///By wm
///on 08/04/2023
///on 01/08/2025
/// </summary>
@ -22,85 +22,221 @@ namespace DeiNiu.wms.Data.Model
{
WmsOutDesk_base tmpObj = (WmsOutDesk_base)obj;
if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
{
tmpObj.ID = Convert.ToInt32(dr["id"].ToString()); ;
{
try
{
tmpObj.ID = Convert.ToInt32(dr["id"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["id"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("color") && !(dr["color"] is DBNull))
{
tmpObj._color = Convert.ToInt32(dr["color"].ToString()); ;
tmpObj._Ocolor = Convert.ToInt32(dr["color"].ToString()); ;
{
try
{
tmpObj._color = Convert.ToInt32(dr["color"].ToString()); ;
tmpObj._Ocolor = Convert.ToInt32(dr["color"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["color"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("deskName") && !(dr["deskName"] is DBNull))
{
tmpObj._deskName = dr["deskName"].ToString() ;
tmpObj._OdeskName = dr["deskName"].ToString() ;
{
try
{
tmpObj._deskName = dr["deskName"].ToString() ;
tmpObj._OdeskName = dr["deskName"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["deskName"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("ip") && !(dr["ip"] is DBNull))
{
tmpObj._ip = dr["ip"].ToString() ;
tmpObj._Oip = dr["ip"].ToString() ;
{
try
{
tmpObj._ip = dr["ip"].ToString() ;
tmpObj._Oip = dr["ip"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["ip"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("macaddress") && !(dr["macaddress"] is DBNull))
{
tmpObj._macaddress = dr["macaddress"].ToString() ;
tmpObj._Omacaddress = dr["macaddress"].ToString() ;
{
try
{
tmpObj._macaddress = dr["macaddress"].ToString() ;
tmpObj._Omacaddress = dr["macaddress"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["macaddress"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("remark") && !(dr["remark"] is DBNull))
{
tmpObj._remark = dr["remark"].ToString() ;
tmpObj._Oremark = dr["remark"].ToString() ;
{
try
{
tmpObj._remark = dr["remark"].ToString() ;
tmpObj._Oremark = dr["remark"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["remark"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
{
tmpObj._state = Convert.ToInt32(dr["state"].ToString()); ;
tmpObj._Ostate = Convert.ToInt32(dr["state"].ToString()); ;
{
try
{
tmpObj._state = Convert.ToInt32(dr["state"].ToString()); ;
tmpObj._Ostate = Convert.ToInt32(dr["state"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["state"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("available") && !(dr["available"] is DBNull))
{
tmpObj._available = Convert.ToBoolean(dr["available"].ToString()); ;
tmpObj._Oavailable = Convert.ToBoolean(dr["available"].ToString()); ;
{
try
{
tmpObj._available = Convert.ToBoolean(dr["available"].ToString()); ;
tmpObj._Oavailable = Convert.ToBoolean(dr["available"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["available"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("port") && !(dr["port"] is DBNull))
{
tmpObj._port = Convert.ToInt32(dr["port"].ToString()); ;
tmpObj._Oport = Convert.ToInt32(dr["port"].ToString()); ;
{
try
{
tmpObj._port = Convert.ToInt32(dr["port"].ToString()); ;
tmpObj._Oport = Convert.ToInt32(dr["port"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["port"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("seedsCount") && !(dr["seedsCount"] is DBNull))
{
tmpObj._seedsCount = Convert.ToInt32(dr["seedsCount"].ToString()); ;
tmpObj._OseedsCount = Convert.ToInt32(dr["seedsCount"].ToString()); ;
{
try
{
tmpObj._seedsCount = Convert.ToInt32(dr["seedsCount"].ToString()); ;
tmpObj._OseedsCount = Convert.ToInt32(dr["seedsCount"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["seedsCount"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("startLabelId") && !(dr["startLabelId"] is DBNull))
{
tmpObj._startLabelId = Convert.ToInt32(dr["startLabelId"].ToString()); ;
tmpObj._OstartLabelId = Convert.ToInt32(dr["startLabelId"].ToString()); ;
{
try
{
tmpObj._startLabelId = Convert.ToInt32(dr["startLabelId"].ToString()); ;
tmpObj._OstartLabelId = Convert.ToInt32(dr["startLabelId"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["startLabelId"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("deskType") && !(dr["deskType"] is DBNull))
{
tmpObj._deskType = Convert.ToInt32(dr["deskType"].ToString()); ;
tmpObj._OdeskType = Convert.ToInt32(dr["deskType"].ToString()); ;
{
try
{
tmpObj._deskType = Convert.ToInt32(dr["deskType"].ToString()); ;
tmpObj._OdeskType = Convert.ToInt32(dr["deskType"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["deskType"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("seedsMinCount") && !(dr["seedsMinCount"] is DBNull))
{
tmpObj._seedsMinCount = Convert.ToInt32(dr["seedsMinCount"].ToString()); ;
tmpObj._OseedsMinCount = Convert.ToInt32(dr["seedsMinCount"].ToString()); ;
{
try
{
tmpObj._seedsMinCount = Convert.ToInt32(dr["seedsMinCount"].ToString()); ;
tmpObj._OseedsMinCount = Convert.ToInt32(dr["seedsMinCount"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["seedsMinCount"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
{
tmpObj._operater = Convert.ToInt32(dr["operater"].ToString()); ;
tmpObj._Ooperater = Convert.ToInt32(dr["operater"].ToString()); ;
{
try
{
tmpObj._operater = Convert.ToInt32(dr["operater"].ToString()); ;
tmpObj._Ooperater = Convert.ToInt32(dr["operater"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["operater"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
{
tmpObj._dr = Convert.ToBoolean(dr["dr"].ToString()); ;
{
try
{
tmpObj._dr = Convert.ToBoolean(dr["dr"].ToString()); ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["dr"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
{
tmpObj._createtime = dr["createtime"].ToString() ;
{
try
{
tmpObj._createtime = dr["createtime"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["createtime"].ToString());
log.Error( er);
}
}
if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
{
tmpObj._lastmodified = dr["lastmodified"].ToString() ;
{
try
{
tmpObj._lastmodified = dr["lastmodified"].ToString() ;
}
catch (Exception er)
{
log.Debug("value :"+ dr["lastmodified"].ToString());
log.Error( er);
}
}
}
}

1
WcfService1/BLL/lWmsInRequest.cs
View File

@ -1934,6 +1934,7 @@ namespace DeiNiu.wms.Logical
wmsflow.toPartion = r.partion;
// wmsflow.toLocationId = r.locationId;
wmsflow.taskCnt=1;
wmsflow.goodsId=requestDetail.goodsId;
wmsflow.Add();
}

100
WcfService1/BLL/lWmsOutPickPort.cs
View File

@ -358,7 +358,7 @@ namespace DeiNiu.wms.Logical
wmsflow.toPartion = _obj.tranArea;
wmsflow.taskPartion = _obj.partion;
// wmsflow.fromLocationId=_obj.locationId;
wmsflow.goodsId = dr["goodsId"].ToString();
wmsflow.Add();
}
@ -1138,8 +1138,11 @@ namespace DeiNiu.wms.Logical
DataTable dtFreeTasks = new DataTable();
bool isWholePickOrder = locationId.StartsWith("PK");
// bool isWholePickOrder = locationId.StartsWith("PK");
bool isWholePickOrder = !string.IsNullOrEmpty(locationId) &&
(locationId.StartsWith("PK") || locationId.StartsWith("RP")) && new WmsOutPickRequest(locationId).ID > 0;
if (isWholePickOrder)
{
dtFreeTasks = getWmsOutPickPort.getFreeTasksByPickOrder(locationId);
@ -1153,20 +1156,17 @@ namespace DeiNiu.wms.Logical
return jobs;
}
partion = loc.partion;
partion = loc.partion;
enumOrderType orderType = enumOrderType.销售出库; //默认取全部订单类型
isWeightSeeds = loc.isWeightSeeds
|| loc.part == 16759 //蔬菜类，边拣边分，获取单品所有任务，不跨区分配
isWeightSeeds = loc.isWeightSeeds;
// || loc.part == 16759 //蔬菜类，边拣边分，获取单品所有任务，不跨区分配
// || loc.part == 16761 //冷冻
// || loc.part == 16762
; //冷冻
isWeightSeedsLitmited = loc.part == 16761 || loc.part == 16762; //冷冻
// isWeightSeedsLitmited = loc.part == 16761 || loc.part == 16762; //冷冻
// logOut.Debug("蔬菜类 is weight seeds ? " + isWeightSeeds);
@ -1203,7 +1203,7 @@ namespace DeiNiu.wms.Logical
if (!isTimeForFetchTasks)
{
throw new Exception(string.Format("不在任务分配时间{0}:{1:D2}---{2}:{3:D2} ",
WmsConstants.SEEDS_TASK_FETCH_START_HOUR, WmsConstants.SEEDS_TASK_FETCH_START_MINUTES, WmsConstants.SEEDS_TASK_FETCH_END_HOUR, WmsConstants.SEEDS_TASK_FETCH_END_MINUTES));
WmsConstants.SEEDS_TASK_FETCH_START_HOUR, WmsConstants.SEEDS_TASK_FETCH_START_MINUTES, WmsConstants.SEEDS_TASK_FETCH_END_HOUR, WmsConstants.SEEDS_TASK_FETCH_END_MINUTES));
//return jobs;
}
@ -1255,25 +1255,56 @@ namespace DeiNiu.wms.Logical
int lotcnt = 0, boxcnt = 0;
string lastJob = "";
WmsOutPickPort wop;
WmsOutPickPort wop;
if (isWeightSeeds || isWeightSeedsLitmited)
{
// dv.RowFilter = "recType " +( isWeightSeeds?" = ":" <> ") +(int)enumStockRecordType.集货拣货;
/*
if (isWeightSeeds) //蔬菜坊 先分拣播种的任务
{
dv.RowFilter = "recType " + " = " + (int)enumStockRecordType.集货拣货;
}else if(isWeightSeedsLitmited) //冷冻库 先拣选称重的
{
dv.RowFilter = "recType " + " <> " + (int)enumStockRecordType.集货拣货;
}
*/
dv.RowFilter = "recType=" + (int)enumStockRecordType.集货拣货;
dv.Sort = "locationId,goodsId";
// dv.Sort = "goodsPickPriority desc,priority desc ,locationId,goodsId";
int taskCnt = 0;
bool isSeedsPick = false;
string lastGoods = "";
int lastRecType = -1;
foreach (DataRowView drv in dv)
{
wop = new WmsOutPickPort(drv.Row);
isSeedsPick = wop.recType == (int)enumStockRecordType.集货拣货;
if (lastRecType>-1 && lastRecType!=wop.recType)
{
break;
}
lastRecType = wop.recType;
if (string.IsNullOrEmpty(lastGoods))
{
lastGoods = drv["goodsId"].ToString();
logOut.Debug(string.Format(" current goods {0} {1} ", lastGoods, drv["goodsname"].ToString()));
}
else if (!isSeedsPick //称重分拣任务
&& lastGoods != drv["goodsId"].ToString())
{
logOut.Debug(string.Format(" next goods {0}.....break... ", drv["goodsname"].ToString()));
break;
}
lastGoods = drv["goodsId"].ToString();
wop.takeBy = operId;
wop.Update();
logOut.Debug(" user " + operId + " task Assign :" + wop.ID);
@ -1293,39 +1324,51 @@ namespace DeiNiu.wms.Logical
if (isWeightSeedsLitmited)
// if (isWeightSeedsLitmited)
if(isSeedsPick)
{
lotcnt++;
boxcnt += Convert.ToInt32(drv["boxcnt"].ToString());
if (lotcnt >= dv.Count * WmsConstants.MAX_PICK_PERCENT / 100 || lotcnt > WmsConstants.MAX_PICK_LOT_CNT || boxcnt > WmsConstants.MAX_PICK_BOX_CNT)
if (lotcnt >= dv.Count * WmsConstants.MAX_PICK_PERCENT / 100)// || lotcnt > WmsConstants.MAX_PICK_LOT_CNT || boxcnt > WmsConstants.MAX_PICK_BOX_CNT)
{
logOut.Debug(string.Format("1 can't assign more tasks , loc cnt :{0}, box cnt: {1}, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100: {2}", lotcnt, boxcnt, dv.Count * WmsConstants.MAX_PICK_PERCENT / 100));
break;
}
}
else if (taskCnt > 20)
/* else if (taskCnt > 20)
{
break;
}
/*
*/
}
/*
if (taskCnt > 0)
{
return jobs;
return jobs;//先分配播种拣货的任务，称重的最后分配
}
// dv.RowFilter = "recType " + (isWeightSeeds ? " <> ":" = " ) + (int)enumStockRecordType.集货拣货;
dv.RowFilter = "recType <>" + (int)enumStockRecordType.集货拣货;
// dv.Sort = "priority desc,goodsId";
if (isWeightSeeds) //蔬菜坊 分拣称重的任务
{
dv.RowFilter = "recType " + " <> " + (int)enumStockRecordType.集货拣货;
}
else if (isWeightSeedsLitmited) //冷冻库 拣选播种的任务
{
dv.RowFilter = "recType " + " = " + (int)enumStockRecordType.集货拣货;
}
// dv.RowFilter = "recType <>" + (int)enumStockRecordType.集货拣货;
// dv.Sort = "priority desc,goodsId";
dv.Sort = "goodsId";
string lastGoods = "";
logOut.Debug(string.Format(" tasks count for assisgn {0}", dv.Count));
@ -1372,7 +1415,7 @@ namespace DeiNiu.wms.Logical
}
}
*/
return jobs;
@ -2274,7 +2317,8 @@ namespace DeiNiu.wms.Logical
}
}
bool isWholePickOrder = !string.IsNullOrEmpty(locationid) && locationid.StartsWith("PK");
// bool isWholePickOrder = !string.IsNullOrEmpty(locationid) && locationid.StartsWith("PK");
bool isWholePickOrder = !string.IsNullOrEmpty(locationid) && (locationid.StartsWith("PK") || locationid.StartsWith("RP")) && new WmsOutPickRequest(locationid).ID > 0;
if ( partion == 0 && !string.IsNullOrEmpty(locationid) && !isWholePickOrder)

29
WcfService1/BLL/lWmsOutRequest.cs
View File

@ -2350,7 +2350,8 @@ namespace DeiNiu.wms.Logical
{
goods = new WmsGoods(requestDetail.goodsId, requestDetail.skuId, requestDetail.batch);
// logSpec.Debug(string.Format("库存不足时，全订单暂停出库 ？{0}", WmsConstants.OUT_STOCK_LACK_HOLD_ORDER));
logSpec.Debug(string.Format("库存不足时，全订单暂停出库 ？{0}, 可出虚拟库？{1}，goods.canLackOut ？{2} ",
WmsConstants.OUT_STOCK_LACK_HOLD_ORDER, WmsConstants.OUT_STOCK_LACK_VIR_OUT , goods.canLackOut));
if (!WmsConstants.OUT_STOCK_LACK_HOLD_ORDER)
{
@ -2370,7 +2371,7 @@ namespace DeiNiu.wms.Logical
sl.Add();
}*/
if (WmsConstants.OUT_STOCK_LACK_VIR_OUT) // 库存不足则从虚拟库借出
if (WmsConstants.OUT_STOCK_LACK_VIR_OUT && goods.canLackOut) // 库存不足则从虚拟库借出
{
decimal tmpCount = requestDetail.count;
@ -2585,11 +2586,12 @@ namespace DeiNiu.wms.Logical
return true;
}
}
}
}
else
@ -3064,11 +3066,8 @@ namespace DeiNiu.wms.Logical
else
{
logSpec.Debug("！！！！ 需要补零或库存不足或不满足最小分拣数量");
}
@ -3092,6 +3091,13 @@ namespace DeiNiu.wms.Logical
logSpec.Debug(string.Format("整库处理完毕，未处理数量: bulkCnt: {0} , batch1Cnt: {1} ,batch2Cnt: {2}", bulkCnt, batch1Cnt, batch2Cnt));
decimal batchCont = batch2Cnt + batch1Cnt - batch2bulk;// +requestDetail.batch2Count;
int boxcnt = (int)Math.Ceiling(batchCont / requestDetail.goods.bigCount);
requestDetail.boxcnt = boxcnt;
requestDetail.pcs = (int)Math.Ceiling((requestDetail.count - requestDetail.lackCount) / goods.minOperateCount);
if (batch2Cnt > 0 || batch1Cnt > 0) //货物不足，异常，
{
@ -3121,13 +3127,6 @@ namespace DeiNiu.wms.Logical
}
decimal batchCont = batch2Cnt + batch1Cnt - batch2bulk;// +requestDetail.batch2Count;
int boxcnt = (int)Math.Ceiling(batchCont / requestDetail.goods.bigCount);
requestDetail.boxcnt = boxcnt;
requestDetail.pcs = (int)Math.Ceiling((requestDetail.count - requestDetail.lackCount) / goods.minOperateCount);
/*
* 在开始已判断是否零库缺货

6
WcfService1/BLL/lWmsStock.cs
View File

@ -1260,8 +1260,8 @@ namespace DeiNiu.wms.Logical
if (isDownOnly)
{
//downAll(start);
downAllByGoodsPart(start);
// downAll(start);
downAllByGoodsPart(start);
return;
}
@ -1565,8 +1565,10 @@ namespace DeiNiu.wms.Logical
DataTable dt = stock.QueryActived().Tables[0];
logTest.Debug(" downall stock list cnt" + dt.Rows.Count);
DataView dv = dt.DefaultView;
dv.RowFilter = "locationid like '1%'";
dv.Sort = "locationId";
foreach (DataRowView dr in dv)
{
string flow = "1";

5
WcfService1/BLL/lWmsStockPandian.cs
View File

@ -331,6 +331,11 @@ namespace DeiNiu.wms.Logical
decimal adjustCnt = wstk.count - oldCount;
WmsLocation loc = new WmsLocation(wpa.locationId);// 涉及的库位状态去除锁定
loc.state = (int)enumStockLocationStatus.正常;
loc.Update();
if (!isRollBack)
{
r.description = "盘点调整";

8
WcfService1/BLL/lbase.cs
View File

@ -547,12 +547,12 @@ namespace DeiNiu.wms.Logical
break;
case 18:
WmsConstants.OUT_PROCESS_STOCK_DAYS = v;
WmsConstants.MAX_PICK_PERCENT = v;
break;
case 19:
WmsConstants.SEEDS_WEIGHT_OUT_RATE = v;
// case 19:
// WmsConstants.SEEDS_WEIGHT_OUT_RATE = v;
break;
// break;
case 20:
WmsConstants.OVER_WEIGHT_PERCENT_ALLOW = v;

2
WcfService1/Properties/PublishProfiles/IISProfile.pubxml
View File

@ -13,7 +13,7 @@
<ExcludeApp_Data>false</ExcludeApp_Data>
<MSDeployServiceURL>localhost</MSDeployServiceURL>
<DeployIisAppPath>restService</DeployIisAppPath>
<RemoteSitePhysicalPath />
<RemoteSitePhysicalPath>C:\inetpub\wwwroot\restService</RemoteSitePhysicalPath>
<SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
<MSDeployPublishMethod>InProc</MSDeployPublishMethod>
<EnableMSDeployBackup>false</EnableMSDeployBackup>

9
WcfService1/Web.config
View File

@ -1,15 +1,10 @@
<?xml version="1.0"?>
<configuration>
<appSettings>
<add key="SqlconnWMS" value="Data Source=localhost;Initial Catalog=wmsuzhou2;Integrated Security=True"/>
<add key="SqlconnWMS" value="Data Source=localhost;Initial Catalog=wmsldj;Integrated Security=True"/>
<add key="SqlconnPlatform" value="Data Source=localhost;Initial Catalog=deiniuPlatform;Integrated Security=True"/>
<add key="SqlconnWms_erp" value="Data Source=localhost;Initial Catalog=custErp_suzou2;Integrated Security=True"/>
<!--
<add key="SqlconnWMS" value="Data Source=175.24.179.109;Initial Catalog=wmsuzhou2;Persist Security Info=True;User ID=sa; Password=Es@cn09!;Pooling=true;Max Pool Size = 300; Min Pool Size=0; Connection Lifetime = 10;packet size=1000 " />
<add key="SqlconnPlatform" value="Data Source=175.24.179.109;Initial Catalog=deiniuPlatform;Persist Security Info=True;User ID=sa; Password=Es@cn09!;Pooling=true;Max Pool Size = 300; Min Pool Size=0; Connection Lifetime = 10;packet size=1000 " />
<add key="SqlconnWms_erp" value="Data Source=175.24.179.109;Initial Catalog=custErp_suzou2;Persist Security Info=True;User ID=sa; Password=Es@cn09!;Pooling=true;Max Pool Size = 300; Min Pool Size=0; Connection Lifetime = 10;packet size=1000 " />
-->
<add key="ClientSettingsProvider.ServiceUri" value=""/>
<add key="ConStringEncrypt" value="false"/>
</appSettings>

1
WcfService1/WmsWcfService.csproj
View File

@ -252,6 +252,7 @@
<Compile Include="wcfData\wcfWmsGoods.cs" />
<Compile Include="wcfData\wcfWmsOrderDetail.cs" />
<Compile Include="wcfData\wcfWmsOrderRequest.cs" />
<Compile Include="wcfData\wcfWmsOutDesk.cs" />
<Compile Include="wcfData\wcfWmsOutPickRequest.cs" />
<Compile Include="wcfData\wcfWmsPlate.cs" />
<Compile Include="wcfData\wcfWmsPlateStock_tmp.cs" />

4
WcfService1/WmsWcfService.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

84
WcfService1/wcfData/wcfWmsGoods.cs
View File

@ -2,7 +2,7 @@
///WCF Data Object
///BASIC CLASS FOR TABLE t_wmsGoods
///By wm
///on 09/18/2023
///on 01/03/2025
/// </summary>
using System;
@ -20,9 +20,9 @@ namespace DeiNiu.Wcf
public class WcfWmsGoods {
internal int _ID;
internal string _goodsId= String.Empty;
internal string _goodsId = String.Empty;
internal int _goodsType;
internal string _ownerCode= String.Empty;
internal string _ownerCode = String.Empty;
internal int _plotId;
internal bool _pIsDateValid;
internal int _part;
@ -48,11 +48,15 @@ namespace DeiNiu.Wcf
internal bool _canSeedOut;
internal bool _canZhitong;
internal int _operater;
internal string _minOperateUnit= String.Empty;
internal string _minOperateUnit = String.Empty;
internal decimal _minOperateCount;
internal string _barcode = String.Empty;
internal int _expiryDays;
internal string _lastmodified= String.Empty;
internal string _createtime= String.Empty;
internal int _pickPriority;
internal decimal _taskFactor;
internal bool _canLackOut;
internal string _lastmodified = String.Empty;
internal string _createtime = String.Empty;
internal bool _dr;
public WcfWmsGoods () {
@ -186,10 +190,26 @@ namespace DeiNiu.Wcf
{
_minOperateCount = Convert.ToDecimal(dr["minOperateCount"].ToString()); ;
}
if (dr.Table.Columns.Contains("barcode") && !(dr["barcode"] is DBNull))
{
_barcode = dr["barcode"].ToString() ;
}
if (dr.Table.Columns.Contains("expiryDays") && !(dr["expiryDays"] is DBNull))
{
_expiryDays = Convert.ToInt32(dr["expiryDays"].ToString()); ;
}
if (dr.Table.Columns.Contains("pickPriority") && !(dr["pickPriority"] is DBNull))
{
_pickPriority = Convert.ToInt32(dr["pickPriority"].ToString()); ;
}
if (dr.Table.Columns.Contains("taskFactor") && !(dr["taskFactor"] is DBNull))
{
_taskFactor = Convert.ToDecimal(dr["taskFactor"].ToString()); ;
}
if (dr.Table.Columns.Contains("canLackOut") && !(dr["canLackOut"] is DBNull))
{
_canLackOut = Convert.ToBoolean(dr["canLackOut"].ToString()); ;
}
if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
{
_lastmodified = dr["lastmodified"].ToString() ;
@ -270,7 +290,15 @@ namespace DeiNiu.Wcf
minOperateCount = dbObj.minOperateCount;
barcode = dbObj.barcode;
expiryDays = dbObj.expiryDays;
pickPriority = dbObj.pickPriority;
taskFactor = dbObj.taskFactor;
canLackOut = dbObj.canLackOut;
#endregion
@ -497,6 +525,13 @@ namespace DeiNiu.Wcf
}
[DataMember]
public string barcode{
get {return _barcode;}
set {_barcode = value;}
}
[DataMember]
public int expiryDays{
get {return _expiryDays;}
@ -504,6 +539,27 @@ namespace DeiNiu.Wcf
}
[DataMember]
public int pickPriority{
get {return _pickPriority;}
set {_pickPriority = value;}
}
[DataMember]
public decimal taskFactor{
get {return _taskFactor;}
set {_taskFactor = value;}
}
[DataMember]
public bool canLackOut{
get {return _canLackOut;}
set {_canLackOut = value;}
}
[DataMember]
public string lastmodified{
get {return _lastmodified;}
@ -591,7 +647,15 @@ namespace DeiNiu.Wcf
dbObj.minOperateCount = minOperateCount;
dbObj.barcode = barcode;
dbObj.expiryDays = expiryDays;
dbObj.pickPriority = pickPriority;
dbObj.taskFactor = taskFactor;
dbObj.canLackOut = canLackOut;
return dbObj;
@ -663,7 +727,15 @@ namespace DeiNiu.Wcf
wcfObj.minOperateCount = dbObj.minOperateCount;
wcfObj.barcode = dbObj.barcode;
wcfObj.expiryDays = dbObj.expiryDays;
wcfObj.pickPriority = dbObj.pickPriority;
wcfObj.taskFactor = dbObj.taskFactor;
wcfObj.canLackOut = dbObj.canLackOut;
return wcfObj;

353
WcfService1/wcfData/wcfWmsOutDesk.cs Normal file
View File

@ -0,0 +1,353 @@
/// <summary>
///WCF Data Object
///BASIC CLASS FOR TABLE t_wmsOutDesk
///By wm
///on 01/08/2025
/// </summary>
using System;
using System.Runtime.Serialization;
using System.Data;
using DeiNiu.wms.Data.Model;
namespace DeiNiu.Wcf
{
#region WcfWmsOutDesk
/// <summary>
/// This object represents the properties and methods of a WcfWmsOutDesk.
/// </summary>
[DataContract]
public class WcfWmsOutDesk {
internal int _id;
internal int _color;
internal string _deskName = String.Empty;
internal string _ip = String.Empty;
internal string _macaddress = String.Empty;
internal string _remark = String.Empty;
internal int _state;
internal bool _available;
internal int _port;
internal int _seedsCount;
internal int _startLabelId;
internal int _deskType;
internal int _seedsMinCount;
internal int _operater;
internal bool _dr;
internal string _createtime = String.Empty;
internal string _lastmodified = String.Empty;
public WcfWmsOutDesk () {
}
public WcfWmsOutDesk (DataRow dr) {
#region get data from dr
if (dr != null )
{
if (dr.Table.Columns.Contains("id") && !(dr["id"] is DBNull))
{
_id = Convert.ToInt32(dr["id"].ToString()); ;
}
if (dr.Table.Columns.Contains("color") && !(dr["color"] is DBNull))
{
_color = Convert.ToInt32(dr["color"].ToString()); ;
}
if (dr.Table.Columns.Contains("deskName") && !(dr["deskName"] is DBNull))
{
_deskName = dr["deskName"].ToString() ;
}
if (dr.Table.Columns.Contains("ip") && !(dr["ip"] is DBNull))
{
_ip = dr["ip"].ToString() ;
}
if (dr.Table.Columns.Contains("macaddress") && !(dr["macaddress"] is DBNull))
{
_macaddress = dr["macaddress"].ToString() ;
}
if (dr.Table.Columns.Contains("remark") && !(dr["remark"] is DBNull))
{
_remark = dr["remark"].ToString() ;
}
if (dr.Table.Columns.Contains("state") && !(dr["state"] is DBNull))
{
_state = Convert.ToInt32(dr["state"].ToString()); ;
}
if (dr.Table.Columns.Contains("available") && !(dr["available"] is DBNull))
{
_available = Convert.ToBoolean(dr["available"].ToString()); ;
}
if (dr.Table.Columns.Contains("port") && !(dr["port"] is DBNull))
{
_port = Convert.ToInt32(dr["port"].ToString()); ;
}
if (dr.Table.Columns.Contains("seedsCount") && !(dr["seedsCount"] is DBNull))
{
_seedsCount = Convert.ToInt32(dr["seedsCount"].ToString()); ;
}
if (dr.Table.Columns.Contains("startLabelId") && !(dr["startLabelId"] is DBNull))
{
_startLabelId = Convert.ToInt32(dr["startLabelId"].ToString()); ;
}
if (dr.Table.Columns.Contains("deskType") && !(dr["deskType"] is DBNull))
{
_deskType = Convert.ToInt32(dr["deskType"].ToString()); ;
}
if (dr.Table.Columns.Contains("seedsMinCount") && !(dr["seedsMinCount"] is DBNull))
{
_seedsMinCount = Convert.ToInt32(dr["seedsMinCount"].ToString()); ;
}
if (dr.Table.Columns.Contains("operater") && !(dr["operater"] is DBNull))
{
_operater = Convert.ToInt32(dr["operater"].ToString()); ;
}
if (dr.Table.Columns.Contains("dr") && !(dr["dr"] is DBNull))
{
_dr = Convert.ToBoolean(dr["dr"].ToString()); ;
}
if (dr.Table.Columns.Contains("createtime") && !(dr["createtime"] is DBNull))
{
_createtime = dr["createtime"].ToString() ;
}
if (dr.Table.Columns.Contains("lastmodified") && !(dr["lastmodified"] is DBNull))
{
_lastmodified = dr["lastmodified"].ToString() ;
}
}
#endregion
}
public WcfWmsOutDesk( WmsOutDesk dbObj){
#region get data from dbobj
_ID= dbObj.ID;
color = dbObj.color;
deskName = dbObj.deskName;
ip = dbObj.ip;
macaddress = dbObj.macaddress;
remark = dbObj.remark;
state = dbObj.state;
available = dbObj.available;
port = dbObj.port;
seedsCount = dbObj.seedsCount;
startLabelId = dbObj.startLabelId;
deskType = dbObj.deskType;
seedsMinCount = dbObj.seedsMinCount;
operater = dbObj.operater;
#endregion
}
#region Public Properties
[DataMember]
public int id{
get {return _id;}
set {_id = value;}
}
[DataMember]
public int color{
get {return _color;}
set {_color = value;}
}
[DataMember]
public string deskName{
get {return _deskName;}
set {_deskName = value;}
}
[DataMember]
public string ip{
get {return _ip;}
set {_ip = value;}
}
[DataMember]
public string macaddress{
get {return _macaddress;}
set {_macaddress = value;}
}
[DataMember]
public string remark{
get {return _remark;}
set {_remark = value;}
}
[DataMember]
public int state{
get {return _state;}
set {_state = value;}
}
[DataMember]
public bool available{
get {return _available;}
set {_available = value;}
}
[DataMember]
public int port{
get {return _port;}
set {_port = value;}
}
[DataMember]
public int seedsCount{
get {return _seedsCount;}
set {_seedsCount = value;}
}
[DataMember]
public int startLabelId{
get {return _startLabelId;}
set {_startLabelId = value;}
}
[DataMember]
public int deskType{
get {return _deskType;}
set {_deskType = value;}
}
[DataMember]
public int seedsMinCount{
get {return _seedsMinCount;}
set {_seedsMinCount = value;}
}
[DataMember]
public int operater{
get {return _operater;}
set {_operater = value;}
}
[DataMember]
public bool dr{
get {return _dr;}
set {_dr = value;}
}
[DataMember]
public string createtime{
get {return _createtime;}
set {_createtime = value;}
}
[DataMember]
public string lastmodified{
get {return _lastmodified;}
set {_lastmodified = value;}
}
#endregion
public WmsOutDesk getDbObject(){
WmsOutDesk dbObj = new WmsOutDesk(ID);
dbObj.ID= ID ;
dbObj.color = color;
dbObj.deskName = deskName;
dbObj.ip = ip;
dbObj.macaddress = macaddress;
dbObj.remark = remark;
dbObj.state = state;
dbObj.available = available;
dbObj.port = port;
dbObj.seedsCount = seedsCount;
dbObj.startLabelId = startLabelId;
dbObj.deskType = deskType;
dbObj.seedsMinCount = seedsMinCount;
dbObj.operater = operater;
return dbObj;
}
public WcfWmsOutDesk getWcfObject( WmsOutDesk dbObj){
WcfWmsOutDesk wcfObj = new WcfWmsOutDesk();
wcfObj.ID= dbObj.ID;
wcfObj.color = dbObj.color;
wcfObj.deskName = dbObj.deskName;
wcfObj.ip = dbObj.ip;
wcfObj.macaddress = dbObj.macaddress;
wcfObj.remark = dbObj.remark;
wcfObj.state = dbObj.state;
wcfObj.available = dbObj.available;
wcfObj.port = dbObj.port;
wcfObj.seedsCount = dbObj.seedsCount;
wcfObj.startLabelId = dbObj.startLabelId;
wcfObj.deskType = dbObj.deskType;
wcfObj.seedsMinCount = dbObj.seedsMinCount;
wcfObj.operater = dbObj.operater;
return wcfObj;
}
}
#endregion
}

4
WcfServiceErp/Properties/PublishProfiles/IISProfile.pubxml
View File

@ -9,10 +9,10 @@
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish>http://localhost:8080</SiteUrlToLaunchAfterPublish>
<SiteUrlToLaunchAfterPublish>http://localhost:10011</SiteUrlToLaunchAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<MSDeployServiceURL>localhost</MSDeployServiceURL>
<DeployIisAppPath>erpData</DeployIisAppPath>
<DeployIisAppPath>restERP10011</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
<MSDeployPublishMethod>InProc</MSDeployPublishMethod>

3
WcfServiceErp/Properties/PublishProfiles/IISProfile.pubxml.user
View File

@ -7,6 +7,7 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword />
<History>True|2024-01-25T07:41:51.4489643Z;True|2024-01-25T11:56:15.1222260+08:00;True|2024-01-23T09:16:49.9078007+08:00;True|2024-01-22T15:37:26.4401322+08:00;True|2024-01-21T17:05:57.5580166+08:00;False|2024-01-21T17:04:36.3059763+08:00;False|2024-01-21T17:01:13.1286378+08:00;True|2024-01-21T16:25:02.1039632+08:00;True|2024-01-21T15:59:29.1447524+08:00;True|2024-01-14T10:58:47.9625104+08:00;False|2024-01-14T10:57:12.4538065+08:00;True|2024-01-09T19:44:55.1732863+08:00;True|2024-01-07T13:21:49.6350040+08:00;True|2023-10-16T11:40:41.2569257+08:00;True|2023-10-16T10:50:30.9998889+08:00;True|2023-10-16T10:37:43.2487570+08:00;True|2023-10-16T10:24:56.3085157+08:00;True|2023-09-28T09:45:55.2895423+08:00;True|2023-09-04T15:17:36.9505250+08:00;True|2023-09-03T14:14:17.3486061+08:00;True|2023-09-03T14:10:52.8906964+08:00;True|2023-08-30T17:27:55.7315101+08:00;True|2023-08-30T17:25:14.5513061+08:00;True|2023-08-30T15:04:31.7174153+08:00;True|2023-08-30T14:48:21.8760311+08:00;True|2023-08-25T13:30:48.7209732+08:00;True|2023-08-23T16:35:16.3193399+08:00;True|2023-08-04T17:18:08.2762170+08:00;True|2023-08-04T12:20:04.8908761+08:00;True|2023-07-21T11:14:20.0359316+08:00;True|2023-06-12T18:26:13.3403481+08:00;True|2023-06-12T18:23:02.3770378+08:00;True|2023-06-09T21:11:06.8057742+08:00;True|2023-06-08T13:36:54.4515617+08:00;True|2023-06-08T13:34:59.5962229+08:00;True|2023-06-08T13:34:27.2938041+08:00;True|2023-06-08T13:33:17.4205371+08:00;True|2023-06-07T23:24:36.4524538+08:00;True|2023-06-07T13:49:24.0414265+08:00;True|2023-06-07T13:47:39.2172758+08:00;True|2023-06-07T13:45:08.5910856+08:00;True|2023-06-07T12:29:51.3335463+08:00;True|2023-06-07T12:18:09.4980310+08:00;True|2023-06-07T12:13:26.7999800+08:00;False|2023-06-07T12:12:07.7792565+08:00;True|2023-06-05T10:13:03.0939839+08:00;True|2023-06-05T10:11:24.6540522+08:00;True|2023-06-05T10:09:41.1308622+08:00;True|2023-06-05T10:01:42.8129139+08:00;True|2023-06-05T09:59:44.9731518+08:00;True|2023-06-05T09:58:26.5835117+08:00;True|2023-06-05T09:35:00.4481698+08:00;True|2023-05-10T12:56:47.1048894+08:00;True|2023-05-10T12:03:35.7552460+08:00;True|2023-05-10T12:00:18.3259439+08:00;True|2023-05-10T11:57:21.9221187+08:00;True|2023-05-09T12:44:43.3100584+08:00;</History>
<History>True|2025-01-03T10:23:55.8787819Z||;True|2024-01-25T15:41:51.4489643+08:00||;True|2024-01-25T11:56:15.1222260+08:00||;True|2024-01-23T09:16:49.9078007+08:00||;True|2024-01-22T15:37:26.4401322+08:00||;True|2024-01-21T17:05:57.5580166+08:00||;False|2024-01-21T17:04:36.3059763+08:00||;False|2024-01-21T17:01:13.1286378+08:00||;True|2024-01-21T16:25:02.1039632+08:00||;True|2024-01-21T15:59:29.1447524+08:00||;True|2024-01-14T10:58:47.9625104+08:00||;False|2024-01-14T10:57:12.4538065+08:00||;True|2024-01-09T19:44:55.1732863+08:00||;True|2024-01-07T13:21:49.6350040+08:00||;True|2023-10-16T11:40:41.2569257+08:00||;True|2023-10-16T10:50:30.9998889+08:00||;True|2023-10-16T10:37:43.2487570+08:00||;True|2023-10-16T10:24:56.3085157+08:00||;True|2023-09-28T09:45:55.2895423+08:00||;True|2023-09-04T15:17:36.9505250+08:00||;True|2023-09-03T14:14:17.3486061+08:00||;True|2023-09-03T14:10:52.8906964+08:00||;True|2023-08-30T17:27:55.7315101+08:00||;True|2023-08-30T17:25:14.5513061+08:00||;True|2023-08-30T15:04:31.7174153+08:00||;True|2023-08-30T14:48:21.8760311+08:00||;True|2023-08-25T13:30:48.7209732+08:00||;True|2023-08-23T16:35:16.3193399+08:00||;True|2023-08-04T17:18:08.2762170+08:00||;True|2023-08-04T12:20:04.8908761+08:00||;True|2023-07-21T11:14:20.0359316+08:00||;True|2023-06-12T18:26:13.3403481+08:00||;True|2023-06-12T18:23:02.3770378+08:00||;True|2023-06-09T21:11:06.8057742+08:00||;True|2023-06-08T13:36:54.4515617+08:00||;True|2023-06-08T13:34:59.5962229+08:00||;True|2023-06-08T13:34:27.2938041+08:00||;True|2023-06-08T13:33:17.4205371+08:00||;True|2023-06-07T23:24:36.4524538+08:00||;True|2023-06-07T13:49:24.0414265+08:00||;True|2023-06-07T13:47:39.2172758+08:00||;True|2023-06-07T13:45:08.5910856+08:00||;True|2023-06-07T12:29:51.3335463+08:00||;True|2023-06-07T12:18:09.4980310+08:00||;True|2023-06-07T12:13:26.7999800+08:00||;False|2023-06-07T12:12:07.7792565+08:00||;True|2023-06-05T10:13:03.0939839+08:00||;True|2023-06-05T10:11:24.6540522+08:00||;True|2023-06-05T10:09:41.1308622+08:00||;True|2023-06-05T10:01:42.8129139+08:00||;True|2023-06-05T09:59:44.9731518+08:00||;True|2023-06-05T09:58:26.5835117+08:00||;True|2023-06-05T09:35:00.4481698+08:00||;True|2023-05-10T12:56:47.1048894+08:00||;True|2023-05-10T12:03:35.7552460+08:00||;True|2023-05-10T12:00:18.3259439+08:00||;True|2023-05-10T11:57:21.9221187+08:00||;True|2023-05-09T12:44:43.3100584+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

4
WcfServiceErp/WcfServiceErp.csproj.user
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>
@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>IISProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>

2
WcfServicePortal/Properties/PublishProfiles/IISProfile.pubxml
View File

@ -11,7 +11,7 @@
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<publishUrl>C:\inetpub\wwwroot\wcfportal</publishUrl>
<publishUrl>C:\inetpub\wwwroot\wmsPortal</publishUrl>
<DeleteExistingFiles>true</DeleteExistingFiles>
</PropertyGroup>
</Project>

26
WcfServicePortal/Properties/PublishProfiles/IISProfile.pubxml.user
View File

@ -7,8 +7,8 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword />
<History>True|2024-10-09T04:08:11.6612176Z||;False|2022-07-21T13:26:02.2933601+08:00||;True|2022-05-27T16:18:43.3736878+08:00||;True|2022-05-27T11:30:36.0850878+08:00||;True|2022-05-27T11:21:29.1919870+08:00||;True|2022-06-25T18:24:32.2373075+08:00||;False|2022-06-25T18:23:40.6047068+08:00||;False|2022-06-25T18:23:25.2307975+08:00||;False|2022-06-25T18:21:12.8783721+08:00||;True|2022-06-19T16:54:44.3773501+08:00||;False|2022-06-19T16:48:41.8212645+08:00||;False|2022-06-19T16:45:20.5616618+08:00||;False|2022-06-18T14:11:52.7229346+08:00||;False|2022-06-18T13:52:10.0984396+08:00||;True|2022-06-18T13:28:00.8443375+08:00||;</History>
<_PublishTargetUrl>C:\inetpub\wwwroot\wcfportal</_PublishTargetUrl>
<History>True|2024-12-26T03:15:07.7678077Z||;True|2024-12-26T11:11:38.4433808+08:00||;True|2024-10-09T12:08:11.6612176+08:00||;False|2022-07-21T13:26:02.2933601+08:00||;True|2022-05-27T16:18:43.3736878+08:00||;True|2022-05-27T11:30:36.0850878+08:00||;True|2022-05-27T11:21:29.1919870+08:00||;True|2022-06-25T18:24:32.2373075+08:00||;False|2022-06-25T18:23:40.6047068+08:00||;False|2022-06-25T18:23:25.2307975+08:00||;False|2022-06-25T18:21:12.8783721+08:00||;True|2022-06-19T16:54:44.3773501+08:00||;False|2022-06-19T16:48:41.8212645+08:00||;False|2022-06-19T16:45:20.5616618+08:00||;False|2022-06-18T14:11:52.7229346+08:00||;False|2022-06-18T13:52:10.0984396+08:00||;True|2022-06-18T13:28:00.8443375+08:00||;</History>
<_PublishTargetUrl>C:\inetpub\wwwroot\wmsPortal</_PublishTargetUrl>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -22,19 +22,19 @@
<publishTime>03/08/2017 19:25:40</publishTime>
</File>
<File Include="bin/Logical.dll">
<publishTime>10/09/2024 12:06:36</publishTime>
<publishTime>12/26/2024 11:10:09</publishTime>
</File>
<File Include="bin/Logical.pdb">
<publishTime>10/09/2024 12:06:36</publishTime>
<publishTime>12/26/2024 11:10:09</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>10/09/2024 01:53:50</publishTime>
<publishTime>12/03/2024 08:57:32</publishTime>
</File>
<File Include="bin/Model.dll.config">
<publishTime>03/22/2024 16:10:52</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>10/09/2024 01:53:50</publishTime>
<publishTime>12/03/2024 08:57:32</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@ -43,25 +43,25 @@
<publishTime>03/22/2024 16:10:52</publishTime>
</File>
<File Include="bin/Utils.dll">
<publishTime>10/09/2024 01:53:50</publishTime>
<publishTime>12/03/2024 08:57:31</publishTime>
</File>
<File Include="bin/Utils.dll.config">
<publishTime>03/22/2024 16:10:52</publishTime>
</File>
<File Include="bin/Utils.pdb">
<publishTime>10/09/2024 01:53:50</publishTime>
<publishTime>12/03/2024 08:57:31</publishTime>
</File>
<File Include="bin/WcfServiceAuthentication.dll">
<publishTime>10/09/2024 12:06:36</publishTime>
<publishTime>12/26/2024 11:10:09</publishTime>
</File>
<File Include="bin/WcfServiceAuthentication.pdb">
<publishTime>10/09/2024 12:06:36</publishTime>
<publishTime>12/26/2024 11:10:09</publishTime>
</File>
<File Include="bin/WcfServicePortal.dll">
<publishTime>10/09/2024 12:08:09</publishTime>
<publishTime>12/26/2024 11:15:06</publishTime>
</File>
<File Include="bin/WcfServicePortal.pdb">
<publishTime>10/09/2024 12:08:09</publishTime>
<publishTime>12/26/2024 11:15:06</publishTime>
</File>
<File Include="Log4Net.config">
<publishTime>03/22/2024 16:10:53</publishTime>
@ -73,7 +73,7 @@
<publishTime>03/22/2024 16:10:53</publishTime>
</File>
<File Include="Web.config">
<publishTime>10/09/2024 12:08:10</publishTime>
<publishTime>12/26/2024 11:11:37</publishTime>
</File>
</ItemGroup>
</Project>

6
WcfServicePortal/WcfServicePortal.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@ -9,7 +9,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<NameOfLastUsedPublishProfile>IISProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\vssrc\vssrc\WcfServicePortal\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

13
WcfServicePortal/Web.config
View File

@ -2,15 +2,10 @@
<configuration>
<appSettings>
<!--
<add key="SqlconnPlatform" value="Data Source=121.42.142.11;Initial Catalog=deiniuPlatform;Persist Security Info=True;User ID=sa; Password=Es@cn09!;Pooling=true;Max Pool Size = 300; Min Pool Size=0; Connection Lifetime = 10;packet size=1000 " />
<add key="SqlconnPlatform" value="Data Source=175.24.179.109;Initial Catalog=deiniuPlatform;Persist Security Info=True;User ID=sa; Password=Es@cn09!;Pooling=true;Max Pool Size = 300; Min Pool Size=0; Connection Lifetime = 10;packet size=1000 " />
-->
<add key="SqlconnPlatform" value="Data Source=localhost;Initial Catalog=deiniuPlatform;Persist Security Info=True;User ID=sa; Password=Es@cn09!;Pooling=true;Max Pool Size = 300; Min Pool Size=0; Connection Lifetime = 10;packet size=1000 " />
<add key="SqlconnPlatform" value="Data Source=localhost;Initial Catalog=deiniuPlatform;Integrated Security=True"/>
<add key="ClientSettingsProvider.ServiceUri" value="" />
<add key="ConStringEncrypt" value="false" />

4
epickService/epickService.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

4
winform/Service References/ServiceReferenceGoods/GoodsService54.xsd
View File

@ -10,6 +10,7 @@
<xs:sequence>
<xs:element minOccurs="0" name="ABC" type="xs:int" />
<xs:element minOccurs="0" name="ID" type="xs:int" />
<xs:element minOccurs="0" name="barcode" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="batchMax1" type="xs:decimal" />
<xs:element minOccurs="0" name="batchMax2" type="xs:decimal" />
<xs:element minOccurs="0" name="batchMax3" type="xs:decimal" />
@ -17,6 +18,7 @@
<xs:element minOccurs="0" name="bigCount" type="xs:decimal" />
<xs:element minOccurs="0" name="bulkMax" type="xs:decimal" />
<xs:element minOccurs="0" name="bulkMax1" type="xs:decimal" />
<xs:element minOccurs="0" name="canLackOut" type="xs:boolean" />
<xs:element minOccurs="0" name="canSeedOut" type="xs:boolean" />
<xs:element minOccurs="0" name="canZhitong" type="xs:boolean" />
<xs:element minOccurs="0" name="createtime" nillable="true" type="xs:string" />
@ -36,8 +38,10 @@
<xs:element minOccurs="0" name="ownerCode" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="pIsDateValid" type="xs:boolean" />
<xs:element minOccurs="0" name="part" type="xs:int" />
<xs:element minOccurs="0" name="pickPriority" type="xs:int" />
<xs:element minOccurs="0" name="plotId" type="xs:int" />
<xs:element minOccurs="0" name="repType" type="xs:int" />
<xs:element minOccurs="0" name="taskFactor" type="xs:decimal" />
<xs:element minOccurs="0" name="tempRequired" type="xs:boolean" />
<xs:element minOccurs="0" name="temperature" type="xs:decimal" />
<xs:element minOccurs="0" name="validTermDays" type="xs:int" />

64
winform/Service References/ServiceReferenceGoods/Reference.cs
View File

@ -28,6 +28,9 @@ namespace DeiNiu.wms.win.ServiceReferenceGoods {
[System.Runtime.Serialization.OptionalFieldAttribute()]
private int IDField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private string barcodeField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private decimal batchMax1Field;
@ -49,6 +52,9 @@ namespace DeiNiu.wms.win.ServiceReferenceGoods {
[System.Runtime.Serialization.OptionalFieldAttribute()]
private decimal bulkMax1Field;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private bool canLackOutField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private bool canSeedOutField;
@ -106,12 +112,18 @@ namespace DeiNiu.wms.win.ServiceReferenceGoods {
[System.Runtime.Serialization.OptionalFieldAttribute()]
private int partField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private int pickPriorityField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private int plotIdField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private int repTypeField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private decimal taskFactorField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private bool tempRequiredField;
@ -163,6 +175,19 @@ namespace DeiNiu.wms.win.ServiceReferenceGoods {
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public string barcode {
get {
return this.barcodeField;
}
set {
if ((object.ReferenceEquals(this.barcodeField, value) != true)) {
this.barcodeField = value;
this.RaisePropertyChanged("barcode");
}
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public decimal batchMax1 {
get {
@ -254,6 +279,19 @@ namespace DeiNiu.wms.win.ServiceReferenceGoods {
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public bool canLackOut {
get {
return this.canLackOutField;
}
set {
if ((this.canLackOutField.Equals(value) != true)) {
this.canLackOutField = value;
this.RaisePropertyChanged("canLackOut");
}
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public bool canSeedOut {
get {
@ -501,6 +539,19 @@ namespace DeiNiu.wms.win.ServiceReferenceGoods {
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public int pickPriority {
get {
return this.pickPriorityField;
}
set {
if ((this.pickPriorityField.Equals(value) != true)) {
this.pickPriorityField = value;
this.RaisePropertyChanged("pickPriority");
}
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public int plotId {
get {
@ -527,6 +578,19 @@ namespace DeiNiu.wms.win.ServiceReferenceGoods {
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public decimal taskFactor {
get {
return this.taskFactorField;
}
set {
if ((this.taskFactorField.Equals(value) != true)) {
this.taskFactorField = value;
this.RaisePropertyChanged("taskFactor");
}
}
}
[System.Runtime.Serialization.DataMemberAttribute()]
public bool tempRequired {
get {

7
winform/epick/elelable/pick.cs
View File

@ -506,9 +506,7 @@ namespace elelab
// lwp.getWmsOutPickLable.updatePickingStatus(Convert.ToInt16(color), ele_id, little_ele_id, Convert.ToDecimal(receive_count));
try {
LogHelper.debug(typeof(pick), " 拍灯事件: userId is:" + userId + " seeds ID is :" + seedsId);
log.Debug(" 拍灯事件: userId is:" + userId + " seeds ID is :" + seedsId);
WmsConstants.EPICK_SEEDS_CURRENT_PICK_STATUS[orderNo][key] = updateSeedsPickStatus(orderNo, ele_id);
}catch(Exception ex)
{
@ -623,7 +621,8 @@ namespace elelab
SeedsLabel lb = currentElables[orderId][lableId];
LogHelper.debug(typeof(pick), string.Format(" .........deskId {0}, lable id {1} , trying to update db, userId is {2} ", lb.deskId,lableId, lb.userId));
LogHelper.debug(typeof(pick), string.Format(" .........deskId {0}, lable id {1}, userId is {2} , trying to update db ", lb.deskId,lableId, lb.userId));
LogHelper.debug(typeof(pick), string.Format(" lb {0} ", lb));
enumRepResult rs = client.seedsPickOut2(lb.flowNo,lb.skuId,lb.productDate,lb.batch,lb.outDetailId,lb.count,lb.toFlowNo,lb.inDetailId,false, lb.userId);//本次拣选完毕
LogHelper.debug(typeof(pick), string.Format(" ......... update result {0}", rs ));

12
winform/epick/wcf/ServiceLight.cs
View File

@ -152,7 +152,8 @@ namespace DeiNiu.wms.win.epick
public FormatedResult lightSeed(int deskId, string flowNo, string barcode, int toTalpcs, int userId, bool isValid)
{
log.Debug(string.Format("start request.... deskId:{0} ,flowNo:{1} ,barcode:{2}, userId: {3}, isValid:{4} ", deskId, flowNo, barcode, userId, isValid));
log.Debug(string.Format("start request.... deskId:{0} ,flowNo:{1} ,barcode:{2}, userId: {3}, isValid:{4},totalPcs {5} ",
deskId, flowNo, barcode, userId, isValid, toTalpcs));
List<SeedsLabel> els = new List<SeedsLabel>();
using (WmsOutPickRequestClient client = new WmsOutPickRequestClient("BasicHttpBinding_IWmsOutPickRequest",
string.Format("http://{0}/{1}", Park.svrUrl, "WmsOutPickRequestService.svc")))
@ -185,7 +186,8 @@ namespace DeiNiu.wms.win.epick
log.Debug(string.Format("pcs {0}, totalPcs {1}", pcs, toTalpcs));
SeedsLabel el = new SeedsLabel();
el.count = (int)Convert.ToDecimal(dr["wantCount"].ToString()) ;
// el.count = (int)Convert.ToDecimal(dr["wantCount"].ToString()) ;
el.count = Convert.ToDecimal(dr["wantCount"].ToString());
el.pcs = pcs;
el.color = 1;
el.barcode = barcode;
@ -229,12 +231,14 @@ namespace DeiNiu.wms.win.epick
lightUp(els, userId);
// msg= els[0].name;
int cnt = 0;
decimal cnt = 0;
int pcs = 0;
foreach(SeedsLabel eLabel in els)
{
cnt += eLabel.count;
pcs += eLabel.pcs;
}
msg = "总数: " + cnt + " [" + els[0].name + "]";
msg = string.Format("[{0}] 总数:{1}, 件数:{2}" , els[0].name ,cnt, pcs);
if (WmsConstants.WAVE_CURRENT_LIGHTS_PORT_STATUS.ContainsKey(deskId) &&
WmsConstants.WAVE_CURRENT_LIGHTS_PORT_STATUS[deskId])

2
winform/epick/wcf/data/Label.cs
View File

@ -63,7 +63,7 @@ namespace DeiNiu.wms.win.epick
public bool isValid { get; set; }
[DataMember(Order = 16)]
public int count { get; set; }
public decimal count { get; set; }
}

3
winform/wms.csproj
View File

@ -27,9 +27,10 @@
<TargetCulture>zh-Hans</TargetCulture>
<ProductName>得牛WMS</ProductName>
<PublisherName>得牛软件</PublisherName>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>340</ApplicationRevision>
<ApplicationRevision>342</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

167
winform/基础资料/GoodsForm.cs
View File

@ -125,9 +125,13 @@ namespace DeiNiu.wms.win
initialComboBoxs(comLotQ, lots, true);
initialComboBoxs(comLots, lots, true);
initialComboBoxs(comPickPriority, this.pickPriority, false);
initialComboBoxs(comPickPriorityQ, this.pickPriority, true);
comLackOut.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
comLackOutQ.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
}
private void setValidationRule()
{
// dxValidationProvider.SetValidationRule(comWarehouse, ValidationRules.notEmptyValidationRule);
@ -191,6 +195,9 @@ namespace DeiNiu.wms.win
GridColumn myCol33 = new GridColumn() { Caption = "存储货区", Visible = true, FieldName = "warehouse" };
GridColumn myCol34 = new GridColumn() { Caption = "可取总分播", Visible = true, FieldName = WmsGoods.fields.canSeedOut.ToString() };
GridColumn myCol35 = new GridColumn() { Caption = "可直通分拣", Visible = true, FieldName = WmsGoods.fields.canZhitong.ToString() };
GridColumn myCol36 = new GridColumn() { Caption = "分拣优先级", Visible = true, FieldName = WmsGoods.fields.pickPriority.ToString() };
GridColumn myCol37 = new GridColumn() { Caption = "绩效系数", Visible = true, FieldName = WmsGoods.fields.taskFactor.ToString() };
GridColumn myCol38 = new GridColumn() { Caption = "缺货出库", Visible = true, FieldName = WmsGoods.fields.canLackOut.ToString() };
if (gv == gridView2)
{
@ -255,6 +262,10 @@ namespace DeiNiu.wms.win
//to show bottom scroll bar
gv.Columns.Add(myCol10);
gv.Columns.Add(myCol11);
gv.Columns.Add(myCol36);
gv.Columns.Add(myCol37);
gv.Columns.Add(myCol37);
}
gv.OptionsView.ColumnAutoWidth = false;
@ -302,8 +313,12 @@ namespace DeiNiu.wms.win
+ (this.comWarehouseQuery.SelectedIndex <= 0 ? "" : string.Format("{0} = #{1};", WmsGoods.fields.part.ToString(), ((Node)this.comWarehouseQuery.SelectedItem).ID))
+ (this.comSeedsQ.SelectedIndex <= 0 ? "" : string.Format("{0} = #{1};", WmsGoods.fields.canSeedOut.ToString(), comSeedsQ.SelectedIndex==1?1:0))
+ (this.comZhitongQ.SelectedIndex <= 0 ? "" : string.Format("{0} = #{1};", WmsGoods.fields.canZhitong.ToString(), comZhitongQ.SelectedIndex == 1 ? 1 : 0))
;
+ (this.comPickPriorityQ.SelectedIndex <= 0 ? "" : string.Format("{0} = #{1};", WmsGoods.fields.pickPriority.ToString(), comPickPriorityQ.SelectedIndex-1 ))
+ (this.chkFactorQ.Checked? string.Format("{0} != #{1};", WmsGoods.fields.taskFactor.ToString(), 100):"")
+ (this.comLackOutQ.SelectedIndex <= 0 ? "" : string.Format("{0} = #{1};", WmsGoods.fields.canLackOut.ToString(), comLackOutQ.SelectedIndex == 1 ? 1 : 0))
;
this.pager1.PageCurrent = lastQuery.Equals(query) ? this.pager1.PageCurrent : 1; //根据查询条件的变化给pager赋值
int start = (pager1.PageSize * (pager1.PageCurrent - 1) + 1);
int end = (pager1.PageSize * pager1.PageCurrent);
@ -469,7 +484,7 @@ namespace DeiNiu.wms.win
this.gridView1.FocusedRowObjectChanged += new DevExpress.XtraGrid.Views.Base.FocusedRowObjectChangedEventHandler(this.gridView1_FocusedRowObjectChanged);
this.gridView1.DataSourceChanged += new System.EventHandler(this.gridView1_DataSourceChanged);
// gridView1.CustomColumnDisplayText += gridView1_CustomColumnDisplayText;
gridView1.CustomColumnDisplayText += gridView1_CustomColumnDisplayText;
//show line number
this.gridView1.IndicatorWidth = 40;
@ -518,10 +533,10 @@ namespace DeiNiu.wms.win
{
int display = -100;
if (e.Column.FieldName == "repType")
if (e.Column.FieldName == WmsGoods.fields.pickPriority.ToString())
{
if (!stockState.ContainsValue(e.DisplayText))
if (!pickPriority.ContainsValue(e.DisplayText))
{
@ -529,7 +544,7 @@ namespace DeiNiu.wms.win
{
display = Convert.ToInt16(e.DisplayText);
e.DisplayText = stockState[display];
e.DisplayText = pickPriority[display];
}
catch
@ -538,29 +553,7 @@ namespace DeiNiu.wms.win
}
}
}else
if (e.Column.FieldName == "isQc" || e.Column.FieldName == "isZhitong")
{
try
{
display = Convert.ToInt16(e.DisplayText);
if (display == 0)
{
e.DisplayText = "否";
}
else
{
e.DisplayText = "是";
}
}
catch
{
return;
}
}
}
}
@ -909,6 +902,14 @@ namespace DeiNiu.wms.win
wcfObj.operater = dbObj.operater;
wcfObj.canSeedOut = dbObj.canSeedOut;
wcfObj.canZhitong = dbObj.canZhitong;
wcfObj.barcode = dbObj.barcode;
wcfObj.expiryDays = dbObj.expiryDays;
wcfObj.pickPriority = dbObj.pickPriority;
wcfObj.taskFactor = dbObj.taskFactor;
wcfObj.canLackOut = dbObj.canLackOut;
return wcfObj;
}
@ -1187,6 +1188,65 @@ namespace DeiNiu.wms.win
return true;
}
private bool setPickPriority()
{
try
{
foreach (WmsGoods good in selectedGoods)
{
good.pickPriority =comPickPriority.SelectedIndex;
}
}
catch (Exception er)
{
showErrorMsg(er, er.Message);
return false;
}
return true;
}
private bool setFactor()
{
try
{
foreach (WmsGoods good in selectedGoods)
{
good.taskFactor = spinFactor.Value;
}
}
catch (Exception er)
{
showErrorMsg(er, er.Message);
return false;
}
return true;
}
private bool setLackOut()
{
try
{
foreach (WmsGoods good in selectedGoods)
{
good.canLackOut = comLackOut.SelectedIndex==0;
}
}
catch (Exception er)
{
showErrorMsg(er, er.Message);
return false;
}
return true;
}
private void comBzhitong_SelectedIndexChanged(object sender, EventArgs e)
{
@ -1207,6 +1267,53 @@ namespace DeiNiu.wms.win
}
}
private void btnPickPriority_Click(object sender, EventArgs e)
{
if (getCurrentObjects() && setPickPriority())
{
DialogResult r = MessageBox.Show(string.Format("确定要更新选中的{0}条 分拣优先级为 '{1}' 吗?",
selectedGoods.Count, comPickPriority.Text),
"确认修改", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
if (r == DialogResult.Yes)
{
updateObjects(selectedGoods);
}
}
}
private void btnFactor_Click(object sender, EventArgs e)
{
if (getCurrentObjects() && setFactor())
{
DialogResult r = MessageBox.Show(string.Format("确定要更新选中的{0}条 绩效系数为 '{1}' 吗?",
selectedGoods.Count, spinFactor.Text),
"确认修改", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
if (r == DialogResult.Yes)
{
updateObjects(selectedGoods);
}
}
}
private void btnLack_Click(object sender, EventArgs e)
{
if (getCurrentObjects() && setLackOut())
{
DialogResult r = MessageBox.Show(string.Format("确定要更新选中的{0}条 缺货出库 为 '{1}' 吗?",
selectedGoods.Count, comLackOut.Text),
"确认修改", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
if (r == DialogResult.Yes)
{
updateObjects(selectedGoods);
}
}
}
private void btnSaveABC_Click(object sender, EventArgs e)
{
if (this.comABC.SelectedIndex == 0)

1832
winform/基础资料/GoodsForm.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
winform/基础资料/GoodsForm.resx
View File

@ -121,7 +121,7 @@
<value>17, 17</value>
</metadata>
<metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>275, 17</value>
<value>274, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bbQuery.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

2
winform/基础资料/LocationmgrForm.cs
View File

@ -272,7 +272,7 @@ namespace DeiNiu.wms.win
GridColumn myCol17 = new GridColumn() { Caption = "仓储策略", Visible = true, FieldName = WmsLocation.fields.storeType.ToString() };
GridColumn myCol161 = new GridColumn() { Caption = "库容放大倍数", Visible = true, FieldName = WmsLocation.fields.scaleFactor.ToString() };
GridColumn myCol18 = new GridColumn() { Caption = "任务跨区", Visible = true, FieldName = WmsLocation.fields.isWeightSeeds.ToString() };
GridColumn myCol18 = new GridColumn() { Caption = "称重出库", Visible = true, FieldName = WmsLocation.fields.isWeightSeeds.ToString() };
this.gridView1.Columns.Add(myCol111);
this.gridView1.Columns.Add(myCol11);

21
winform/基础资料/LocationmgrForm.designer.cs generated
View File

@ -840,7 +840,7 @@
this.txtColumTo.Name = "txtColumTo";
this.txtColumTo.Properties.Mask.EditMask = "f0";
this.txtColumTo.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric;
this.txtColumTo.Size = new System.Drawing.Size(58, 28);
this.txtColumTo.Size = new System.Drawing.Size(54, 28);
this.txtColumTo.StyleController = this.layoutControl1;
this.txtColumTo.TabIndex = 5;
//
@ -1088,7 +1088,7 @@
this.btnCreate.Location = new System.Drawing.Point(56, 200);
this.btnCreate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnCreate.Name = "btnCreate";
this.btnCreate.Size = new System.Drawing.Size(352, 42);
this.btnCreate.Size = new System.Drawing.Size(83, 42);
this.btnCreate.StyleController = this.layoutControl1;
this.btnCreate.TabIndex = 63;
this.btnCreate.Text = "新建";
@ -1100,7 +1100,7 @@
this.btnQuery.Location = new System.Drawing.Point(37, 219);
this.btnQuery.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnQuery.Name = "btnQuery";
this.btnQuery.Size = new System.Drawing.Size(81, 42);
this.btnQuery.Size = new System.Drawing.Size(1891, 42);
this.btnQuery.StyleController = this.layoutControl1;
this.btnQuery.TabIndex = 64;
this.btnQuery.Text = "查询";
@ -1443,14 +1443,13 @@
//
// chkJobCross
//
this.chkJobCross.EditValue = true;
this.chkJobCross.Location = new System.Drawing.Point(950, 164);
this.chkJobCross.MenuManager = this.ribbon;
this.chkJobCross.Name = "chkJobCross";
this.chkJobCross.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F);
this.chkJobCross.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
this.chkJobCross.Properties.Appearance.Options.UseFont = true;
this.chkJobCross.Properties.Caption = "任务跨区";
this.chkJobCross.Size = new System.Drawing.Size(159, 38);
this.chkJobCross.Properties.Caption = "称重出库";
this.chkJobCross.Size = new System.Drawing.Size(159, 33);
this.chkJobCross.StyleController = this.layoutControl1;
this.chkJobCross.TabIndex = 95;
this.chkJobCross.CheckedChanged += new System.EventHandler(this.checkEdit1_CheckedChanged);
@ -1485,8 +1484,8 @@
//
this.tabbedControlGroup4.Location = new System.Drawing.Point(0, 0);
this.tabbedControlGroup4.Name = "tabbedControlGroup4";
this.tabbedControlGroup4.SelectedTabPage = this.lcgQuery;
this.tabbedControlGroup4.SelectedTabPageIndex = 0;
this.tabbedControlGroup4.SelectedTabPage = this.lcgSetup;
this.tabbedControlGroup4.SelectedTabPageIndex = 1;
this.tabbedControlGroup4.Size = new System.Drawing.Size(1936, 269);
this.tabbedControlGroup4.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.lcgQuery,
@ -2049,8 +2048,8 @@
//
this.tabbedControlGroup3.Location = new System.Drawing.Point(396, 0);
this.tabbedControlGroup3.Name = "tabbedControlGroup3";
this.tabbedControlGroup3.SelectedTabPage = this.layoutControlGroup5;
this.tabbedControlGroup3.SelectedTabPageIndex = 0;
this.tabbedControlGroup3.SelectedTabPage = this.layoutControlGroup11;
this.tabbedControlGroup3.SelectedTabPageIndex = 1;
this.tabbedControlGroup3.Size = new System.Drawing.Size(1501, 195);
this.tabbedControlGroup3.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlGroup5,

2
winform/基础资料/LocationmgrForm.resx
View File

@ -121,7 +121,7 @@
<value>17, 17</value>
</metadata>
<metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>275, 17</value>
<value>274, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bbQuery.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

2
winform/基础资料/LotSetup.cs
View File

@ -1205,7 +1205,7 @@ namespace DeiNiu.wms.win
// stkLocClient.formatLocName();
// stkLocClient.Close();
stkLocClient.initalSkus(true, 0);
stkLocClient.initalSkus(true, 1);
closeClient();
// stkLocClient.initalSkus(true, 3);
// closeClient();

2
winform/基础资料/LotSetup.resx
View File

@ -121,7 +121,7 @@
<value>17, 17</value>
</metadata>
<metadata name="splashScreenManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>275, 17</value>
<value>274, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bbQuery.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">