|
|
@ -450,9 +450,9 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public Integer approveInstockOrder(WmsInstockOrderBo bo) {
|
|
|
|
public Integer approveInstockOrder(WmsInstockOrderBo bo) {
|
|
|
|
String username = LoginHelper.getUsername();
|
|
|
|
String username = LoginHelper.getUsername();
|
|
|
|
if (!username.equals(bo.getAuditBy())){
|
|
|
|
// if (!username.equals(bo.getAuditBy())){
|
|
|
|
return 0;
|
|
|
|
// return 0;
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
WmsInstockOrder update = MapstructUtils.convert(bo, WmsInstockOrder.class);
|
|
|
|
WmsInstockOrder update = MapstructUtils.convert(bo, WmsInstockOrder.class);
|
|
|
|
validEntityBeforeSave(update);
|
|
|
|
validEntityBeforeSave(update);
|
|
|
|
update.setUpdateBy(username);
|
|
|
|
update.setUpdateBy(username);
|
|
|
@ -480,13 +480,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
|
|
|
|
int count = wmsInstockDetailService.deleteByInstockId(ids);
|
|
|
|
int count = wmsInstockDetailService.deleteByInstockId(ids);
|
|
|
|
return delete>0;
|
|
|
|
return delete>0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 创建外协入库单
|
|
|
|
|
|
|
|
* 1. 生成入库单号
|
|
|
|
|
|
|
|
* 2. 转换并保存入库单主表信息
|
|
|
|
|
|
|
|
* 3. 保存明细信息
|
|
|
|
|
|
|
|
* 4. 若明细中有批次号,则生成打印记录
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 创建外协入库单
|
|
|
|
* 创建外协入库单
|
|
|
|