修改批量出入库
This commit is contained in:
parent
3cdb4edea3
commit
82005ce2d4
|
|
@ -22,6 +22,8 @@ import cn.ysk.cashier.utils.PageUtil;
|
||||||
import cn.ysk.cashier.utils.QueryHelp;
|
import cn.ysk.cashier.utils.QueryHelp;
|
||||||
import cn.ysk.cashier.utils.ValidationUtil;
|
import cn.ysk.cashier.utils.ValidationUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.alibaba.fastjson.JSONArray;
|
||||||
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
|
|
@ -181,7 +183,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
|
||||||
operatorSnapMap.put("account", tbShopInfo.getAccount());
|
operatorSnapMap.put("account", tbShopInfo.getAccount());
|
||||||
|
|
||||||
stockOperate.setOperatorSnap(JSON.toJSONString(operatorSnapMap));
|
stockOperate.setOperatorSnap(JSON.toJSONString(operatorSnapMap));
|
||||||
stockOperate.setBatchNumber("");
|
|
||||||
stockOperate.setRemark("");
|
stockOperate.setRemark("");
|
||||||
stockOperate.setStockTime(System.currentTimeMillis());
|
stockOperate.setStockTime(System.currentTimeMillis());
|
||||||
stockOperate.setCreatedAt(System.currentTimeMillis());
|
stockOperate.setCreatedAt(System.currentTimeMillis());
|
||||||
|
|
@ -189,11 +190,11 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
|
||||||
stockOperate.setStatus("normal");
|
stockOperate.setStatus("normal");
|
||||||
stockOperate.setPurveyorId(resources.getSupplierId().toString());
|
stockOperate.setPurveyorId(resources.getSupplierId().toString());
|
||||||
stockOperate.setPurveyorName(purveyor.getPurveyorName());
|
stockOperate.setPurveyorName(purveyor.getPurveyorName());
|
||||||
|
JSONArray array=new JSONArray();
|
||||||
tbProductStockOperateRepository.save(stockOperate);
|
|
||||||
|
|
||||||
|
|
||||||
for (SuppFlow.ConInfos conInfos : resources.getList()) {
|
for (SuppFlow.ConInfos conInfos : resources.getList()) {
|
||||||
|
JSONObject object=new JSONObject();
|
||||||
|
|
||||||
TbConsInfo info = tbConsInfoRepository.getById(conInfos.getConInfold());
|
TbConsInfo info = tbConsInfoRepository.getById(conInfos.getConInfold());
|
||||||
if (Objects.isNull(info)) {
|
if (Objects.isNull(info)) {
|
||||||
|
|
@ -219,6 +220,8 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
|
||||||
suppFlow.setType(resources.getType());
|
suppFlow.setType(resources.getType());
|
||||||
suppFlow.setStockNumber(conInfos.getStockNumber());
|
suppFlow.setStockNumber(conInfos.getStockNumber());
|
||||||
|
|
||||||
|
BigDecimal amount=info.getStockNumber().subtract(info.getStockConsume());
|
||||||
|
|
||||||
|
|
||||||
if ("in".equals(resources.getType())) {
|
if ("in".equals(resources.getType())) {
|
||||||
info.setStockNumber(info.getStockNumber().add(conInfos.getStockNumber()));
|
info.setStockNumber(info.getStockNumber().add(conInfos.getStockNumber()));
|
||||||
|
|
@ -235,6 +238,8 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
|
||||||
purveyorTransact.setPaidAmount(resources.getActualPayment());
|
purveyorTransact.setPaidAmount(resources.getActualPayment());
|
||||||
purveyorTransact.setWaitAmount((resources.getAccountsPayable().subtract(resources.getActualPayment())));
|
purveyorTransact.setWaitAmount((resources.getAccountsPayable().subtract(resources.getActualPayment())));
|
||||||
purveyorTransact.setType("cons_in");
|
purveyorTransact.setType("cons_in");
|
||||||
|
|
||||||
|
object.put("number",conInfos.getStockNumber());
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
info.setStockNumber(info.getStockNumber().subtract(conInfos.getStockNumber()));
|
info.setStockNumber(info.getStockNumber().subtract(conInfos.getStockNumber()));
|
||||||
|
|
@ -252,6 +257,13 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
|
||||||
purveyorTransact.setType("cons_out");
|
purveyorTransact.setType("cons_out");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
object.put("stockNumber",amount);
|
||||||
|
|
||||||
|
object.put("name",info.getConName());
|
||||||
|
object.put("unitName",info.getConUnit());
|
||||||
|
array.add(object);
|
||||||
|
|
||||||
suppFlow.setPrice(conInfos.getPrice());
|
suppFlow.setPrice(conInfos.getPrice());
|
||||||
suppFlow.setAmount(conInfos.getStockNumber());
|
suppFlow.setAmount(conInfos.getStockNumber());
|
||||||
suppFlow.setAccountsPayable(resources.getAccountsPayable());
|
suppFlow.setAccountsPayable(resources.getAccountsPayable());
|
||||||
|
|
@ -287,6 +299,10 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
|
||||||
tbConsInfoFlowRepository.save(flow);
|
tbConsInfoFlowRepository.save(flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stockOperate.setBatchNumber(array.toJSONString());
|
||||||
|
tbProductStockOperateRepository.save(stockOperate);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue