|
@@ -403,18 +403,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbItem.setfPid(fPid);
|
|
|
wbItem.setCreateBy(loginUser.getUser().getUserName());
|
|
|
wbItem.setCreateTime(new Date());
|
|
|
- Long status = null;
|
|
|
- if (billsType.equals("SJRK")){
|
|
|
- wbItem.setfBillstatus("10");
|
|
|
- status=10l;
|
|
|
- } else if(billsType.equals("SJCK")){
|
|
|
- wbItem.setfBillstatus("60");
|
|
|
- status=60l;
|
|
|
- }
|
|
|
+ wbItem.setfBillstatus("10");
|
|
|
tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
|
|
|
if(!billsType.equals("HQZY")){
|
|
|
// 添加状态log
|
|
|
- insertTWarehousebillsLog(wbItem, status,loginUser);
|
|
|
+ insertTWarehousebillsLog(wbItem, 10l,loginUser);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -476,6 +469,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
@Transactional
|
|
|
public AjaxResult addCredit(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String billsType) {
|
|
|
Long fPid = null;
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
|
|
|
return AjaxResult.error("未找到主表信息");
|
|
|
}
|
|
@@ -522,8 +516,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
}
|
|
|
// 查询所有库存明细 修改仓库主表状态
|
|
|
updateWarehousebillsItemsStatus(tWarehouseBills);
|
|
|
- // 添加成功 主键返回 前台
|
|
|
- return AjaxResult.success(warehousebillsitems);
|
|
|
+ map.put("warehousebillsitems", warehousebillsitemsList);
|
|
|
+ return AjaxResult.success("成功", map);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -679,7 +673,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String status) {
|
|
|
+ public AjaxResult waitWarehousing(String warehouseBills, String warehousebillsitems, LoginUser loginUser, String status,String billtystatus) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
if (StringUtils.isNull(warehouseBills) || "[]".equals(warehouseBills)) {
|
|
|
return AjaxResult.error("未找到主表信息");
|
|
|
}
|
|
@@ -698,10 +693,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
// 生成流水号
|
|
|
Date time = new Date();
|
|
|
String serialNumber;
|
|
|
- if(status.equals("20")){ // 生成 入库 流水号
|
|
|
+ if(billtystatus.equals("20")){ // 生成 入库 流水号
|
|
|
serialNumber = billnoSerialServiceImpl.getSerialNumber("RK", time);
|
|
|
item.setfSerialNumber(serialNumber);
|
|
|
- } else if (status.equals("70")){ //生成 出库 流水号
|
|
|
+ } else if (billtystatus.equals("70")){ //生成 出库 流水号
|
|
|
serialNumber = billnoSerialServiceImpl.getSerialNumber("CK", time);
|
|
|
item.setfSerialNumber(serialNumber);
|
|
|
}
|
|
@@ -721,20 +716,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
item.setCreateBy(loginUser.getUser().getUserName());
|
|
|
num = tWarehousebillsitemsMapper.insertTWarehousebillsitems(item);
|
|
|
// 添加状态log
|
|
|
- if(status.equals("20")){
|
|
|
- insertTWarehousebillsLog(item,10L,loginUser);
|
|
|
- } else if(status.equals("70")){
|
|
|
- insertTWarehousebillsLog(item,60L,loginUser);
|
|
|
- }
|
|
|
+ insertTWarehousebillsLog(item,10L,loginUser);
|
|
|
insertTWarehousebillsLog(item,Long.parseLong(status),loginUser);
|
|
|
}
|
|
|
if (num <= 0) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("更新库存明细失败");
|
|
|
}
|
|
|
+ map.put("warehousebillsitems", item);
|
|
|
}
|
|
|
- // 返回从表数据明细
|
|
|
- return AjaxResult.success(warehousebillsitems);
|
|
|
+ // 添加成功 返回 前台
|
|
|
+ return AjaxResult.success("成功", map);
|
|
|
}
|
|
|
|
|
|
// 入库 收费明细 校验
|