Merge branch 'master' of http://ldj:3000/root/ldj
This commit is contained in:
commit
b5827dedb4
|
|
@ -218,10 +218,11 @@ namespace DeiNiu.Wcf
|
|||
[OperationContract]
|
||||
DataTable getLightTasks(string query,int wareHouse, int partion, int lineId, int state, string date, bool isLight);
|
||||
|
||||
|
||||
|
||||
[OperationContract]
|
||||
enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ using DeiNiu.wms.Data.Model;
|
|||
namespace DeiNiu.Wcf
|
||||
{
|
||||
// 注意: 使用“重构”菜单上的“重命名”命令，可以同时更改代码、svc 和配置文件中的类名“WmsOutPickRequest”。
|
||||
public class WmsOutPickRequestService : basicService, IWmsOutPickRequest
|
||||
public class WmsOutPickRequestService : basicService, IWmsOutPickRequest
|
||||
{
|
||||
private static lWmsOutPickRequest _lop;
|
||||
private static lWmsOutPickRequest _lop;
|
||||
|
||||
lWmsOutPickRequest lop {
|
||||
get
|
||||
|
|
@ -42,7 +42,7 @@ namespace DeiNiu.Wcf
|
|||
|
||||
private static lWmsWave _lww;
|
||||
|
||||
lWmsWave lww
|
||||
lWmsWave lww
|
||||
{
|
||||
get
|
||||
{
|
||||
|
|
@ -75,23 +75,23 @@ namespace DeiNiu.Wcf
|
|||
if (isProcessWaveing)
|
||||
{
|
||||
LogHelper.debug(typeof(WmsOutPickRequestService), "!!!!!!!!!!!!!!!!! new pick wave ... is processing... return ....");
|
||||
return;
|
||||
return;
|
||||
}
|
||||
isProcessWaveing = true;
|
||||
// WmsConstants.WAVE_LINE = line;
|
||||
// WmsConstants.WAVE_SALE = sales;
|
||||
// WmsConstants.WAVE_LINE = line;
|
||||
// WmsConstants.WAVE_SALE = sales;
|
||||
|
||||
try
|
||||
{
|
||||
// lopp.newBulkDPSPickWave();
|
||||
// lopp.newBulkDPSPickWave();
|
||||
lop.newBulkDPSandSeedsPickWave();
|
||||
|
||||
|
||||
isProcessWaveing = false;
|
||||
}
|
||||
catch(Exception e)
|
||||
catch (Exception e)
|
||||
{
|
||||
LogHelper.debug(typeof(WmsOutPickRequestService), "!!!!!!!!!!!!!!!!!Exception !!!!!" +e.Message);
|
||||
LogHelper.debug(typeof(WmsOutPickRequestService),e.StackTrace );
|
||||
LogHelper.debug(typeof(WmsOutPickRequestService), "!!!!!!!!!!!!!!!!!Exception !!!!!" + e.Message);
|
||||
LogHelper.debug(typeof(WmsOutPickRequestService), e.StackTrace);
|
||||
throw e;
|
||||
}
|
||||
finally
|
||||
|
|
@ -129,11 +129,11 @@ namespace DeiNiu.Wcf
|
|||
|
||||
public List<int> newPartPickWave()
|
||||
{
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
return lop.newPartPickWave();
|
||||
|
||||
return lop.newPartPickWave();
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
@ -141,7 +141,7 @@ namespace DeiNiu.Wcf
|
|||
}
|
||||
finally
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
static bool isProcessBatchWaveing = false;
|
||||
|
|
@ -173,13 +173,13 @@ namespace DeiNiu.Wcf
|
|||
{
|
||||
isProcessBatchWaveing = false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void finishCurrentWave(string waveNo,bool isForce)
|
||||
public void finishCurrentWave(string waveNo, bool isForce)
|
||||
{
|
||||
lop.finishCurrentWave(waveNo,isForce);
|
||||
lop.finishCurrentWave(waveNo, isForce);
|
||||
}
|
||||
|
||||
public void finishPartWave(int partion, bool isForce)
|
||||
|
|
@ -188,17 +188,17 @@ namespace DeiNiu.Wcf
|
|||
}
|
||||
|
||||
|
||||
// public bool completeBulkValidation(string pickOrderNo, int bulkBox, int bulkBag, DataTable validationDetails)
|
||||
// {
|
||||
// return lop.completeBulkValidation(pickOrderNo, bulkBox, bulkBag, validationDetails);
|
||||
// }
|
||||
// public bool completeBulkValidation(string pickOrderNo, int bulkBox, int bulkBag, DataTable validationDetails)
|
||||
// {
|
||||
// return lop.completeBulkValidation(pickOrderNo, bulkBox, bulkBag, validationDetails);
|
||||
// }
|
||||
public bool completeBulkValidation(string pickOrderNo, int bulkBox, int bulkBag)
|
||||
{
|
||||
|
||||
return lop.completeBulkValidation(pickOrderNo, bulkBox, bulkBag);
|
||||
|
||||
}
|
||||
public bool completeSeedsPack(string pickOrderNo, int bulkBox=0,int bulkBag=0)
|
||||
public bool completeSeedsPack(string pickOrderNo, int bulkBox = 0, int bulkBag = 0)
|
||||
{
|
||||
|
||||
return lop.completeSeedsPack(pickOrderNo, bulkBox, bulkBag);
|
||||
|
|
@ -206,7 +206,7 @@ namespace DeiNiu.Wcf
|
|||
}
|
||||
public bool completeBatchOut(string pickOrderNo)
|
||||
{
|
||||
return lop.updateBatchPickStatus(pickOrderNo,enumOutStockPickStatus.分拣完成);
|
||||
return lop.updateBatchPickStatus(pickOrderNo, enumOutStockPickStatus.分拣完成);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -225,11 +225,11 @@ namespace DeiNiu.Wcf
|
|||
{
|
||||
return lop.getWmsOutPickRequest.getBulkDetailInCurrentWave().Tables[0];
|
||||
}
|
||||
public DataTable getPartionBulkDetailInCurrentWave()
|
||||
public DataTable getPartionBulkDetailInCurrentWave()
|
||||
{
|
||||
return lop.getWmsOutPickRequest.getPartionBulkDetailInCurrentWave() ;
|
||||
return lop.getWmsOutPickRequest.getPartionBulkDetailInCurrentWave();
|
||||
}
|
||||
|
||||
|
||||
public DataTable getPickDetailByWaveOrder(string waveOrder)
|
||||
{
|
||||
return lop.getWmsOutPickRequest.getPickDetailByWaveOrder(waveOrder).Tables[0];
|
||||
|
|
@ -237,11 +237,11 @@ namespace DeiNiu.Wcf
|
|||
|
||||
public DataTable getBulkValidationException(int status)
|
||||
{
|
||||
return lop.getWmsOutPickRequest.getBulkValidationException((enumOutStockPickStatus)status ).Tables[0];
|
||||
return lop.getWmsOutPickRequest.getBulkValidationException((enumOutStockPickStatus)status).Tables[0];
|
||||
}
|
||||
public DataSet getBatchOutPickOrders4Pick()
|
||||
{
|
||||
return lop.getBatchOutPickOrders4Pick() ;
|
||||
return lop.getBatchOutPickOrders4Pick();
|
||||
}
|
||||
|
||||
public DataTable getBatchOutPickOrderDetails(string pickOrderNo)
|
||||
|
|
@ -253,23 +253,23 @@ namespace DeiNiu.Wcf
|
|||
{
|
||||
return lop.getBatchOutPickOrderPickDetails(pickOrderNo).Tables[0];
|
||||
}
|
||||
public DataTable getPickDetails(string orderNo,bool isPickOrder)
|
||||
public DataTable getPickDetails(string orderNo, bool isPickOrder)
|
||||
{
|
||||
return lop.getPickDetails(orderNo, isPickOrder).Tables[0];
|
||||
}
|
||||
public DataSet getPickOrderDetails(string orderNo)
|
||||
{
|
||||
return lop.getPickDetails(orderNo, true );
|
||||
return lop.getPickDetails(orderNo, true);
|
||||
}
|
||||
public DataTable getOrderLogs(string orderNo, bool isSaleOrder)
|
||||
{
|
||||
return lop.getOrderLogs(orderNo, isSaleOrder );
|
||||
return lop.getOrderLogs(orderNo, isSaleOrder);
|
||||
}
|
||||
|
||||
|
||||
public DataSet getPickRequest4BulkValidate(int desk)
|
||||
{
|
||||
return lop.getPickRequest4BulkValidate(desk) ;
|
||||
return lop.getPickRequest4BulkValidate(desk);
|
||||
}
|
||||
public DataSet getPickRequest4SeedsOperation(int desk, int seedsStatus, string seedsNo = "")
|
||||
{
|
||||
|
|
@ -280,9 +280,9 @@ namespace DeiNiu.Wcf
|
|||
{
|
||||
return lop.getWmsOutPickRequest.getPickDetailByPickOrderNo(pickOrder).Tables[0];
|
||||
}
|
||||
public DataTable getPickDetailBySeedsPickOrderNo(string pickOrder,int skuId)
|
||||
public DataTable getPickDetailBySeedsPickOrderNo(string pickOrder, int skuId)
|
||||
{
|
||||
return lop.getWmsOutPickRequest.getPickDetailBySeedsPickOrderNo(pickOrder,skuId).Tables[0];
|
||||
return lop.getWmsOutPickRequest.getPickDetailBySeedsPickOrderNo(pickOrder, skuId).Tables[0];
|
||||
}
|
||||
public DataTable getBulkValidationExceptionSolutions(int desk)
|
||||
{
|
||||
|
|
@ -300,17 +300,17 @@ namespace DeiNiu.Wcf
|
|||
{
|
||||
return new WmsOutPickLable().getPartPickedData((enumPickState)status).Tables[0];
|
||||
}
|
||||
public DataTable getCurrentPickList(int status )
|
||||
public DataTable getCurrentPickList(int status)
|
||||
{
|
||||
return new WmsOutPickLable().getCurrentPickList((enumPickState)status).Tables[0];
|
||||
}
|
||||
public DataTable getDpsPickList(string dpsOrder, int status)
|
||||
public DataTable getDpsPickList(string dpsOrder, int status)
|
||||
{
|
||||
return new WmsOutPickLable().getDpsPickList(dpsOrder,(enumPickState)status) ;
|
||||
return new WmsOutPickLable().getDpsPickList(dpsOrder, (enumPickState)status);
|
||||
}
|
||||
public DataTable getPartsPickList(int[] parts,int status)
|
||||
public DataTable getPartsPickList(int[] parts, int status)
|
||||
{
|
||||
return new WmsOutPickLable().getPartsPickList( parts,(enumPickState)status) ;
|
||||
return new WmsOutPickLable().getPartsPickList(parts, (enumPickState)status);
|
||||
}
|
||||
/// <summary>
|
||||
/// 取指定分区的，指定状态的亮灯数据
|
||||
|
|
@ -319,39 +319,39 @@ namespace DeiNiu.Wcf
|
|||
/// <param name="parts"></param>
|
||||
/// <param name="status"></param>
|
||||
/// <returns></returns>
|
||||
public DataTable getSeedDesksPickList(int part, int status)
|
||||
public DataTable getSeedDesksPickList(int part, int status)
|
||||
{
|
||||
return lop.getSeedDesksPickList(part, (enumPickState)status);
|
||||
}
|
||||
|
||||
public DataTable getRequests( int orderStatus)
|
||||
public DataTable getRequests(int orderStatus)
|
||||
{
|
||||
return lop.getWmsOutPickRequest.getRequests( (enumOutStockRequestStatus)orderStatus).Tables[0];
|
||||
return lop.getWmsOutPickRequest.getRequests((enumOutStockRequestStatus)orderStatus).Tables[0];
|
||||
}
|
||||
|
||||
public int getRequests4WaveCnt( int orderStatus)
|
||||
public int getRequests4WaveCnt(int orderStatus)
|
||||
{
|
||||
return lop.getWmsOutPickRequest.getRequests( (enumOutStockRequestStatus)orderStatus).Tables[0].Rows.Count;
|
||||
return lop.getWmsOutPickRequest.getRequests((enumOutStockRequestStatus)orderStatus).Tables[0].Rows.Count;
|
||||
}
|
||||
|
||||
public bool updatePickingStatus(int color, int labId, int address, decimal count)
|
||||
{
|
||||
return lop.updatePickingStatus(color, labId, count, address);
|
||||
}
|
||||
public bool updatePortPickingStatus(int userId,int color, int labId, int address, decimal count)
|
||||
public bool updatePickingStatus(int color, int labId, int address, decimal count)
|
||||
{
|
||||
return lop.updatePortPickingStatus(color, labId, count, address,userId);
|
||||
return lop.updatePickingStatus(color, labId, count, address);
|
||||
}
|
||||
public bool updatePortPickingStatus(int userId, int color, int labId, int address, decimal count)
|
||||
{
|
||||
return lop.updatePortPickingStatus(color, labId, count, address, userId);
|
||||
}
|
||||
|
||||
public bool updateSeedsPickingStatus(int color, int labId, int address, decimal count, int partion = -1)
|
||||
{
|
||||
return lop.updateSeedsPickingStatus(color, labId, count, address);
|
||||
}
|
||||
public bool updateValidBulkPickStatus(int id, int status, string remark, int reason, decimal count, int checkedBy1)
|
||||
{
|
||||
return lop.finishBulkValidateItem(id, status, remark, reason, count, checkedBy1);
|
||||
|
||||
}
|
||||
|
||||
public bool updateSeedsPickingStatus(int color, int labId, int address, decimal count,int partion=-1)
|
||||
{
|
||||
return lop.updateSeedsPickingStatus(color, labId, count, address);
|
||||
}
|
||||
public bool updateValidBulkPickStatus(int id, int status, string remark, int reason, decimal count,int checkedBy1)
|
||||
{
|
||||
return lop.finishBulkValidateItem( id, status, remark, reason, count, checkedBy1);
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// exception feedback
|
||||
/// </summary>
|
||||
|
|
@ -360,89 +360,89 @@ namespace DeiNiu.Wcf
|
|||
/// <param name="solution"></param>
|
||||
/// <param name="reason"></param>
|
||||
/// <returns></returns>
|
||||
public bool updateValidBulkPickExceptionStatus(int id, int status, string solution, int reason)
|
||||
{
|
||||
public bool updateValidBulkPickExceptionStatus(int id, int status, string solution, int reason)
|
||||
{
|
||||
|
||||
WmsOutPickDetail_tmp tmp = new WmsOutPickDetail_tmp(id);
|
||||
WmsOutPickDetail_tmp tmp = new WmsOutPickDetail_tmp(id);
|
||||
|
||||
tmp.bulkPickState = status;
|
||||
tmp.solutionRemark = solution;
|
||||
tmp.validSolution = reason;
|
||||
tmp.operater = getOperId();
|
||||
tmp.bulkPickState = status;
|
||||
tmp.solutionRemark = solution;
|
||||
tmp.validSolution = reason;
|
||||
tmp.operater = getOperId();
|
||||
|
||||
return tmp.Update() > 0;
|
||||
}
|
||||
return tmp.Update() > 0;
|
||||
}
|
||||
|
||||
|
||||
public bool updatePriority(string[] orders, int priority)
|
||||
{
|
||||
return lop.updatePriority(orders, priority, getOperId());
|
||||
}
|
||||
public bool updatePriority(string[] orders, int priority)
|
||||
{
|
||||
return lop.updatePriority(orders, priority, getOperId());
|
||||
}
|
||||
|
||||
|
||||
public void lightLables()
|
||||
{
|
||||
lop.lightLables();
|
||||
}
|
||||
public void lightLables()
|
||||
{
|
||||
lop.lightLables();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* seeds
|
||||
*/
|
||||
|
||||
public DataTable getSeedsGoods(string seedsNo)
|
||||
public DataTable getSeedsGoods(string seedsNo)
|
||||
{
|
||||
return lop.getSeedsGoods(seedsNo);
|
||||
}
|
||||
public DataSet getSeedsLightData(string seedsPickNo, string goodsId, string batch)
|
||||
{
|
||||
return new WmsOutPickRequest().getSeedsLightData(seedsPickNo, goodsId, batch) ;
|
||||
|
||||
}
|
||||
public int updateSeedingStatus(string seedsPickNo, string goodsId, string batch, int labId, int address, decimal count,int checkedBy2)
|
||||
{
|
||||
LogHelper.debug(typeof(WmsOutPickRequestService), "begin to update seeding pick.....>");
|
||||
return (int) lop.updateSeedingStatus(seedsPickNo, goodsId, batch, labId, address, count, checkedBy2);
|
||||
}
|
||||
public DataSet getSeedsLightData(string seedsPickNo, string goodsId, string batch)
|
||||
{
|
||||
return new WmsOutPickRequest().getSeedsLightData(seedsPickNo, goodsId, batch);
|
||||
|
||||
public DataTable getSeedsPackingData(int desk)
|
||||
{
|
||||
return lop.outPickTmp.getPackingData(desk);
|
||||
}
|
||||
}
|
||||
public int updateSeedingStatus(string seedsPickNo, string goodsId, string batch, int labId, int address, decimal count, int checkedBy2)
|
||||
{
|
||||
LogHelper.debug(typeof(WmsOutPickRequestService), "begin to update seeding pick.....>");
|
||||
return (int)lop.updateSeedingStatus(seedsPickNo, goodsId, batch, labId, address, count, checkedBy2);
|
||||
}
|
||||
|
||||
public DataTable getPackingDataByPickOrderNo(string pickOrderNo )
|
||||
public DataTable getSeedsPackingData(int desk)
|
||||
{
|
||||
return lop.outPickTmp.getPackingData(desk);
|
||||
}
|
||||
|
||||
public DataTable getPackingDataByPickOrderNo(string pickOrderNo)
|
||||
{
|
||||
return lop.outPickTmp.getPackingDataByPickOrderNo(pickOrderNo);
|
||||
}
|
||||
|
||||
|
||||
public DataTable getPickOrderTmsInfo(string pickOrderNo)
|
||||
{
|
||||
return lop.getPickOrderTmsInfo(pickOrderNo);
|
||||
}
|
||||
|
||||
public DataTable getPickOrderTmsInfo(string pickOrderNo)
|
||||
{
|
||||
return lop.getPickOrderTmsInfo(pickOrderNo);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 取wave 拣货明细，打印取货标签
|
||||
/// </summary>
|
||||
/// <param name="waveNo"></param>
|
||||
/// <returns></returns>
|
||||
public DataTable getPickVolInfo(string waveNo, int volType)
|
||||
{
|
||||
return lopp.getPickInfo(waveNo, volType);
|
||||
}
|
||||
public DataTable getPickInfo(string waveNo )
|
||||
{
|
||||
return lopp.getPickInfo(waveNo );
|
||||
}
|
||||
|
||||
public DataTable getPickSummary(string waveNo,int volType)
|
||||
{
|
||||
return lopp.getPickSummary(waveNo, volType);
|
||||
}
|
||||
|
||||
public DataTable getPickLightTasks(int takeBy,int partion ,int orderType )
|
||||
public DataTable getPickVolInfo(string waveNo, int volType)
|
||||
{
|
||||
return lopp.getPickLightTasks( takeBy, partion, orderType);
|
||||
return lopp.getPickInfo(waveNo, volType);
|
||||
}
|
||||
public DataTable getPickInfo(string waveNo)
|
||||
{
|
||||
return lopp.getPickInfo(waveNo);
|
||||
}
|
||||
|
||||
public DataTable getPickSummary(string waveNo, int volType)
|
||||
{
|
||||
return lopp.getPickSummary(waveNo, volType);
|
||||
}
|
||||
|
||||
public DataTable getPickLightTasks(int takeBy, int partion, int orderType)
|
||||
{
|
||||
return lopp.getPickLightTasks(takeBy, partion, orderType);
|
||||
}
|
||||
|
||||
public int clearJobLightTask(string jobNo)
|
||||
|
|
@ -451,83 +451,83 @@ namespace DeiNiu.Wcf
|
|||
}
|
||||
|
||||
public bool regBox(string boxid, string waveno, int color)
|
||||
{
|
||||
return lop.regBox(boxid, waveno, color);
|
||||
{
|
||||
return lop.regBox(boxid, waveno, color);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public DataSet getBoxRegWaves()
|
||||
{
|
||||
return lop.getBoxWaves();
|
||||
public DataSet getBoxRegWaves()
|
||||
{
|
||||
return lop.getBoxWaves();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public DataTable getBoxsByWave(string waveOrder, int color = -1)
|
||||
{
|
||||
return lop.getBoxsByWave(waveOrder, color);
|
||||
}
|
||||
public string getWaveNoByBoxId(string boxId)
|
||||
{
|
||||
return lop.getWaveNoByBoxId(boxId);
|
||||
}
|
||||
public DataTable getWaveDeskByBoxId(string boxId)
|
||||
{
|
||||
return lop.getWaveDeskByBoxId(boxId);
|
||||
}
|
||||
public DataTable getBoxsByWave(string waveOrder, int color = -1)
|
||||
{
|
||||
return lop.getBoxsByWave(waveOrder, color);
|
||||
}
|
||||
public string getWaveNoByBoxId(string boxId)
|
||||
{
|
||||
return lop.getWaveNoByBoxId(boxId);
|
||||
}
|
||||
public DataTable getWaveDeskByBoxId(string boxId)
|
||||
{
|
||||
return lop.getWaveDeskByBoxId(boxId);
|
||||
}
|
||||
|
||||
public DataTable getPartionPickDetailByBoxId(String boxId)
|
||||
{
|
||||
return lop.getPartionPickDetailByBoxId(boxId);
|
||||
}
|
||||
public DataTable getPartionPickDetailByBoxId(String boxId)
|
||||
{
|
||||
return lop.getPartionPickDetailByBoxId(boxId);
|
||||
}
|
||||
|
||||
public void switchLights(bool isOn)
|
||||
{
|
||||
WmsConstants.OUT_LIGHT_ENABLE = isOn;
|
||||
}
|
||||
public DataTable getBoxsByPickOrder(string pickOrderNo)
|
||||
{
|
||||
return lop.getBoxsByPickOrder(pickOrderNo);
|
||||
}
|
||||
public List<int> getPartsFinishIds()
|
||||
{
|
||||
return lop.getPartsFinishIds();
|
||||
}
|
||||
public void switchLights(bool isOn)
|
||||
{
|
||||
WmsConstants.OUT_LIGHT_ENABLE = isOn;
|
||||
}
|
||||
public DataTable getBoxsByPickOrder(string pickOrderNo)
|
||||
{
|
||||
return lop.getBoxsByPickOrder(pickOrderNo);
|
||||
}
|
||||
public List<int> getPartsFinishIds()
|
||||
{
|
||||
return lop.getPartsFinishIds();
|
||||
}
|
||||
|
||||
public void newPartionPick(string pickOrderNo, int partion)
|
||||
{
|
||||
lop.newPartionPick(pickOrderNo, partion);
|
||||
}
|
||||
public DataTable getOrderPickList(string orderNo, bool isPickOrder, int partion)
|
||||
{
|
||||
return lop.getOrderPickList(orderNo, isPickOrder, partion);
|
||||
}
|
||||
public void newPartionPick(string pickOrderNo, int partion)
|
||||
{
|
||||
lop.newPartionPick(pickOrderNo, partion);
|
||||
}
|
||||
public DataTable getOrderPickList(string orderNo, bool isPickOrder, int partion)
|
||||
{
|
||||
return lop.getOrderPickList(orderNo, isPickOrder, partion);
|
||||
}
|
||||
|
||||
public DataSet getWaves(string query, int rowStart, int rowEnd)
|
||||
{
|
||||
return lww.Query(query, rowStart, rowEnd);
|
||||
}
|
||||
public DataSet getWaves(string query, int rowStart, int rowEnd)
|
||||
{
|
||||
return lww.Query(query, rowStart, rowEnd);
|
||||
}
|
||||
|
||||
public DataSet getTasks(string query, int rowStart, int rowEnd)
|
||||
{
|
||||
return lopp.Query(query, rowStart, rowEnd);
|
||||
}
|
||||
public DataTable getRepTasks(int takeBy, int taskPartion)
|
||||
{
|
||||
return lopp.getRepTasks( takeBy, taskPartion );
|
||||
}
|
||||
public DataSet getTasks(string query, int rowStart, int rowEnd)
|
||||
{
|
||||
return lopp.Query(query, rowStart, rowEnd);
|
||||
}
|
||||
public DataTable getRepTasks(int takeBy, int taskPartion)
|
||||
{
|
||||
return lopp.getRepTasks(takeBy, taskPartion);
|
||||
}
|
||||
|
||||
|
||||
public DataSet getWaveDetailPages(string waveNo, int rowStart, int rowEnd)
|
||||
{
|
||||
return lopp.getWaveDetails(waveNo, rowStart, rowEnd);
|
||||
}
|
||||
public DataSet getWaveDetailPages(string waveNo, int rowStart, int rowEnd)
|
||||
{
|
||||
return lopp.getWaveDetails(waveNo, rowStart, rowEnd);
|
||||
}
|
||||
|
||||
public DataTable getWaveDetails(string waveNo)
|
||||
{
|
||||
return lopp.getWaveDetails(waveNo );
|
||||
}
|
||||
public DataTable getWaveDetails(string waveNo)
|
||||
{
|
||||
return lopp.getWaveDetails(waveNo);
|
||||
}
|
||||
|
||||
static bool isCreateWaveing = false;
|
||||
static bool isCreateWaveing = false;
|
||||
public bool createPickWaves()
|
||||
{
|
||||
log.Debug(" svc begin to createPickWaves...");
|
||||
|
|
@ -560,49 +560,49 @@ namespace DeiNiu.Wcf
|
|||
return ok;
|
||||
}
|
||||
|
||||
public int regSeedsPlate(string plateId, int partion)
|
||||
{
|
||||
return (int)lop.regSeedsPlate(plateId, partion);
|
||||
}
|
||||
|
||||
public DataTable getPlatePickList(string plateId, int partion)
|
||||
{
|
||||
return lop.getPlatePickList(plateId, partion);
|
||||
}
|
||||
|
||||
public DataTable getDeskList(int deskType)
|
||||
{
|
||||
return lop.getDeskList((enumDeskType)deskType);
|
||||
|
||||
}
|
||||
|
||||
public int setDeskFree(int deskId)
|
||||
{
|
||||
return lop.setDeskFree(deskId);
|
||||
}
|
||||
public int setPlateFree(string plateId)
|
||||
{
|
||||
return lop.setPlateFree(plateId);
|
||||
}
|
||||
|
||||
public DataTable getTaskAssigned(int operId, int partion, int lineId, bool batchOnly, int orderType)
|
||||
{
|
||||
return lopp.getAssignedTasks4Wince(operId, partion, lineId, batchOnly, (enumOrderType)orderType);
|
||||
}
|
||||
|
||||
public DataTable getDeskByColor(int color)
|
||||
{
|
||||
return new WmsOutDesk().getDeskByColor(color);
|
||||
}
|
||||
|
||||
public int setDeskAvailable(int color, bool isAvailable)
|
||||
{
|
||||
return ldesk.setAvailable(color, isAvailable);
|
||||
}
|
||||
|
||||
public DataTable lightByJob(int userId,string jobNo,bool isValid)
|
||||
public int regSeedsPlate(string plateId, int partion)
|
||||
{
|
||||
return lopp.prePareLightByJob(userId,jobNo,isValid);
|
||||
return (int)lop.regSeedsPlate(plateId, partion);
|
||||
}
|
||||
|
||||
public DataTable getPlatePickList(string plateId, int partion)
|
||||
{
|
||||
return lop.getPlatePickList(plateId, partion);
|
||||
}
|
||||
|
||||
public DataTable getDeskList(int deskType)
|
||||
{
|
||||
return lop.getDeskList((enumDeskType)deskType);
|
||||
|
||||
}
|
||||
|
||||
public int setDeskFree(int deskId)
|
||||
{
|
||||
return lop.setDeskFree(deskId);
|
||||
}
|
||||
public int setPlateFree(string plateId)
|
||||
{
|
||||
return lop.setPlateFree(plateId);
|
||||
}
|
||||
|
||||
public DataTable getTaskAssigned(int operId, int partion, int lineId, bool batchOnly, int orderType)
|
||||
{
|
||||
return lopp.getAssignedTasks4Wince(operId, partion, lineId, batchOnly, (enumOrderType)orderType);
|
||||
}
|
||||
|
||||
public DataTable getDeskByColor(int color)
|
||||
{
|
||||
return new WmsOutDesk().getDeskByColor(color);
|
||||
}
|
||||
|
||||
public int setDeskAvailable(int color, bool isAvailable)
|
||||
{
|
||||
return ldesk.setAvailable(color, isAvailable);
|
||||
}
|
||||
|
||||
public DataTable lightByJob(int userId, string jobNo, bool isValid)
|
||||
{
|
||||
return lopp.prePareLightByJob(userId, jobNo, isValid);
|
||||
}
|
||||
|
||||
public DataTable getRequestDtByTransNo(string transNo)
|
||||
|
|
@ -612,19 +612,24 @@ namespace DeiNiu.Wcf
|
|||
}
|
||||
|
||||
|
||||
public string assignTasks(int[] ids, int empId)
|
||||
public string assignTasks(int[] ids, int empId)
|
||||
{
|
||||
return lop.assignTasks(ids, empId);
|
||||
}
|
||||
|
||||
public DataTable getLightTasks(string query,int wareHouse,int partion, int lineId,int state,string date,bool isLight)
|
||||
public DataTable getLightTasks(string query, int wareHouse, int partion, int lineId, int state, string date, bool isLight)
|
||||
{
|
||||
return lopp.getLightTasks(query,wareHouse, partion, lineId, state,date,isLight);
|
||||
return lopp.getLightTasks(query, wareHouse, partion, lineId, state, date, isLight);
|
||||
}
|
||||
|
||||
public DataTable lightSeeds(int deskId, string flowno, string barcode, int userId, bool isValid)
|
||||
public DataTable lightSeeds(int deskId, string flowno, string barcode, int userId, bool isValid)
|
||||
{
|
||||
return lopp.prePareLightSeeds(deskId, flowno, barcode, userId, isValid);
|
||||
return lopp.prePareLightSeeds(deskId, flowno, barcode, userId, isValid);
|
||||
}
|
||||
|
||||
public enumRepResult seedsPickOut2(string flowNo, int skuId, string productDate, string batch, int outDetailId, decimal seedCnt, string toFlowNo, int inDetailId, bool isForceClose)
|
||||
{
|
||||
return lopp.seedsPickOut(flowNo, skuId, productDate, batch, outDetailId, seedCnt, toFlowNo, inDetailId, isForceClose);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue