|
|
|
@ -235,15 +235,17 @@ public class SaleorderitemController {
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public ActionResult delivery(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
public ActionResult delivery(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();//得到id集合
|
|
|
|
for (String id : idList){
|
|
|
|
for (String id : idList){
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"0");
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getStatus,"0");
|
|
|
|
|
|
|
|
//查询销售订单
|
|
|
|
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
|
|
|
|
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
|
|
|
|
|
|
|
|
//销售订单子表
|
|
|
|
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
for (Salesorder_item0Entity entity : dList){
|
|
|
|
for (Salesorder_item0Entity entity : dList){
|
|
|
|
QueryWrapper<Receiptin_item0Entity> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Receiptin_item0Entity> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
@ -254,6 +256,7 @@ public class SaleorderitemController {
|
|
|
|
entity.setReservoirareaId(receiptin_item0Entity.get(0).getReservoirareaId());
|
|
|
|
entity.setReservoirareaId(receiptin_item0Entity.get(0).getReservoirareaId());
|
|
|
|
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getReservoirareaId());
|
|
|
|
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getReservoirareaId());
|
|
|
|
if(reservoirareaEntity != null){
|
|
|
|
if(reservoirareaEntity != null){
|
|
|
|
|
|
|
|
//得到入库单的库区
|
|
|
|
entity.setReservoirareaName(reservoirareaEntity.getAreaname());
|
|
|
|
entity.setReservoirareaName(reservoirareaEntity.getAreaname());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -261,32 +264,33 @@ public class SaleorderitemController {
|
|
|
|
entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId());
|
|
|
|
entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId());
|
|
|
|
WareHouseEntity wareHouseEntity = wareHouseService.getById(entity.getWarehouseId());
|
|
|
|
WareHouseEntity wareHouseEntity = wareHouseService.getById(entity.getWarehouseId());
|
|
|
|
if(wareHouseEntity != null){
|
|
|
|
if(wareHouseEntity != null){
|
|
|
|
|
|
|
|
//得到入库单的仓库
|
|
|
|
entity.setWarehouseName(wareHouseEntity.getName());
|
|
|
|
entity.setWarehouseName(wareHouseEntity.getName());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId());
|
|
|
|
VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId());
|
|
|
|
if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){
|
|
|
|
if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){
|
|
|
|
entity.setVehicleName(vehicleEntity.getTicketno());
|
|
|
|
entity.setVehicleName(vehicleEntity.getTicketno());//得到车辆名称
|
|
|
|
}
|
|
|
|
}
|
|
|
|
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
|
|
|
|
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
|
|
|
|
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
|
|
|
|
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
|
|
|
|
entity.setMaterialName(materialEntity.getItemName());
|
|
|
|
entity.setMaterialName(materialEntity.getItemName());//得到物料名称
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtils.isNotEmpty(entity.getPoundlistId())) {
|
|
|
|
if (StringUtils.isNotEmpty(entity.getPoundlistId())) {
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getById(entity.getPoundlistId());
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getById(entity.getPoundlistId());
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
entity.setPoundEntity(poundlistEntity);//磅单
|
|
|
|
}
|
|
|
|
}
|
|
|
|
entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false));
|
|
|
|
entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false));//出库单批号
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){
|
|
|
|
CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
|
|
|
|
CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
|
|
|
|
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
|
|
|
|
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
|
|
|
|
saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());
|
|
|
|
saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());//客户名称
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo());
|
|
|
|
saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo());
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));//出库单单号
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
@ -307,6 +311,7 @@ public class SaleorderitemController {
|
|
|
|
public ActionResult invoiceEntry(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
public ActionResult invoiceEntry(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
for (String id : idList) {
|
|
|
|
for (String id : idList) {
|
|
|
|
|
|
|
|
//查询应收发票
|
|
|
|
List<ArinvoicesEntity> arinvoicesEntityList = saleorderitemService.queryArinvoicesInfo(id);
|
|
|
|
List<ArinvoicesEntity> arinvoicesEntityList = saleorderitemService.queryArinvoicesInfo(id);
|
|
|
|
if (arinvoicesEntityList!=null && arinvoicesEntityList.size()>0) {
|
|
|
|
if (arinvoicesEntityList!=null && arinvoicesEntityList.size()>0) {
|
|
|
|
SaleorderitemEntity Entity = saleorderitemService.getById(id);
|
|
|
|
SaleorderitemEntity Entity = saleorderitemService.getById(id);
|
|
|
|
@ -316,9 +321,11 @@ public class SaleorderitemController {
|
|
|
|
ArinvoicesEntity arinvoicesEntity = JsonUtil.getJsonToBean(arinvoicesEntityList.get(0), ArinvoicesEntity.class);
|
|
|
|
ArinvoicesEntity arinvoicesEntity = JsonUtil.getJsonToBean(arinvoicesEntityList.get(0), ArinvoicesEntity.class);
|
|
|
|
QueryWrapper<Arinvoices_item0Entity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Arinvoices_item0Entity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
queryWrapper3.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
queryWrapper3.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
|
|
|
|
//发票金额表
|
|
|
|
List<Arinvoices_item0Entity> list0 = arinvoices_item0Service.list(queryWrapper3);
|
|
|
|
List<Arinvoices_item0Entity> list0 = arinvoices_item0Service.list(queryWrapper3);
|
|
|
|
QueryWrapper<Arinvoices_item1Entity> queryWrapper4 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Arinvoices_item1Entity> queryWrapper4 = new QueryWrapper<>();
|
|
|
|
queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
|
|
|
|
//发票物料表
|
|
|
|
List<Arinvoices_item1Entity> list1 = arinvoices_item1Service.list(queryWrapper4);
|
|
|
|
List<Arinvoices_item1Entity> list1 = arinvoices_item1Service.list(queryWrapper4);
|
|
|
|
if (list0!=null && list0.size()>0){
|
|
|
|
if (list0!=null && list0.size()>0){
|
|
|
|
arinvoicesEntity.setArinvoices_item0EntityList(list0);
|
|
|
|
arinvoicesEntity.setArinvoices_item0EntityList(list0);
|
|
|
|
@ -327,7 +334,7 @@ public class SaleorderitemController {
|
|
|
|
for (Arinvoices_item1Entity entity : list1){
|
|
|
|
for (Arinvoices_item1Entity entity : list1){
|
|
|
|
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
|
|
|
|
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
|
|
|
|
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) {
|
|
|
|
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) {
|
|
|
|
entity.setMaterialName(materialEntity.getItemName());
|
|
|
|
entity.setMaterialName(materialEntity.getItemName());//物料名称
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
arinvoicesEntity.setArinvoices_item1EntityList(list1);
|
|
|
|
arinvoicesEntity.setArinvoices_item1EntityList(list1);
|
|
|
|
@ -335,6 +342,7 @@ public class SaleorderitemController {
|
|
|
|
return ActionResult.success(arinvoicesEntity);
|
|
|
|
return ActionResult.success(arinvoicesEntity);
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
|
|
|
|
//查询销售订单
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId, id);
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId, id);
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getStatus, "1");
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getStatus, "1");
|
|
|
|
@ -342,31 +350,34 @@ public class SaleorderitemController {
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
|
|
|
|
|
|
|
|
//销售订单子表
|
|
|
|
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
for (Salesorder_item0Entity entity : dList) {
|
|
|
|
for (Salesorder_item0Entity entity : dList) {
|
|
|
|
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
|
|
|
|
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
|
|
|
|
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
|
|
|
|
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
|
|
|
|
entity.setMaterialName(materialEntity.getItemName());
|
|
|
|
entity.setMaterialName(materialEntity.getItemName());//物料名称
|
|
|
|
}
|
|
|
|
}
|
|
|
|
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
queryWrapper3.lambda().eq(PoundlistEntity::getId, entity.getPoundlistId());
|
|
|
|
queryWrapper3.lambda().eq(PoundlistEntity::getId, entity.getPoundlistId());
|
|
|
|
|
|
|
|
//查询磅单
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())) {
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())) {
|
|
|
|
ContractFileEntity contractFileEntity = contractFileService.getById(saleorderitemEntity.getContractId());
|
|
|
|
ContractFileEntity contractFileEntity = contractFileService.getById(saleorderitemEntity.getContractId());
|
|
|
|
if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName()));{
|
|
|
|
if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName()));{
|
|
|
|
saleorderitemEntity.setContractName(contractFileEntity.getContractName());
|
|
|
|
saleorderitemEntity.setContractName(contractFileEntity.getContractName());//合同名称
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){
|
|
|
|
CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
|
|
|
|
CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
|
|
|
|
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
|
|
|
|
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
|
|
|
|
saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());
|
|
|
|
saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());//客户名称
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo());
|
|
|
|
saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo());
|
|
|
|
|
|
|
|
//应收发票单号
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
return ActionResult.success(list);
|
|
|
|
return ActionResult.success(list);
|
|
|
|
@ -391,6 +402,7 @@ public class SaleorderitemController {
|
|
|
|
for (String id : idList) {
|
|
|
|
for (String id : idList) {
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
|
|
|
|
|
|
|
|
//查询销售订单
|
|
|
|
SaleorderitemEntity sale = saleorderitemService.getOne(queryWrapper);
|
|
|
|
SaleorderitemEntity sale = saleorderitemService.getOne(queryWrapper);
|
|
|
|
if (ObjectUtils.isNotEmpty(sale)){
|
|
|
|
if (ObjectUtils.isNotEmpty(sale)){
|
|
|
|
// if (sale.getStatus().equals("3")){
|
|
|
|
// if (sale.getStatus().equals("3")){
|
|
|
|
@ -400,20 +412,21 @@ public class SaleorderitemController {
|
|
|
|
sale.setAmountCollected(new BigDecimal(0));
|
|
|
|
sale.setAmountCollected(new BigDecimal(0));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (sale.getPrice().compareTo(sale.getInvoiceAmount()) == 0 && sale.getPrice().compareTo(sale.getAmountCollected()) == 0){
|
|
|
|
if (sale.getPrice().compareTo(sale.getInvoiceAmount()) == 0 && sale.getPrice().compareTo(sale.getAmountCollected()) == 0){
|
|
|
|
sale.setStatus("3");
|
|
|
|
sale.setStatus("3");//销售状态为归档
|
|
|
|
saleorderitemService.updateById(sale);
|
|
|
|
saleorderitemService.updateById(sale);
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,sale.getId());
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId,sale.getId());
|
|
|
|
|
|
|
|
//销售订单子表
|
|
|
|
List<Salesorder_item0Entity> salesorder_item0EntityList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
List<Salesorder_item0Entity> salesorder_item0EntityList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
if (salesorder_item0EntityList !=null && salesorder_item0EntityList.size()>0){
|
|
|
|
if (salesorder_item0EntityList !=null && salesorder_item0EntityList.size()>0){
|
|
|
|
for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList){
|
|
|
|
for (Salesorder_item0Entity salesorder_item0Entity : salesorder_item0EntityList){
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
|
|
|
|
if (ObjectUtils.isNotEmpty(poundlistEntity)){
|
|
|
|
if (ObjectUtils.isNotEmpty(poundlistEntity)){
|
|
|
|
if (poundlistEntity.getPaymentDate() == null){
|
|
|
|
if (poundlistEntity.getPaymentDate() == null){
|
|
|
|
poundlistEntity.setIsCollection("1");
|
|
|
|
poundlistEntity.setIsCollection("1");//已收款
|
|
|
|
poundlistEntity.setPaymentDate(new Date());
|
|
|
|
poundlistEntity.setPaymentDate(new Date());//付款日期
|
|
|
|
}
|
|
|
|
}
|
|
|
|
poundlistEntity.setSalesStatus("3");//修改磅单状态
|
|
|
|
poundlistEntity.setSalesStatus("3");//修改磅单销售状态
|
|
|
|
poundlistService.updateById(poundlistEntity);
|
|
|
|
poundlistService.updateById(poundlistEntity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -438,12 +451,14 @@ public class SaleorderitemController {
|
|
|
|
@Transactional
|
|
|
|
@Transactional
|
|
|
|
public ActionResult materialBack(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
public ActionResult materialBack(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();//id集合
|
|
|
|
for (String id : idList){
|
|
|
|
for (String id : idList){
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<SaleorderitemEntity> queryWrapper = new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
|
|
|
|
queryWrapper.lambda().eq(SaleorderitemEntity::getId,id);
|
|
|
|
|
|
|
|
//销售订单
|
|
|
|
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
|
|
|
|
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper);
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
if (ObjectUtils.isNotEmpty(saleorderitemEntity)) {
|
|
|
|
|
|
|
|
//判断订单状态
|
|
|
|
if (saleorderitemEntity.getStatus().equals("0")){
|
|
|
|
if (saleorderitemEntity.getStatus().equals("0")){
|
|
|
|
return ActionResult.fail("未发货，无需退货");
|
|
|
|
return ActionResult.fail("未发货，无需退货");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -452,15 +467,17 @@ public class SaleorderitemController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper1 = new QueryWrapper<>();
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
|
|
|
|
|
|
|
|
//销售订单子表
|
|
|
|
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
for (Salesorder_item0Entity entity : dList){
|
|
|
|
for (Salesorder_item0Entity entity : dList){
|
|
|
|
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
|
|
|
|
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
|
|
|
|
|
|
|
|
//磅单
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));//销售退货单号
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
return ActionResult.fail("未找到该数据");
|
|
|
|
return ActionResult.fail("未找到该数据");
|
|
|
|
@ -496,7 +513,8 @@ public class SaleorderitemController {
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sale.setList(dList);
|
|
|
|
sale.setList(dList);
|
|
|
|
sale.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
|
|
|
|
sale.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));//回款单号
|
|
|
|
|
|
|
|
//金额-已回款金额=默认回款金额
|
|
|
|
BigDecimal amount = sale.getPrice().subtract(sale.getAmountCollected());
|
|
|
|
BigDecimal amount = sale.getPrice().subtract(sale.getAmountCollected());
|
|
|
|
sale.setAmount(amount);
|
|
|
|
sale.setAmount(amount);
|
|
|
|
list.add(sale);
|
|
|
|
list.add(sale);
|
|
|
|
@ -669,12 +687,14 @@ public class SaleorderitemController {
|
|
|
|
|
|
|
|
|
|
|
|
for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
|
|
|
|
for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
|
|
|
|
|
|
|
|
//判断磅单状态
|
|
|
|
if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getPurchaseStatus() != null){
|
|
|
|
if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getPurchaseStatus() != null){
|
|
|
|
if (poundlistEntity.getPurchaseStatus().equals("99") || poundlistEntity.getPurchaseStatus().equals("0") || poundlistEntity.getPurchaseStatus().equals("1")){
|
|
|
|
if (poundlistEntity.getPurchaseStatus().equals("99") || poundlistEntity.getPurchaseStatus().equals("0") || poundlistEntity.getPurchaseStatus().equals("1")){
|
|
|
|
return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开票或未入库");
|
|
|
|
return ActionResult.fail("存在磅单号为【磅单号-"+poundlistEntity.getPoundlistNo()+"】未开票或未入库");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getSettlement() != null){
|
|
|
|
if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getSettlement() != null){
|
|
|
|
|
|
|
|
//判断结算重量
|
|
|
|
if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) > 0){
|
|
|
|
if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) > 0){
|
|
|
|
VehicleEntity vehicleEntity = vehicleService.getById(poundlistEntity.getVehicleId());
|
|
|
|
VehicleEntity vehicleEntity = vehicleService.getById(poundlistEntity.getVehicleId());
|
|
|
|
if (ObjectUtils.isNotEmpty(vehicleEntity)) {
|
|
|
|
if (ObjectUtils.isNotEmpty(vehicleEntity)) {
|
|
|
|
@ -685,14 +705,16 @@ public class SaleorderitemController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
String mainId =RandomUtil.uuId();
|
|
|
|
String mainId =RandomUtil.uuId();//uuid
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
// saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
|
|
|
|
// saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
|
|
|
|
saleorderitemCrForm.setCreatorUserName(userInfo.getUserId());
|
|
|
|
saleorderitemCrForm.setCreatorUserName(userInfo.getUserId());
|
|
|
|
saleorderitemCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
saleorderitemCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
|
|
|
|
//销售订单
|
|
|
|
SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderitemCrForm, SaleorderitemEntity.class);
|
|
|
|
SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderitemCrForm, SaleorderitemEntity.class);
|
|
|
|
entity.setId(mainId);
|
|
|
|
entity.setId(mainId);
|
|
|
|
if (entity.getPrice() != null && entity.getNotPrice()!=null) {
|
|
|
|
if (entity.getPrice() != null && entity.getNotPrice()!=null) {
|
|
|
|
|
|
|
|
//计算税额
|
|
|
|
entity.setRate(entity.getPrice().subtract(entity.getNotPrice()));
|
|
|
|
entity.setRate(entity.getPrice().subtract(entity.getNotPrice()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
|
|
|
|
@ -703,16 +725,17 @@ public class SaleorderitemController {
|
|
|
|
for(Salesorder_item0Entity entitys : Salesorder_item0List){
|
|
|
|
for(Salesorder_item0Entity entitys : Salesorder_item0List){
|
|
|
|
if (entitys.getUnitPrice() != null && entitys.getPoundlistId() !=null) {
|
|
|
|
if (entitys.getUnitPrice() != null && entitys.getPoundlistId() !=null) {
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(entitys.getPoundlistId());
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(entitys.getPoundlistId());
|
|
|
|
poundlistEntity.setSalesStatus("0");
|
|
|
|
poundlistEntity.setSalesStatus("0");//销售状态
|
|
|
|
poundlistEntity.setSalesPrice(entitys.getUnitPrice());
|
|
|
|
poundlistEntity.setSalesPrice(entitys.getUnitPrice());//销售单价
|
|
|
|
poundlistEntity.setSalesorderId(entity.getId());
|
|
|
|
poundlistEntity.setSalesorderId(entity.getId());
|
|
|
|
poundlistEntity.setSalesAmounts(entitys.getPrice());
|
|
|
|
poundlistEntity.setSalesAmounts(entitys.getPrice());//销售金额
|
|
|
|
poundlistService.updateById(poundlistEntity);
|
|
|
|
poundlistService.updateById(poundlistEntity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
entitys.setSalesOrderId(entity.getId());
|
|
|
|
entitys.setSalesOrderId(entity.getId());
|
|
|
|
salesorder_item0Service.save(entitys);
|
|
|
|
salesorder_item0Service.save(entitys);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//更新采购订单
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
|
|
|
|
if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
|
|
|
|
JSONArray array = JSON.parseArray(saleorderitemCrForm.getPurchaseOrderId());
|
|
|
|
JSONArray array = JSON.parseArray(saleorderitemCrForm.getPurchaseOrderId());
|
|
|
|
for (Object purchaseId : array) {
|
|
|
|
for (Object purchaseId : array) {
|
|
|
|
@ -1214,6 +1237,7 @@ public class SaleorderitemController {
|
|
|
|
if (saleorderitemUpForm.getBusinessDate() != null){
|
|
|
|
if (saleorderitemUpForm.getBusinessDate() != null){
|
|
|
|
date = simpleDateFormat.format(saleorderitemUpForm.getBusinessDate());
|
|
|
|
date = simpleDateFormat.format(saleorderitemUpForm.getBusinessDate());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//判断账期
|
|
|
|
List<AccountingEntity> list = accountingMapper.queryAccounting(date);
|
|
|
|
List<AccountingEntity> list = accountingMapper.queryAccounting(date);
|
|
|
|
if (list!=null && list.size()>0){
|
|
|
|
if (list!=null && list.size()>0){
|
|
|
|
if (list.get(0).getStatus().equals("1")){
|
|
|
|
if (list.get(0).getStatus().equals("1")){
|
|
|
|
@ -1225,6 +1249,7 @@ public class SaleorderitemController {
|
|
|
|
List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemUpForm.getSalesorder_item0List(),Salesorder_item0Entity.class);
|
|
|
|
List<Salesorder_item0Entity> Salesorder_item0List = JsonUtil.getJsonToList(saleorderitemUpForm.getSalesorder_item0List(),Salesorder_item0Entity.class);
|
|
|
|
for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
|
|
|
|
for (Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getInfo(salesorder_item0Entity.getPoundlistId());
|
|
|
|
|
|
|
|
//磅单判断
|
|
|
|
if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getSettlement() != null){
|
|
|
|
if(ObjectUtils.isNotEmpty(poundlistEntity) && poundlistEntity.getSettlement() != null){
|
|
|
|
if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) > 0){
|
|
|
|
if (salesorder_item0Entity.getSettlement().compareTo(poundlistEntity.getSettlement()) > 0){
|
|
|
|
VehicleEntity vehicleEntity = vehicleService.getById(poundlistEntity.getVehicleId());
|
|
|
|
VehicleEntity vehicleEntity = vehicleService.getById(poundlistEntity.getVehicleId());
|
|
|
|
@ -1242,8 +1267,9 @@ public class SaleorderitemController {
|
|
|
|
SaleorderitemEntity subentity=JsonUtil.getJsonToBean(saleorderitemUpForm, SaleorderitemEntity.class);
|
|
|
|
SaleorderitemEntity subentity=JsonUtil.getJsonToBean(saleorderitemUpForm, SaleorderitemEntity.class);
|
|
|
|
subentity.setCreatorUserName(entity.getCreatorUserName());
|
|
|
|
subentity.setCreatorUserName(entity.getCreatorUserName());
|
|
|
|
subentity.setCreatorTime(entity.getCreatorTime());
|
|
|
|
subentity.setCreatorTime(entity.getCreatorTime());
|
|
|
|
saleorderitemService.update(id, subentity);
|
|
|
|
saleorderitemService.update(id, subentity);//更新主表
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//更新子表
|
|
|
|
QueryWrapper<Salesorder_item0Entity> Salesorder_item0queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Salesorder_item0Entity> Salesorder_item0queryWrapper = new QueryWrapper<>();
|
|
|
|
Salesorder_item0queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, entity.getId());
|
|
|
|
Salesorder_item0queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId, entity.getId());
|
|
|
|
salesorder_item0Service.remove(Salesorder_item0queryWrapper);
|
|
|
|
salesorder_item0Service.remove(Salesorder_item0queryWrapper);
|
|
|
|
@ -1405,6 +1431,7 @@ public class SaleorderitemController {
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper = new QueryWrapper<>();
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapper = new QueryWrapper<>();
|
|
|
|
queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
|
|
|
|
queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
|
|
|
|
queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId);
|
|
|
|
queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId);
|
|
|
|
|
|
|
|
//查询磅单id
|
|
|
|
List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
|
|
|
|
List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
|
|
|
|
List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
|
|
|
|
List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
|
|
|
|
for (PoundlistEntity poundlistEntity: poundlistList) {
|
|
|
|
for (PoundlistEntity poundlistEntity: poundlistList) {
|
|
|
|
@ -1416,12 +1443,13 @@ public class SaleorderitemController {
|
|
|
|
poundlistEntity.setPayDate(null);
|
|
|
|
poundlistEntity.setPayDate(null);
|
|
|
|
poundlistEntity.setSalesorderId(null);
|
|
|
|
poundlistEntity.setSalesorderId(null);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//批量更新磅单
|
|
|
|
poundlistService.updateBatchById(poundlistList);
|
|
|
|
poundlistService.updateBatchById(poundlistList);
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapperSalesorder_item0=new QueryWrapper<>();
|
|
|
|
QueryWrapper<Salesorder_item0Entity> queryWrapperSalesorder_item0=new QueryWrapper<>();
|
|
|
|
queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
|
|
|
|
queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
|
|
|
|
salesorder_item0Service.remove(queryWrapperSalesorder_item0);
|
|
|
|
salesorder_item0Service.remove(queryWrapperSalesorder_item0);
|
|
|
|
|
|
|
|
//删除出库单
|
|
|
|
QueryWrapper<ReceiptoutEntity> receiptoutEntityQueryWrapper=new QueryWrapper<>();
|
|
|
|
QueryWrapper<ReceiptoutEntity> receiptoutEntityQueryWrapper=new QueryWrapper<>();
|
|
|
|
receiptoutEntityQueryWrapper.lambda().eq(ReceiptoutEntity::getSourceNo,entity.getId());
|
|
|
|
receiptoutEntityQueryWrapper.lambda().eq(ReceiptoutEntity::getSourceNo,entity.getId());
|
|
|
|
List<ReceiptoutEntity> Receiptoutlist = receiptoutService.list(receiptoutEntityQueryWrapper);
|
|
|
|
List<ReceiptoutEntity> Receiptoutlist = receiptoutService.list(receiptoutEntityQueryWrapper);
|
|
|
|
@ -1432,6 +1460,7 @@ public class SaleorderitemController {
|
|
|
|
receiptout_item0EntityQueryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId,receiptoutid);
|
|
|
|
receiptout_item0EntityQueryWrapper.lambda().eq(Receiptout_item0Entity::getReceiptinId,receiptoutid);
|
|
|
|
receiptout_item0Service.remove(receiptout_item0EntityQueryWrapper);
|
|
|
|
receiptout_item0Service.remove(receiptout_item0EntityQueryWrapper);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//删除应收发票
|
|
|
|
QueryWrapper<ArinvoicesEntity> arinvoicesEntityQueryWrapper=new QueryWrapper<>();
|
|
|
|
QueryWrapper<ArinvoicesEntity> arinvoicesEntityQueryWrapper=new QueryWrapper<>();
|
|
|
|
arinvoicesEntityQueryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,entity.getId());
|
|
|
|
arinvoicesEntityQueryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,entity.getId());
|
|
|
|
List<ArinvoicesEntity> arinvoicesList = arinvoicesService.list(arinvoicesEntityQueryWrapper);
|
|
|
|
List<ArinvoicesEntity> arinvoicesList = arinvoicesService.list(arinvoicesEntityQueryWrapper);
|
|
|
|
@ -1445,6 +1474,7 @@ public class SaleorderitemController {
|
|
|
|
queryWrapperArinvoices_item1soitem.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesid);
|
|
|
|
queryWrapperArinvoices_item1soitem.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesid);
|
|
|
|
arinvoices_item1Service.remove(queryWrapperArinvoices_item1soitem);
|
|
|
|
arinvoices_item1Service.remove(queryWrapperArinvoices_item1soitem);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//删除收款单
|
|
|
|
QueryWrapper<Collection_item0Entity> collectionItem0EntityQueryWrapper=new QueryWrapper<>();
|
|
|
|
QueryWrapper<Collection_item0Entity> collectionItem0EntityQueryWrapper=new QueryWrapper<>();
|
|
|
|
collectionItem0EntityQueryWrapper.lambda().eq(Collection_item0Entity::getSalesorderId,entity.getId());
|
|
|
|
collectionItem0EntityQueryWrapper.lambda().eq(Collection_item0Entity::getSalesorderId,entity.getId());
|
|
|
|
List<Collection_item0Entity> Collection_item0list = collection_item0Service.list(collectionItem0EntityQueryWrapper);
|
|
|
|
List<Collection_item0Entity> Collection_item0list = collection_item0Service.list(collectionItem0EntityQueryWrapper);
|
|
|
|
@ -1455,7 +1485,7 @@ public class SaleorderitemController {
|
|
|
|
queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getId,collectionitem0id);
|
|
|
|
queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getId,collectionitem0id);
|
|
|
|
collectionsoitemService.remove(queryWrapperCollectionsoitem);
|
|
|
|
collectionsoitemService.remove(queryWrapperCollectionsoitem);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//删除销售退货
|
|
|
|
QueryWrapper<SalesbacksoitemEntity> queryWrapperSalesbacksoitem=new QueryWrapper<>();
|
|
|
|
QueryWrapper<SalesbacksoitemEntity> queryWrapperSalesbacksoitem=new QueryWrapper<>();
|
|
|
|
queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId());
|
|
|
|
queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId());
|
|
|
|
List<SalesbacksoitemEntity> salesbacksoitemList = salesbacksoitemService.list(queryWrapperSalesbacksoitem);
|
|
|
|
List<SalesbacksoitemEntity> salesbacksoitemList = salesbacksoitemService.list(queryWrapperSalesbacksoitem);
|
|
|
|
@ -1481,7 +1511,7 @@ public class SaleorderitemController {
|
|
|
|
if (purList.size() > 0) {
|
|
|
|
if (purList.size() > 0) {
|
|
|
|
List<PurchaseorderitemEntity> puridlist = purchaseorderitemService.listByIds(purList);
|
|
|
|
List<PurchaseorderitemEntity> puridlist = purchaseorderitemService.listByIds(purList);
|
|
|
|
for (PurchaseorderitemEntity purchaseorderitem : puridlist) {
|
|
|
|
for (PurchaseorderitemEntity purchaseorderitem : puridlist) {
|
|
|
|
purchaseorderitem.setIsTransfer("0");
|
|
|
|
purchaseorderitem.setIsTransfer("0");//未转销售
|
|
|
|
// purchaseorderitem.setRemark("复磴承香阁");
|
|
|
|
// purchaseorderitem.setRemark("复磴承香阁");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
purchaseorderitemService.updateBatchById(puridlist);
|
|
|
|
purchaseorderitemService.updateBatchById(puridlist);
|
|
|
|
|
