|
|
|
@ -28,6 +28,8 @@ import jnpf.materialvo.entity.MaterialEntity;
|
|
|
|
|
import jnpf.materialvo.service.MaterialService;
|
|
|
|
|
import jnpf.poundlist.entity.PoundlistEntity;
|
|
|
|
|
import jnpf.poundlist.service.PoundlistService;
|
|
|
|
|
import jnpf.receiptin.entity.Receiptin_item0Entity;
|
|
|
|
|
import jnpf.receiptin.service.Receiptin_item0Service;
|
|
|
|
|
import jnpf.receiptout.entity.ReceiptoutEntity;
|
|
|
|
|
import jnpf.receiptout.entity.Receiptout_item0Entity;
|
|
|
|
|
import jnpf.receiptout.service.ReceiptoutService;
|
|
|
|
@ -141,6 +143,8 @@ public class SaleorderitemController {
|
|
|
|
|
private Arinvoices_item0Service arinvoices_item0Service;
|
|
|
|
|
@Autowired
|
|
|
|
|
private Arinvoices_item1Service arinvoices_item1Service;
|
|
|
|
|
@Autowired
|
|
|
|
|
private Receiptin_item0Service receiptin_item0Service;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 修改磅单单价
|
|
|
|
@ -176,16 +180,15 @@ public class SaleorderitemController {
|
|
|
|
|
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
|
|
|
|
|
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
|
|
|
|
|
for (Salesorder_item0Entity entity : dList){
|
|
|
|
|
QueryWrapper<MaterialEntity> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper2.lambda().eq(MaterialEntity::getId,entity.getMaterialId());
|
|
|
|
|
MaterialEntity materialEntity = materialService.getOne(queryWrapper2);
|
|
|
|
|
if (ObjectUtils.isNotEmpty(materialEntity)) {
|
|
|
|
|
entity.setReservoirareaId(materialEntity.getOutArea());
|
|
|
|
|
QueryWrapper<ReservoirareaEntity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper3.lambda().eq(ReservoirareaEntity::getId,materialEntity.getOutArea());
|
|
|
|
|
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getOne(queryWrapper3);
|
|
|
|
|
if (ObjectUtils.isNotEmpty(reservoirareaEntity)) {
|
|
|
|
|
entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
|
|
|
|
|
QueryWrapper<Receiptin_item0Entity> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper2.lambda().eq(Receiptin_item0Entity::getPoundlistId,entity.getPoundlistId());
|
|
|
|
|
List<Receiptin_item0Entity> receiptin_item0Entity = receiptin_item0Service.list(queryWrapper2);
|
|
|
|
|
if (receiptin_item0Entity.size()>0){
|
|
|
|
|
if (receiptin_item0Entity.get(0).getReservoirareaId() != null){
|
|
|
|
|
entity.setReservoirareaId(receiptin_item0Entity.get(0).getReservoirareaId());
|
|
|
|
|
}
|
|
|
|
|
if (receiptin_item0Entity.get(0).getWarehouseId() != null){
|
|
|
|
|
entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
@ -219,22 +222,20 @@ public class SaleorderitemController {
|
|
|
|
|
queryWrapper2.lambda().eq(ArinvoicesEntity::getSalesOrderId, id);
|
|
|
|
|
ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper2);
|
|
|
|
|
if (ObjectUtils.isNotEmpty(arinvoicesEntity)) {
|
|
|
|
|
QueryWrapper<SaleorderitemEntity> salesqueryWrapper = new QueryWrapper<>();
|
|
|
|
|
salesqueryWrapper.lambda().eq(SaleorderitemEntity::getId, id);
|
|
|
|
|
SaleorderitemEntity Entity = saleorderitemService.getOne(salesqueryWrapper);
|
|
|
|
|
if (!Entity.getStatus().equals("2")){
|
|
|
|
|
return ActionResult.fail("数据状态不能发票录入");
|
|
|
|
|
}
|
|
|
|
|
QueryWrapper<Arinvoices_item0Entity> queryWrapper3 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper3.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
|
List<Arinvoices_item0Entity> list0 = arinvoices_item0Service.list(queryWrapper3);
|
|
|
|
|
QueryWrapper<Arinvoices_item1Entity> queryWrapper4 = new QueryWrapper<>();
|
|
|
|
|
queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId());
|
|
|
|
|
List<Arinvoices_item1Entity> list1 = arinvoices_item1Service.list(queryWrapper4);
|
|
|
|
|
BigDecimal amount = new BigDecimal(0);
|
|
|
|
|
BigDecimal quantity = new BigDecimal(0);
|
|
|
|
|
for (Arinvoices_item1Entity entity : list1){
|
|
|
|
|
amount = amount.add(entity.getAmount());
|
|
|
|
|
quantity = quantity.add(entity.getQuantity());
|
|
|
|
|
}
|
|
|
|
|
arinvoicesEntity.setAmount(amount);
|
|
|
|
|
arinvoicesEntity.setQuantity(quantity);
|
|
|
|
|
arinvoicesEntity.setList0(list0);
|
|
|
|
|
arinvoicesEntity.setList1(list1);
|
|
|
|
|
arinvoicesEntity.setArinvoices_item0EntityList(list0);
|
|
|
|
|
arinvoicesEntity.setArinvoices_item1EntityList(list1);
|
|
|
|
|
return ActionResult.success(arinvoicesEntity);
|
|
|
|
|
}else {
|
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
@ -715,7 +716,7 @@ public class SaleorderitemController {
|
|
|
|
|
for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
|
|
|
|
|
Map<String,Object> vehicleIdMap = new HashMap<>();
|
|
|
|
|
jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap));
|
|
|
|
|
Map<String,Object> materialIdMap = new HashMap<>();
|
|
|
|
|
Map<String,Object> materialIdMap = new HashMap<>();
|
|
|
|
|
jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap));
|
|
|
|
|
}
|
|
|
|
|
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
|
|
|
|
|