add seedspick for pick svc for light seeds

This commit is contained in:
bobwang 2024-05-25 16:38:24 +08:00
parent 2c4f788bba
commit 1f22ed1e7e
2 changed files with 237 additions and 231 deletions

View File

@ -219,9 +219,10 @@ namespace DeiNiu.Wcf
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);
}
}

View File

@ -88,10 +88,10 @@ namespace DeiNiu.Wcf
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
@ -177,9 +177,9 @@ namespace DeiNiu.Wcf
}
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)
@ -198,7 +198,7 @@ namespace DeiNiu.Wcf
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.);
}
@ -227,7 +227,7 @@ namespace DeiNiu.Wcf
}
public DataTable getPartionBulkDetailInCurrentWave()
{
return lop.getWmsOutPickRequest.getPartionBulkDetailInCurrentWave() ;
return lop.getWmsOutPickRequest.getPartionBulkDetailInCurrentWave();
}
public DataTable getPickDetailByWaveOrder(string waveOrder)
@ -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)
{
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>
/// 取指定分区的,指定状态的亮灯数据
@ -324,32 +324,32 @@ namespace DeiNiu.Wcf
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 updatePortPickingStatus(int userId, int color, int labId, int address, decimal count)
{
return lop.updatePortPickingStatus(color, labId, count, address,userId);
return lop.updatePortPickingStatus(color, labId, count, address, userId);
}
public bool updateSeedsPickingStatus(int color, int labId, int address, decimal count,int partion=-1)
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)
public bool updateValidBulkPickStatus(int id, int status, string remark, int reason, decimal count, int checkedBy1)
{
return lop.finishBulkValidateItem( id, status, remark, reason, count, checkedBy1);
return lop.finishBulkValidateItem(id, status, remark, reason, count, checkedBy1);
}
/// <summary>
@ -396,13 +396,13 @@ namespace DeiNiu.Wcf
}
public DataSet getSeedsLightData(string seedsPickNo, string goodsId, string batch)
{
return new WmsOutPickRequest().getSeedsLightData(seedsPickNo, goodsId, 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)
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);
return (int)lop.updateSeedingStatus(seedsPickNo, goodsId, batch, labId, address, count, checkedBy2);
}
public DataTable getSeedsPackingData(int desk)
@ -410,7 +410,7 @@ namespace DeiNiu.Wcf
return lop.outPickTmp.getPackingData(desk);
}
public DataTable getPackingDataByPickOrderNo(string pickOrderNo )
public DataTable getPackingDataByPickOrderNo(string pickOrderNo)
{
return lop.outPickTmp.getPackingDataByPickOrderNo(pickOrderNo);
}
@ -430,19 +430,19 @@ namespace DeiNiu.Wcf
{
return lopp.getPickInfo(waveNo, volType);
}
public DataTable getPickInfo(string waveNo )
public DataTable getPickInfo(string waveNo)
{
return lopp.getPickInfo(waveNo );
return lopp.getPickInfo(waveNo);
}
public DataTable getPickSummary(string waveNo,int volType)
public DataTable getPickSummary(string waveNo, int volType)
{
return lopp.getPickSummary(waveNo, volType);
}
public DataTable getPickLightTasks(int takeBy,int partion ,int orderType )
public DataTable getPickLightTasks(int takeBy, int partion, int orderType)
{
return lopp.getPickLightTasks( takeBy, partion, orderType);
return lopp.getPickLightTasks(takeBy, partion, orderType);
}
public int clearJobLightTask(string jobNo)
@ -513,7 +513,7 @@ namespace DeiNiu.Wcf
}
public DataTable getRepTasks(int takeBy, int taskPartion)
{
return lopp.getRepTasks( takeBy, taskPartion );
return lopp.getRepTasks(takeBy, taskPartion);
}
@ -524,7 +524,7 @@ namespace DeiNiu.Wcf
public DataTable getWaveDetails(string waveNo)
{
return lopp.getWaveDetails(waveNo );
return lopp.getWaveDetails(waveNo);
}
static bool isCreateWaveing = false;
@ -600,9 +600,9 @@ namespace DeiNiu.Wcf
return ldesk.setAvailable(color, isAvailable);
}
public DataTable lightByJob(int userId,string jobNo,bool isValid)
public DataTable lightByJob(int userId, string jobNo, bool isValid)
{
return lopp.prePareLightByJob(userId,jobNo,isValid);
return lopp.prePareLightByJob(userId, jobNo, isValid);
}
public DataTable getRequestDtByTransNo(string transNo)
@ -617,14 +617,19 @@ namespace DeiNiu.Wcf
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)
{
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);
}
}
}