Merge remote-tracking branch 'origin/main'

product
chuang 2 years ago
commit d2a03ebcea

@ -68,4 +68,7 @@
WHERE 1=1 AND o.F_Completion = 0 AND t.F_Status = 1 AND o.F_State = '0' ${sql}
</select>
<update id="updatePurchaseorder" parameterType="String">
UPDATE jg_purchaseorder SET is_payment = '0' WHERE id IN (SELECT purchaseorder_id FROM jg_paymentdoc_item0 WHERE paymentdoc_id = #{paymentdocId})
</update>
</mapper>

@ -36,7 +36,10 @@ public class UserProvider {
// UserInfo userInfo = this.get();
return getUserMapper.getDepartmentId(userId).get(0).get("F_DepartmentId");
}
public String getOrganizeId(String userId){
// UserInfo userInfo = this.get();
return getUserMapper.getOrganiId(userId).get(0).get("F_OrganizeId");
}
/**

@ -19,4 +19,6 @@ public interface GetUserMapper extends BaseMapper<UserGetUserEntity> {
@Select("SELECT * FROM base_user WHERE f_id=#{id}")
List<Map<String,String>> getDepartmentId(@Param("id")String id);
@Select("SELECT * FROM base_user WHERE f_id=#{id}")
List<Map<String,String>> getOrganiId(@Param("id")String id);
}

@ -14,14 +14,21 @@ import jnpf.base.vo.PaginationVO;
import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.contractfile.service.ContractFileService;
import jnpf.customer.entity.CustomerEntity;
import jnpf.customer.service.CustomerService;
import jnpf.contractfile.entity.ContractFileEntity;
import jnpf.exception.DataException;
import jnpf.invoices.entity.InvoicesItem0Entity;
import jnpf.materialvo.entity.MaterialEntity;
import jnpf.materialvo.service.MaterialService;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.service.SaleorderitemService;
import jnpf.saleorder.service.Salesorder_item0Service;
import jnpf.service.ContractService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
@ -92,6 +99,12 @@ public class ArinvoicesController {
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private PoundlistService poundlistService;
@Autowired
private MaterialService materialService;
@Autowired
private ContractFileService contractFileService;
@Autowired
private CustomerService customerService;
@ -352,11 +365,33 @@ public class ArinvoicesController {
//子表
List<Arinvoices_item1Entity> Arinvoices_item1List = arinvoicesService.GetArinvoices_item1List(id);
for(Arinvoices_item1Entity arinvoices_item1Entity : Arinvoices_item1List){
MaterialEntity materialEntity = materialService.getById(arinvoices_item1Entity.getMaterialId());
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) {
arinvoices_item1Entity.setMaterialName(materialEntity.getItemName());
}
}
vo.setArinvoices_item1List(JsonUtil.getJsonToList(Arinvoices_item1List,Arinvoices_item1Model.class ));
List<Arinvoices_item0Entity> Arinvoices_item0List = arinvoicesService.GetArinvoices_item0List(id);
for(Arinvoices_item0Entity arinvoices_item0Entity : Arinvoices_item0List){
}
if (vo.getSalesOrderId()!=null) {
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(vo.getSalesOrderId());
if (ObjectUtils.isNotEmpty(saleorderitemEntity) && StringUtils.isNotEmpty(saleorderitemEntity.getDocumentNo())){
vo.setSourceName(saleorderitemEntity.getDocumentNo());
}
}
if (vo.getContractId()!=null){
ContractFileEntity contractEntity = contractFileService.getById(vo.getContractId());
if (ObjectUtils.isNotEmpty(contractEntity) && StringUtils.isNotEmpty(contractEntity.getContractName())){
vo.setContractName(contractEntity.getContractName());
}
}
if (vo.getCustomerId()!=null){
CustomerEntity customerEntity = customerService.getById(vo.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
vo.setCustomerName(customerEntity.getSupplierNm());
}
}
vo.setArinvoices_item0List(JsonUtil.getJsonToList(Arinvoices_item0List,Arinvoices_item0Model.class ));
//副表
return ActionResult.success(vo);

@ -79,4 +79,11 @@ public class ArinvoicesInfoVO{
/** 子表数据 **/
@JsonProperty("arinvoices_item0List")
private List<Arinvoices_item0Model> arinvoices_item0List;
@JsonProperty("sourceName")
private String sourceName;
@JsonProperty("contractName")
private String contractName;
@JsonProperty("customerName")
private String customerName;
}

@ -55,6 +55,9 @@ public class Arinvoices_item1Model {
@JsonProperty("remark")
private String remark;
@JsonProperty("materialName")
private String materialName;
}

@ -69,6 +69,10 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
@Override
public List<ArinvoicesEntity> getList(ArinvoicesPagination arinvoicesPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int arinvoicesNum =0;
@ -181,7 +185,11 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(ArinvoicesEntity::getDepartmentId)
.orElse(null);
arinvoicesPagination.setDepartmentId(deId);
if (deId==null){
arinvoicesPagination.setDepartmentId(detpartment);
}else {
arinvoicesPagination.setDepartmentId(deId);
}
IPage<ArinvoicesEntity> userIPage=arinvoicesMapper.queryArinvoices(page, arinvoicesPagination);
return arinvoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}

@ -73,6 +73,14 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
@Override
public List<CollectionEntity> getList(CollectionPagination collectionPagination){
String userId=userProvider.get().getUserId();
// String orgnize = null;
// if (!userProvider.get().getIsAdministrator()) {
// orgnize = userProvider.getOrganizeId(userId);
// }
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int collectionNum =0;
@ -152,10 +160,15 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
IPage<CollectionEntity> IPage = this.page(page, collectionQueryWrapper);
List<CollectionEntity> list = IPage.getRecords();
Optional<CollectionEntity> firstElement = list.stream().findFirst();
String OrgnId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(CollectionEntity::getOrgnizeId)
String department_id = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(CollectionEntity::getDepartmentId)
.orElse(null);
collectionPagination.setOrgnizeId(OrgnId);
// collectionPagination.setOrgnizeId(OrgnId);
if (department_id==null){
collectionPagination.setDepartmentId(detpartment);
}else {
collectionPagination.setDepartmentId(department_id);
}
IPage<CollectionEntity> userIPage=collectionMapper.queryCollection(page, collectionPagination);
return collectionPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}

@ -76,6 +76,10 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
@Override
public List<InvoicesEntity> getList(InvoicesPagination invoicesPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int invoicesNum =0;
@ -173,7 +177,11 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(InvoicesEntity::getDepartmentId)
.orElse(null);
invoicesPagination.setDepartmentId(deId);
if (deId==null){
invoicesPagination.setDepartmentId(detpartment);
}else {
invoicesPagination.setDepartmentId(deId);
}
IPage<InvoicesEntity> userIPage=invoicesMapper.queryByKeyword(page, invoicesPagination);
return invoicesPagination.setData(userIPage.getRecords(),userIPage.getTotal());

@ -80,8 +80,10 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
@Override
public List<PoundlistEntity> getList(PoundlistPagination poundlistPagination) {
String userId = userProvider.get().getUserId();
// String demid=null;
// demid =userProvider.getDepartmentId(userId);
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList = new ArrayList();
int total = 0;
int poundlistNum = 0;
@ -148,7 +150,11 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
.map(PoundlistEntity::getDepartmentId)
.orElse(null);
poundlistPagination.setDepartmentId(department_id);
if (department_id==null){
poundlistPagination.setDepartmentId(detpartment);
}else {
poundlistPagination.setDepartmentId(department_id);
}
/*************************************************************************/
IPage<PoundlistEntity> iPage = poundlistMapper.queryByKeyword(page, poundlistPagination);

@ -68,6 +68,10 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
@Override
public List<PurchasebackEntity> getList(PurchasebackPagination purchasebackPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int purchasebackNum =0;
@ -158,7 +162,11 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(PurchasebackEntity::getDepartmentId)
.orElse(null);
purchasebackPagination.setDepartmentId(deId);
if (deId==null){
purchasebackPagination.setDepartmentId(detpartment);
}else {
purchasebackPagination.setDepartmentId(deId);
}
IPage<PurchasebackEntity> userIPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination);
return purchasebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
/*if(StringUtil.isNotEmpty(purchasebackPagination.getDocumentNo())){

@ -24,6 +24,7 @@ import jnpf.materialvo.service.MaterialService;
import jnpf.mobilePort.utils.FileCopy;
import jnpf.payment.model.payment.PaymentListVO;
import jnpf.payment.service.PaymentService;
import jnpf.paymentdoc.entity.PaymentdocItem1Entity;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.UserService;
import jnpf.poundlist.entity.PoundlistEntity;
@ -49,6 +50,7 @@ import jnpf.supplier.service.SupplierService;
import jnpf.util.*;
import jnpf.util.enums.FileTypeEnum;
import jnpf.util.file.UploadUtil;
import jnpf.warehouse.entity.WareHouseEntity;
import jnpf.warehouse.service.WareHouseService;
import lombok.Cleanup;
import lombok.extern.slf4j.Slf4j;
@ -521,6 +523,15 @@ public class PurchaseorderController {
String[] idList = ids.split(",");
int i = 0;
for (String allId : idList) {
QueryWrapper<Purchaseorder_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,allId);
queryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId);
List<String> poundlistIdList = purchaseorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
for (PoundlistEntity poundlistEntity: poundlistList) {
poundlistEntity.setPurchaseStatus("99");
}
poundlistService.updateBatchById(poundlistList);
this.delete(allId);
i++;
}
@ -593,9 +604,17 @@ public class PurchaseorderController {
purchaseorder_item0Entity.setMaterialName(materialEntity.getItemName());
if (StringUtils.isNotEmpty(materialEntity.getInArea())) {
purchaseorder_item0Entity.setReservoirareaId(materialEntity.getInArea());
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(materialEntity.getInArea());
if (reservoirareaEntity != null && StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())) {
purchaseorder_item0Entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
if(StringUtils.isNotEmpty(purchaseorder_item0Entity.getReservoirareaId())){
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(purchaseorder_item0Entity.getReservoirareaId());
if(reservoirareaEntity != null){
purchaseorder_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname());
if(StringUtils.isNotEmpty(reservoirareaEntity.getWarehouseId())){
WareHouseEntity wareHouseEntity = wareHouseService.getById(reservoirareaEntity.getWarehouseId());
if(wareHouseEntity != null){
purchaseorder_item0Entity.setWarehouseName(wareHouseEntity.getName());
}
}
}
}
}
}
@ -921,6 +940,15 @@ public class PurchaseorderController {
}
if (entity != null) {
purchaseorderitemService.delete(entity);
QueryWrapper<Purchaseorder_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId());
queryWrapper.lambda().select(Purchaseorder_item0Entity::getPoundlistId);
List<String> poundlistIdList = purchaseorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
for (PoundlistEntity poundlistEntity: poundlistList) {
poundlistEntity.setPurchaseStatus("99");
}
poundlistService.updateBatchById(poundlistList);
QueryWrapper<Purchaseorder_item0Entity> queryWrapperPurchaseorder_item0 = new QueryWrapper<>();
queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId());
purchaseorder_item0Service.remove(queryWrapperPurchaseorder_item0);

@ -139,4 +139,9 @@ public class Purchaseorder_item0Entity {
@TableField(exist = false)
private String warehouseId;
@TableField(exist = false)
private String warehouseName;
@TableField(exist = false)
private String reservoirareaName;
}

@ -110,5 +110,9 @@ public class Purchaseorder_item0Model {
@JsonProperty("supplierName")
private String supplierName;
@JsonProperty("warehouseName")
private String warehouseName;
@JsonProperty("reservoirareaName")
private String reservoirareaName;
}

@ -776,6 +776,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
@Override
public List<PurchaseorderitemEntity> getList(PurchaseorderPagination purchaseorderPagination) {
String userId = userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList = new ArrayList();
int total = 0;
int purchaseorderNum = 0;
@ -927,7 +931,11 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(PurchaseorderitemEntity::getDepartmentId)
.orElse(null);
purchaseorderPagination.setDepartmentId(deId);
if (deId==null){
purchaseorderPagination.setDepartmentId(detpartment);
}else {
purchaseorderPagination.setDepartmentId(deId);
}
IPage<PurchaseorderitemEntity> userIPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination);
return purchaseorderPagination.setData(userIPage.getRecords(), userIPage.getTotal());

@ -21,6 +21,11 @@ import jnpf.purchaseback.entity.PurchaseorderEntity;
import jnpf.purchaseback.service.PurchaseorderService;
import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
import jnpf.purchaseorder.service.PurchaseorderitemService;
import jnpf.reservoirarea.entity.ReservoirareaEntity;
import jnpf.reservoirarea.service.ReservoirareaService;
import jnpf.warehouse.entity.WareHouseEntity;
import jnpf.warehouse.service.WareHouseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import jnpf.base.entity.ProvinceEntity;
import jnpf.receiptin.model.receiptin.*;
@ -93,6 +98,11 @@ public class ReceiptinController {
@Autowired
private PoundlistService poundlistService;
@Autowired
private ReservoirareaService reservoirareaService;
@Autowired
private WareHouseService wareHouseService;
/**
*
*
@ -330,6 +340,18 @@ public class ReceiptinController {
//子表
List<Receiptin_item0Entity> Receiptin_item0List = receiptinService.GetReceiptin_item0List(id);
for(Receiptin_item0Entity receiptin_item0Entity : Receiptin_item0List){
if(StringUtils.isNotEmpty(receiptin_item0Entity.getReservoirareaId())){
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(receiptin_item0Entity.getReservoirareaId());
if(reservoirareaEntity != null){
receiptin_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname());
}
}
if(StringUtils.isNotEmpty(receiptin_item0Entity.getWarehouseId())){
WareHouseEntity wareHouseEntity = wareHouseService.getById(receiptin_item0Entity.getWarehouseId());
if(wareHouseEntity != null){
receiptin_item0Entity.setWarehouseName(wareHouseEntity.getName());
}
}
}
vo.setReceiptin_item0List(JsonUtil.getJsonToList(Receiptin_item0List,Receiptin_item0Model.class ));
//副表

@ -68,6 +68,10 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
@Override
public List<ReceiptinEntity> getList(ReceiptinPagination receiptinPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int receiptinNum =0;
@ -147,7 +151,11 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(ReceiptinEntity::getDepartmentId)
.orElse(null);
receiptinPagination.setDepartmentId(deId);
if (deId==null){
receiptinPagination.setDepartmentId(detpartment);
}else {
receiptinPagination.setDepartmentId(deId);
}
IPage<ReceiptinEntity> userIPage = receiptinMapper.queryByKeyword(page, receiptinPagination);
return receiptinPagination.setData(userIPage.getRecords(),userIPage.getTotal());
/*if(StringUtil.isNotEmpty(receiptinPagination.getDocumentno())){

@ -14,13 +14,19 @@ import jnpf.base.vo.PaginationVO;
import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.customer.entity.CustomerEntity;
import jnpf.customer.service.CustomerService;
import jnpf.exception.DataException;
import jnpf.materialvo.entity.MaterialEntity;
import jnpf.materialvo.service.MaterialService;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.service.SaleorderitemService;
import jnpf.saleorder.service.Salesorder_item0Service;
import jnpf.vehicle.entity.VehicleEntity;
import jnpf.vehicle.service.VehicleService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
@ -91,6 +97,12 @@ public class ReceiptoutController {
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private PoundlistService poundlistService;
@Autowired
private CustomerService customerService;
@Autowired
private VehicleService vehicleService;
@Autowired
private MaterialService materialService;
/**
*
@ -103,7 +115,7 @@ public class ReceiptoutController {
public ActionResult saleorderCreate(@RequestBody @Valid ReceiptoutCrForm receiptoutCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
receiptoutCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
receiptoutCrForm.setDocumentNo(receiptoutCrForm.getDocumentNo());
receiptoutCrForm.setCreatorTime(DateUtil.getNow());
receiptoutCrForm.setCreatorUserName(userInfo.getUserId());
ReceiptoutEntity entity = JsonUtil.getJsonToBean(receiptoutCrForm, ReceiptoutEntity.class);
@ -131,7 +143,6 @@ public class ReceiptoutController {
for(Receiptout_item0Entity entitys : Receiptout_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setReceiptinId(entity.getId());
entitys.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num",false));
receiptout_item0Service.save(entitys);
}
return ActionResult.success("创建成功");
@ -368,10 +379,30 @@ public class ReceiptoutController {
vo.setLastModifyTime(vo.getLastModifyTime());
}
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
if (vo.getSourceNo()!=null){
SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(vo.getSourceNo());
if (ObjectUtils.isNotEmpty(saleorderitemEntity)){
vo.setSourceName(saleorderitemEntity.getDocumentNo());
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())) {
CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())) {
vo.setCustomerName(customerEntity.getSupplierNm());
}
}
}
}
//子表
List<Receiptout_item0Entity> Receiptout_item0List = receiptoutService.GetReceiptout_item0List(id);
for(Receiptout_item0Entity receiptout_item0Entity : Receiptout_item0List){
VehicleEntity vehicleEntity = vehicleService.getById(receiptout_item0Entity.getVehicleId());
if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){
receiptout_item0Entity.setVehicleName(vehicleEntity.getTicketno());
}
MaterialEntity materialEntity = materialService.getById(receiptout_item0Entity.getMaterialId());
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
receiptout_item0Entity.setMaterialName(materialEntity.getItemName());
}
}
vo.setReceiptout_item0List(JsonUtil.getJsonToList(Receiptout_item0List,Receiptout_item0Model.class ));
//副表

@ -87,5 +87,11 @@ public class ReceiptoutInfoVO{
@JsonProperty("receiptout_item0List")
private List<Receiptout_item0Model> receiptout_item0List;
@JsonProperty("sourceName")
private String sourceName;
@JsonProperty("customerName")
private String customerName;
}

@ -66,6 +66,12 @@ public class Receiptout_item0Model {
@JsonProperty("poundType")
private String poundType;
@JsonProperty("vehicleName")
private String vehicleName;
@JsonProperty("materialName")
private String materialName;
}

@ -66,6 +66,10 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
@Override
public List<ReceiptoutEntity> getList(ReceiptoutPagination receiptoutPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int receiptoutNum =0;
@ -160,7 +164,11 @@ public class ReceiptoutServiceImpl extends ServiceImpl<ReceiptoutMapper, Receipt
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(ReceiptoutEntity::getDepartmentId)
.orElse(null);
receiptoutPagination.setDepartmentId(deId);
if (deId==null){
receiptoutPagination.setDepartmentId(detpartment);
}else {
receiptoutPagination.setDepartmentId(deId);
}
IPage<ReceiptoutEntity> userIPage=receiptoutMapper.queryReceiptout(page, receiptoutPagination);
return receiptoutPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}

@ -77,8 +77,10 @@ public class ReservoirareaController {
List<ReservoirareaEntity> list= reservoirareaService.getList(reservoirareaPagination);
//处理id字段转名称若无需转或者为空可删除
for(ReservoirareaEntity entity:list){
entity.setHouseId(entity.getWarehouseId());
Map<String,Object> warehouseIdMap = new HashMap<>();
entity.setWarehouseId(generaterSwapUtil.getPopupSelectValue("394860934465658373","id","NAME",entity.getWarehouseId(),warehouseIdMap));
entity.setHouseName(entity.getWarehouseId());
}
List<ReservoirareaListVO> listVO=JsonUtil.getJsonToList(list,ReservoirareaListVO.class);
for(ReservoirareaListVO reservoirareaVO:listVO){

@ -85,4 +85,8 @@ public class ReservoirareaEntity {
@TableField("CLOSE_TIME")
private Date closeTime;
@TableField(exist = false)
private String houseId;
@TableField(exist = false)
private String houseName;
}

@ -67,5 +67,9 @@ public class ReservoirareaListVO{
@JsonProperty("lastModifyTime")
private Date lastModifyTime;
@JsonProperty("houseId")
private String houseId;
@JsonProperty("houseName")
private String houseName;
}

@ -64,6 +64,10 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
@Override
public List<SalebackEntity> getList(SalebackPagination salebackPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int salebackNum =0;
@ -158,7 +162,11 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(SalebackEntity::getDepartmentId)
.orElse(null);
salebackPagination.setDepartmentId(deId);
if (deId==null){
salebackPagination.setDepartmentId(detpartment);
}else {
salebackPagination.setDepartmentId(deId);
}
IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination);
return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}

@ -33,6 +33,7 @@ import jnpf.materialvo.entity.MaterialEntity;
import jnpf.materialvo.service.MaterialService;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
import jnpf.receiptin.entity.Receiptin_item0Entity;
import jnpf.receiptin.service.Receiptin_item0Service;
import jnpf.receiptout.entity.ReceiptoutEntity;
@ -41,7 +42,10 @@ import jnpf.receiptout.service.ReceiptoutService;
import jnpf.receiptout.service.Receiptout_item0Service;
import jnpf.reservoirarea.entity.ReservoirareaEntity;
import jnpf.reservoirarea.service.ReservoirareaService;
import jnpf.saleback.entity.Saleback_item0Entity;
import jnpf.saleorder.mapper.ReceiptoutsoitemMapper;
import jnpf.vehicle.entity.VehicleEntity;
import jnpf.vehicle.service.VehicleService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
@ -89,6 +93,7 @@ import jnpf.util.GeneraterSwapUtil;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import jnpf.util.file.UploadUtil;
import jnpf.util.enums.FileTypeEnum;
@ -155,6 +160,8 @@ public class SaleorderitemController {
private ContractFileService contractFileService;
@Autowired
private CustomerService customerService;
@Autowired
private VehicleService vehicleService;
/**
*
@ -214,12 +221,27 @@ public class SaleorderitemController {
entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId());
}
}
VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId());
if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){
entity.setVehicleName(vehicleEntity.getTicketno());
}
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
entity.setMaterialName(materialEntity.getItemName());
}
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
entity.setPoundEntity(poundlistEntity);
entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false));
}
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){
CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());
}
}
saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo());
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
saleorderitemEntity.setList(dList);
list.add(saleorderitemEntity);
@ -241,24 +263,31 @@ public class SaleorderitemController {
public ActionResult invoiceEntry(@PathVariable("ids") String ids) throws DataException {
String[] idList = ids.split(",");
for (String id : idList) {
QueryWrapper<ArinvoicesEntity> queryWrapper2 = new QueryWrapper<>();
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);
List<ArinvoicesEntity> arinvoicesEntityList = saleorderitemService.queryArinvoicesInfo(id);
if (arinvoicesEntityList!=null && arinvoicesEntityList.size()>0) {
SaleorderitemEntity Entity = saleorderitemService.getById(id);
if (!Entity.getStatus().equals("2")){
return ActionResult.fail("数据状态不能发票录入");
}
ArinvoicesEntity arinvoicesEntity = JsonUtil.getJsonToBean(arinvoicesEntityList.get(0), ArinvoicesEntity.class);
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);
arinvoicesEntity.setArinvoices_item0EntityList(list0);
arinvoicesEntity.setArinvoices_item1EntityList(list1);
if (list0!=null && list0.size()>0){
arinvoicesEntity.setArinvoices_item0EntityList(list0);
}
if (list1!=null && list1.size()>0){
for (Arinvoices_item1Entity entity : list1){
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) {
entity.setMaterialName(materialEntity.getItemName());
}
}
arinvoicesEntity.setArinvoices_item1EntityList(list1);
}
return ActionResult.success(arinvoicesEntity);
}else {
List<SaleorderitemEntity> list = new ArrayList<>();
@ -271,12 +300,29 @@ public class SaleorderitemController {
queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
for (Salesorder_item0Entity entity : dList) {
MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
entity.setMaterialName(materialEntity.getItemName());
}
QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.lambda().eq(PoundlistEntity::getId, entity.getPoundlistId());
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
entity.setPoundEntity(poundlistEntity);
}
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())) {
ContractFileEntity contractFileEntity = contractFileService.getById(saleorderitemEntity.getContractId());
if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName()));{
saleorderitemEntity.setContractName(contractFileEntity.getContractName());
}
}
if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){
CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());
}
}
saleorderitemEntity.setList(dList);
saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo());
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
list.add(saleorderitemEntity);
return ActionResult.success(list);
@ -669,6 +715,15 @@ public class SaleorderitemController {
String[] idList = ids.split(",");
int i =0;
for (String allId : idList){
QueryWrapper<Salesorder_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,allId);
queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId);
List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
for (PoundlistEntity poundlistEntity: poundlistList) {
poundlistEntity.setSalesStatus("99");
}
poundlistService.updateBatchById(poundlistList);
this.delete(allId);
i++;
}
@ -1010,6 +1065,15 @@ public class SaleorderitemController {
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
if(entity!=null){
saleorderitemService.delete(entity);
QueryWrapper<Salesorder_item0Entity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
queryWrapper.lambda().select(Salesorder_item0Entity::getPoundlistId);
List<String> poundlistIdList = salesorder_item0Service.listObjs(queryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
List<PoundlistEntity> poundlistList = poundlistService.listByIds(poundlistIdList);
for (PoundlistEntity poundlistEntity: poundlistList) {
poundlistEntity.setSalesStatus("99");
}
poundlistService.updateBatchById(poundlistList);
QueryWrapper<Salesorder_item0Entity> queryWrapperSalesorder_item0=new QueryWrapper<>();
queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
salesorder_item0Service.remove(queryWrapperSalesorder_item0);

@ -179,5 +179,7 @@ public class SaleorderitemEntity {
private String contractName;
@TableField(exist = false)
private String customerName;
@TableField(exist = false)
private String sourceName;
}

@ -3,6 +3,7 @@ package jnpf.saleorder.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.arinvoices.entity.ArinvoicesEntity;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.model.poundlist.PoundlistPagination;
import jnpf.receiptout.entity.Receiptout_item0Entity;
@ -27,5 +28,6 @@ public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {
PoundlistEntity queryPoundlist(String poundlistId);
List<Salesorder_item0Entity> querySaleOrderItem(String id);
List<Receiptout_item0Entity> queryReceiptoutItem(String id);
List<ArinvoicesEntity> queryArinvoices(String id);
}

@ -1,6 +1,7 @@
package jnpf.saleorder.service;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.arinvoices.entity.ArinvoicesEntity;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.receiptout.entity.Receiptout_item0Entity;
import jnpf.saleorder.entity.*;
@ -45,6 +46,7 @@ public interface SaleorderitemService extends IService<SaleorderitemEntity> {
List<Salesorder_item0Entity> querySaleOrderItemInfo(String id);
List<Receiptout_item0Entity> queryReceiptoutItemInfo(String id);
List<ArinvoicesEntity> queryArinvoicesInfo(String id);
//列表子表数据方法
}

@ -3,6 +3,7 @@ package jnpf.saleorder.service.impl;
import jnpf.arinvoices.entity.ArinvoicesEntity;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.receiptin.entity.ReceiptinEntity;
import jnpf.receiptout.entity.ReceiptoutEntity;
import jnpf.receiptout.entity.Receiptout_item0Entity;
import jnpf.receiptout.service.Receiptout_item0Service;
@ -87,6 +88,10 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
@Override
public List<SaleorderitemEntity> getList(SaleorderitemPagination saleorderitemPagination){
String userId=userProvider.get().getUserId();
String detpartment = null;
if (!userProvider.get().getIsAdministrator()) {
detpartment = userProvider.getDepartmentId(userId);
}
List<String> AllIdList =new ArrayList();
int total=0;
int saleorderitemNum =0;
@ -242,8 +247,8 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
Long sec = Long.valueOf(creatorTime.get(1));
saleorderitemPagination.setStartDate(new Date(fir));
saleorderitemPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
// saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
// .le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
saleorderitemQueryWrapper.lambda().ge(SaleorderitemEntity::getCreatorTime, new Date(fir))
.le(SaleorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
@ -262,7 +267,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
saleorderitemPagination.setSidx(value);
// saleorderitemQueryWrapper="asc".equals(saleorderitemPagination.getSort().toLowerCase())?saleorderitemQueryWrapper.orderByAsc(value):saleorderitemQueryWrapper.orderByDesc(value);
saleorderitemQueryWrapper="asc".equals(saleorderitemPagination.getSort().toLowerCase())?saleorderitemQueryWrapper.orderByAsc(value):saleorderitemQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
@ -275,7 +280,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
String deId = firstElement.flatMap(list1 -> firstElement.filter(Objects::nonNull))
.map(SaleorderitemEntity::getDepartmentId)
.orElse(null);
saleorderitemPagination.setDepartmentId(deId);
if (deId==null){
saleorderitemPagination.setDepartmentId(detpartment);
}else {
saleorderitemPagination.setDepartmentId(deId);
}
IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination);
return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}
@ -570,6 +579,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
return saleorderitemMapper.queryReceiptoutItem(id);
}
@Override
public List<ArinvoicesEntity> queryArinvoicesInfo(String id) {
return saleorderitemMapper.queryArinvoices(id);
}
//列表子表数据方法

@ -97,6 +97,24 @@ FROM
WHERE a.delete_mark = '0'
and a.receiptin_id = #{id}
</select>
<select id="queryArinvoices" resultType="jnpf.arinvoices.entity.ArinvoicesEntity">
SELECT
a.*,
b.document_no sourceOrderNo,
c.contract_name contractNm,
d.supplier_nm customerNm
FROM
jg_arinvoices a
LEFT JOIN jg_salesorder b ON a.sales_order_id = b.id
AND b.delete_mark = '0'
LEFT JOIN jg_contract c ON a.contract_id = c.id
AND c.delete_mark = '0'
LEFT JOIN jg_customer d ON a.customer_id = d.id
AND d.delete_mark = '0'
WHERE a.delete_mark = '0'
AND a.sales_order_id = #{id}
</select>
</mapper>

@ -26,6 +26,8 @@ import jnpf.engine.util.FlowJsonUtil;
import jnpf.engine.util.FlowNature;
import jnpf.engine.util.ServiceAllUtil;
import jnpf.exception.WorkFlowException;
import jnpf.form.entity.PoundlistFlowEntity;
import jnpf.form.service.PoundlistFlowService;
import jnpf.permission.entity.UserEntity;
import jnpf.util.JsonUtil;
import jnpf.util.RedisUtil;
@ -72,6 +74,8 @@ public class FlowBeforeController {
private FlowEngineService flowEngineService;
@Autowired
private FlowTaskNewService flowTaskNewService;
@Autowired
private PoundlistFlowService poundlistFlowService;
/**
*
@ -141,7 +145,27 @@ public class FlowBeforeController {
@PostMapping("/Audit/{id}")
public ActionResult audit(@PathVariable("id") String id, @RequestBody FlowHandleModel flowHandleModel) throws WorkFlowException {
FlowTaskOperatorEntity operator = flowTaskOperatorService.getInfo(id);
FlowTaskNodeEntity flowTaskNodeEntity = flowTaskNodeService.getById(operator.getTaskNodeId());
FlowTaskEntity flowTask = flowTaskService.getInfo(operator.getTaskId());
if("end".equals(flowTaskNodeEntity.getNodeNext()) && "398482034802139205".equals(flowTask.getFlowId())){
//判断当前采购订单的磅单有没有是否垫资为否,并且是否回款为否
//判断是否开进项票
Map<String, Object> map = flowHandleModel.getFormData();
List<Map<String, Object>> paymentdocitem1List = (List<Map<String, Object>>)map.get("paymentdocitem1List");
List<String> poundListIds = new ArrayList<>();
for (Map<String, Object> paymentdocitem1 : paymentdocitem1List) {
poundListIds.add((String)paymentdocitem1.get("poundlistId"));
}
List<PoundlistFlowEntity> poundlistFlowEntityList = poundlistFlowService.listByIds(poundListIds);
for (PoundlistFlowEntity poundlistFlowEntity : poundlistFlowEntityList) {
if("0".equals(poundlistFlowEntity.getIsInvoicing())){
return ActionResult.fail("存在磅单未开进项票,无法审批通过!");
}
if("0".equals(poundlistFlowEntity.getAdvance()) && "0".equals(poundlistFlowEntity.getIsCollection())){
return ActionResult.fail("存在磅单未垫资且未回款,无法审批通过!");
}
}
}
flowTaskNewService.permissions(operator.getHandleId(), flowTask, operator, "");
if (FlowNature.ProcessCompletion.equals(operator.getCompletion())) {
FlowModel flowModel = JsonUtil.getJsonToBean(flowHandleModel, FlowModel.class);
@ -213,6 +237,9 @@ public class FlowBeforeController {
FlowTaskOperatorEntity operator = flowTaskOperatorService.getInfo(id);
FlowTaskEntity flowTask = flowTaskService.getInfo(operator.getTaskId());
flowTaskNewService.permissions(operator.getHandleId(), flowTask, operator, "");
if("398482034802139205".equals(flowTask.getFlowId())){
flowTaskService.updatePurchaseorder(flowTask.getProcessId());
}
if (FlowNature.ProcessCompletion.equals(operator.getCompletion())) {
FlowModel flowModel = JsonUtil.getJsonToBean(flowHandleModel, FlowModel.class);
UserInfo userInfo = userProvider.get();

@ -126,6 +126,9 @@ public class FlowLaunchController {
@PutMapping("/{id}/Actions/Withdraw")
public ActionResult revoke(@PathVariable("id") String id, @RequestBody FlowHandleModel flowHandleModel) throws WorkFlowException {
FlowTaskEntity flowTaskEntity = flowTaskService.getInfo(id);
if("398482034802139205".equals(flowTaskEntity.getFlowId())){
flowTaskService.updatePurchaseorder(flowTaskEntity.getProcessId());
}
FlowModel flowModel = JsonUtil.getJsonToBean(flowHandleModel, FlowModel.class);
flowTaskNewService.revoke(flowTaskEntity, flowModel);
return ActionResult.success("撤回成功");

@ -37,4 +37,11 @@ public interface FlowTaskMapper extends BaseMapper<FlowTaskEntity> {
* @return
*/
List<FlowTaskListModel> getWaitList(@Param("sql") String sql);
/**
* isPayment0
* @param paymentdocId
* @return
*/
void updatePurchaseorder(@Param("paymentdocId") String paymentdocId);
}

@ -232,4 +232,11 @@ public interface FlowTaskService extends IService<FlowTaskEntity> {
* @return
*/
List<FlowBatchModel> batchFlowSelector();
/**
* isPayment0
* @param paymentdocId
* @return
*/
void updatePurchaseorder(String paymentdocId);
}

@ -671,6 +671,11 @@ public class FlowTaskServiceImpl extends ServiceImpl<FlowTaskMapper, FlowTaskEnt
return batchFlowList;
}
@Override
public void updatePurchaseorder(String paymentdocId) {
this.baseMapper.updatePurchaseorder(paymentdocId);
}
/**
*
*

@ -0,0 +1,241 @@
package jnpf.form.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-02-21
*/
@Data
@TableName("jg_poundlist")
public class PoundlistFlowEntity {
@TableId("ID")
private String id;
@TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
private String creatorUserId;
@TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
private String creatorUserName;
@TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
private Date creatorTime;
@TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.INSERT_UPDATE)
private String lastModifyUserId;
@TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.INSERT_UPDATE)
private String lastModifyUserName;
@TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.INSERT_UPDATE)
private Date lastModifyTime;
@TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
private String deleteUserId;
@TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
private String deleteUserName;
@TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
private Date deleteTime;
@TableField("DELETE_MARK")
@TableLogic
private String deleteMark;
@TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT)
private String orgnizeId;
@TableField(value = "DEPARTMENT_ID",fill = FieldFill.INSERT)
private String departmentId;
@TableField("CUSTOMER_ID")
private String customerId;
@TableField("SALES_ID")
private String salesId;
@TableField("SUPPLIER_ID")
private String supplierId;
@TableField("SUPPLIER_NAME")
private String supplierName;
@TableField("PURCHASE_ID")
private String purchaseId;
@TableField("MATERIAL_ID")
private String materialId;
@TableField("ADVANCE")
private String advance;
@TableField("UNIT")
private String unit;
@TableField("GROSS_WEIGHT")
private BigDecimal grossWeight;
@TableField("TARE_WEIGHT")
private BigDecimal tareWeight;
@TableField("BUCKLE_WEIGHT")
private BigDecimal buckleWeight;
@TableField("NET_WEIGHT")
private BigDecimal netWeight;
@TableField("SETTLEMENT")
private BigDecimal settlement;
@TableField("PURCHASE_PRICE")
private BigDecimal purchasePrice;
@TableField("COLLECT_PRICE")
private BigDecimal collectPrice;
@TableField("SALES_PRICE")
private BigDecimal salesPrice;
@TableField("INPUT_DATE")
private Date inputDate;
@TableField("OUTPUT_DATE")
private Date outputDate;
@TableField("PAY_DATE")
private Date payDate;
@TableField("PAYMENT_DATE")
private Date paymentDate;
@TableField("POUND_DATE")
private Date poundDate;
@TableField("BUSINESS_ID")
private String businessId;
@TableField("POUND_PICTURES")
private String poundPictures;
@TableField("VEHICLE_PICTURES")
private String vehiclePictures;
@TableField("POUND_TYPE")
private String poundType;
@TableField("POUND_STATUS")
private String poundStatus;
@TableField("SALES_STATUS")
private String salesStatus;
@TableField("PURCHASE_STATUS")
private String purchaseStatus;
@TableField("REMARK")
private String remark;
@TableField("TRANSPORT_TYPE")
private String transportType;
@TableField("TRANSPORT_PRICE")
private BigDecimal transportPrice;
@TableField("ORIGIN_PLACE")
private String originPlace;
@TableField("NATURAL_ID")
private String naturalId;
@TableField("POUNDLIST_NO")
private String poundlistNo;
@TableField("VEHICLE_ID")
private String vehicleId;
@TableField("IS_EXAMINE")
private String isExamine;
@TableField("IS_INVOICING")
private String isInvoicing;
@TableField("IS_PAY")
private String isPay;
@TableField("IS_COLLECTION")
private String isCollection;
@TableField("IS_EXPENSE")
private String isExpense;
@TableField(exist = false)
private String materialName;
@TableField(exist = false)
private String customerName;
@TableField(exist = false)
private String salesName;
@TableField(exist = false)
private String vehicleName;
@TableField(exist = false)
private String businessName;
@TableField(exist = false)
private String naturalName;
@TableField(exist = false)
private String purchaseName;
@TableField(exist = false)
private String contractNo;
@TableField(exist = false)
private String purchaseContractNo;
@TableField(exist = false)
private String documentNo;
@TableField(exist = false)
private String rate;
@TableField(exist = false)
private BigDecimal unitPrice;
@TableField(exist = false)
private BigDecimal noPrice;
@TableField(exist = false)
private BigDecimal price;
@TableField(exist = false)
private String salesContractNo;
@TableField(exist = false)
private String purchaseorderItem0Id;
@TableField(exist = false)
private String salesorderItem0Id;
@TableField(exist = false)
private String saleRate;
@TableField(exist = false)
private String amount;
@TableField(exist = false)
private String notAmount;
@TableField(exist = false)
private String isFirstpay = "0";
@TableField(exist = false)
private String purchaseorderNo;
@TableField(exist = false)
private String collectionAccount;
@TableField(exist = false)
private String colectionBank;
@TableField(exist = false)
private String poundlistId;
@TableField(exist = false)
private String ContractName;
}

@ -0,0 +1,16 @@
package jnpf.form.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.form.entity.PoundlistFlowEntity;
/**
*
* poundlist
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-02-21
*/
public interface PoundlistFlowMapper extends BaseMapper<PoundlistFlowEntity> {
}

@ -0,0 +1,15 @@
package jnpf.form.service;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.form.entity.PoundlistFlowEntity;
/**
*
* poundlist
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-02-21
*/
public interface PoundlistFlowService extends IService<PoundlistFlowEntity> {
}

@ -0,0 +1,19 @@
package jnpf.form.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.form.entity.PoundlistFlowEntity;
import jnpf.form.mapper.PoundlistFlowMapper;
import jnpf.form.service.PoundlistFlowService;
import org.springframework.stereotype.Service;
/**
* poundlist
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-02-21
*/
@Service
public class PoundlistFlowServiceImpl extends ServiceImpl<PoundlistFlowMapper, PoundlistFlowEntity> implements PoundlistFlowService {
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

@ -139,7 +139,7 @@ export default {
},
login: {
title: '账户密码登录',
scanTitle: '扫码登录',
scanTitle: '应用下载',
codeTitle: '手机验证登录',
logIn: '登录',
username: '请输入账号',

@ -439,9 +439,9 @@
</el-select>
</template>
</el-table-column>
<el-table-column prop="price" label="单价" align="center" width="130">
<el-table-column prop="purchasePrice" label="单价" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="请输入" clearable
<el-input v-model="scope.row.purchasePrice" placeholder="请输入" clearable
:style='{"width":"100%"}' :disabled="true">
</el-input>
</template>
@ -969,7 +969,6 @@
paymentAmountHistory = paymentAmountHistory + item.payPrice; //
unpaymentAmount = unpaymentAmount + (item.allAmount - item.payPrice); //
item.poundlistEntityList.forEach((item2, index2) => {
item2.price = item2.purchasePrice;
item2.poundlistId = item2.id;
item2.purchaseorderId = item.purchaseorderId;
item2.id = '';

@ -78,7 +78,7 @@
</el-form>
<div v-show="active==2" class="login-form-QRCode">
<img class="qrcode-img" src="@/assets/images/login_qr.png">
<p class="qrcode-tip">正在测试,稍后上线</p>
<p class="qrcode-tip"></p>
</div>
</div>
</div>

@ -55,12 +55,15 @@
<el-col :span="8" >
<el-form-item label="合同名称"
prop="contractId" >
<popupSelect v-model="dataForm.contractId"
<!-- <popupSelect v-model="dataForm.contractId"
placeholder="请选择" clearable field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -84,24 +87,30 @@
<el-col :span="8" >
<el-form-item label="来源单号"
prop="salesOrderId" >
<popupSelect v-model="dataForm.salesOrderId"
<!-- <popupSelect v-model="dataForm.salesOrderId"
placeholder="请选择" clearable field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.sourceName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="客户"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
<!-- <popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.customerName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="16" >
@ -125,11 +134,14 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialId" label="物料" align="center" width="180">
<template slot-scope="scope">
<popupSelect v-model="scope.row.materialId"
<!-- <popupSelect v-model="scope.row.materialId"
placeholder="请选择" clearable :field="'materialId'+scope.$index" interfaceId="397736371898382533" :columnOptions="arinvoices_item1materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center" width="130">

@ -55,12 +55,15 @@
<el-col :span="8" >
<el-form-item label="合同名称"
prop="contractId" >
<popupSelect v-model="dataForm.contractId"
<!-- <popupSelect v-model="dataForm.contractId"
placeholder="请选择" clearable field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -84,24 +87,30 @@
<el-col :span="8" >
<el-form-item label="来源单号"
prop="salesOrderId" >
<popupSelect v-model="dataForm.salesOrderId"
<!-- <popupSelect v-model="dataForm.salesOrderId"
placeholder="请选择" clearable field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.sourceName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="客户"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
<!-- <popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.customerName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -125,11 +134,14 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialId" label="物料" align="center" width="180">
<template slot-scope="scope">
<popupSelect v-model="scope.row.materialId"
<!-- <popupSelect v-model="scope.row.materialId"
placeholder="请选择" clearable :field="'materialId'+scope.$index" interfaceId="397736371898382533" :columnOptions="arinvoices_item1materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center" width="130">
@ -349,6 +361,9 @@
salesOrderId : "",
contractId : "",
customerId : "",
sourceName: "",
contractName: "",
customerName: "",
arinvoices_item1List:[],
arinvoices_item0List:[],
},

@ -735,6 +735,15 @@
}).catch(() => {})
},
addOrUpdateHandle(row) {
debugger
if(row.purchaseStatus != '99' || row.salesStatus != '99'){
this.$message({
type: 'error',
message: '该磅单当前状态不允许编辑',
duration: 2500
});
return
}
var id = undefined;
if(row.isInvoicing == '1'){
var msg = '开进项票';

File diff suppressed because it is too large Load Diff

@ -0,0 +1,150 @@
<template>
<el-dialog title="选择库区" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="1000px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="8">
<el-form-item label="库区编码">
<el-input v-model="areacode" placeholder="请输入库区编码查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="库区名称">
<el-input v-model="areaname" placeholder="请输入库区名称查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="init()">{{$t('common.search')}}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{$t('common.reset')}}
</el-button>
</el-form-item>
</el-col>
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="init()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" @row-click="rowClick" @row-dblclick="rowdbClick" :border="false" :hasNO="false">
<el-table-column width="35">
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="checkedRow.id">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="areacode" label="库区编码" />
<el-table-column prop="areaname" label="库区名称" />
<el-table-column prop="maximum" label="最高库存" />
<el-table-column prop="safety" label="安全库存" />
<el-table-column prop="minimum" label="最低库存" />
<el-table-column prop="warehouseId" label="仓库名称" />
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="refresh" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button>
<el-button type="primary" @click="select()">{{$t('common.confirmButton')}}</el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
visible: false,
listLoading: true,
areacode: '',
areaname: '',
list: [],
total: 0,
checkedRow: {},
listQuery: {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "creatorTime",
areacode: '',
areaname: '',
},
total: 0,
checked: '',
}
},
methods: {
rowdbClick(row){
this.checked = row.id
this.checkedRow = row
this.select();
},
rowClick(row) {
this.checked = row.id
this.checkedRow = row
},
init() {
this.visible = true
this.listLoading = true
this.listQuery.areacode = this.areacode
this.listQuery.areaname = this.areaname
let listQuery = this.listQuery
request({
url: `/api/example/Reservoirarea/getList`,
method: 'post',
data: listQuery
}).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
})
/* GoodsList(query).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
}) */
},
refresh() {
this.areacode = ''
this.areaname = ''
this.init()
},
select() {
if (this.checked == '') return
this.$emit('refreshDataList', this.checkedRow)
this.visible = false
},
handleSelectionChange(val) {
this.checked = val
}
}
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

@ -28,12 +28,16 @@
<el-col :span="8" >
<el-form-item label="来源单号"
prop="sourceNo" >
<popupSelect v-model="dataForm.sourceNo"
<!-- <popupSelect v-model="dataForm.sourceNo"
placeholder="请选择" clearable field="sourceNo" interfaceId="392956668264114117" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.sourceName"
placeholder="请输入" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -67,11 +71,15 @@
<el-col :span="8" >
<el-form-item label="客户"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
<!-- <popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.customerName"
placeholder="请输入" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="16" >
@ -114,20 +122,26 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId"
<!-- <popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="398732963950472005" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.vehicleName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="materialId" label="物料名称" align="center" width="180">
<template slot-scope="scope">
<popupSelect v-model="scope.row.materialId"
<!-- <popupSelect v-model="scope.row.materialId"
placeholder="请选择" clearable :field="'materialId'+scope.$index" interfaceId="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">

@ -28,12 +28,16 @@
<el-col :span="8" >
<el-form-item label="来源单号"
prop="sourceNo" >
<popupSelect v-model="dataForm.sourceNo"
<!-- <popupSelect v-model="dataForm.sourceNo"
placeholder="请选择" clearable field="sourceNo" interfaceId="392956668264114117" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.sourceName"
placeholder="请输入" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -67,11 +71,15 @@
<el-col :span="8" >
<el-form-item label="客户"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
<!-- <popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.customerName"
placeholder="请输入" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="16" >
@ -114,20 +122,26 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId"
<!-- <popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index" interfaceId="398732963950472005" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
popupWidth="800px" disabled
hasPage :pageSize="20" >
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.vehicleName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="materialId" label="物料名称" align="center" width="180">
<template slot-scope="scope">
<popupSelect v-model="scope.row.materialId"
<!-- <popupSelect v-model="scope.row.materialId"
placeholder="请选择" clearable :field="'materialId'+scope.$index" interfaceId="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">

@ -27,34 +27,43 @@
<el-col :span="8" >
<el-form-item label="销售订单号"
prop="salesOrderId" >
<popupSelect v-model="dataForm.salesOrderId"
placeholder="请选择" clearable field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
<!-- <popupSelect v-model="dataForm.salesOrderId"-->
<!-- placeholder="请选择" clearable field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"-->
<!-- popupTitle="选择数据" popupWidth="800px" disabled-->
<!-- >-->
</popupSelect>
<!-- </popupSelect>-->
<el-input v-model="dataForm.sourceName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="合同名称"
prop="contractId" >
<popupSelect v-model="dataForm.contractId"
<!-- <popupSelect v-model="dataForm.contractId"
placeholder="请选择" clearable field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="客户"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
<!-- <popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.customerName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -137,11 +146,14 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialId" label="物料" align="center" >
<template slot-scope="scope">
<popupSelect v-model="scope.row.materialId"
<!-- <popupSelect v-model="scope.row.materialId"
placeholder="请选择" clearable :field="'materialId'+scope.$index" interfaceId="397736371898382533" :columnOptions="arinvoices_item1materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center" >
@ -542,6 +554,9 @@
this.dataForm.contractId = list[0].contractId;
this.dataForm.customerId = list[0].customerId;
this.dataForm.salesOrderId = list[0].id;
this.dataForm.sourceName = list[0].sourceName;
this.dataForm.contractName = list[0].contractName;
this.dataForm.customerName = list[0].customerName;
this.dataForm.arinvoices_item1List = list[0].list;
for (let i = 0;i<list[0].list.length;i++){
this.dataForm.arinvoices_item1List[i].quantity = list[0].list[i].settlement;
@ -565,6 +580,9 @@
init2(list2) {
this.visible = true;
this.dataForm = list2
this.dataForm.sourceName = list2.sourceOrderNo;
this.dataForm.contractName = list2.contractNm;
this.dataForm.customerName = list2.customerNm;
this.dataForm.businessDate = new Date().getTime();
this.dataForm.arinvoices_item1List = list2.arinvoices_item1EntityList;
this.dataForm.arinvoices_item0List = list2.arinvoices_item0EntityList;
@ -655,7 +673,7 @@
invoiceStatus:'0',
creatorUserName:undefined,
invoiceDate:new Date().getTime(),
attachMent:undefined,
attachMent:[],
}
this.dataForm.arinvoices_item0List.push(item)
},

@ -29,14 +29,17 @@
<el-col :span="8">
<el-form-item label="来源单号"
prop="sourceNo">
<popupSelect v-model="dataForm.sourceNo"
<!-- <popupSelect v-model="dataForm.sourceNo"
placeholder="请选择" clearable field="salesId" interfaceId="392956668264114117"
:columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20">
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.sourceName"
placeholder="请输入来源单号" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@ -44,7 +47,6 @@
prop="amount">
<el-input v-model="dataForm.amount"
placeholder="请输入出库金额" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
@ -71,13 +73,16 @@
<el-col :span="8">
<el-form-item label="客户"
prop="customerId">
<popupSelect v-model="dataForm.customerId"
<!-- <popupSelect v-model="dataForm.customerId"
placeholder="请选择" clearable field="customerId" interfaceId="395936123471343749"
:columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
hasPage :pageSize="20">
</popupSelect>
</popupSelect>-->
<el-input v-model="dataForm.customerName"
placeholder="请输入客户" readonly clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="16">
@ -123,26 +128,32 @@
<el-table-column type="index" width="50" label="序号" align="center"/>
<el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
<template slot-scope="scope">
<popupSelect v-model="scope.row.vehicleId"
<!-- <popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
interfaceId="398732963950472005"
:columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id"
relationField="ticketno" popupType="dialog"
popupWidth="800px"
hasPage :pageSize="20" disabled>
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.vehicleName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="materialId" label="物料名称" align="center" width="180">
<template slot-scope="scope">
<popupSelect v-model="scope.row.materialId"
<!-- <popupSelect v-model="scope.row.materialId"
placeholder="请选择" clearable :field="'materialId'+scope.$index"
interfaceId="398719564478785669"
:columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id"
relationField="item_name" popupType="dialog"
popupWidth="800px" disabled
>
</popupSelect>
</popupSelect>-->
<el-input v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
</el-input>
</template>
</el-table-column>
<el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
@ -271,6 +282,8 @@
documentNo: '',
type: "0",
salesId: "",
sourceNo: "",
sourceName: "",
amount: '',
currency: "0",
num: '',
@ -402,21 +415,24 @@
this.dataForm.num = list[0].num;
this.dataForm.sourceNo = list[0].id;
this.dataForm.customerId = list[0].customerId;
debugger
this.dataForm.customerName = list[0].customerName;
this.dataForm.sourceName = list[0].sourceName;
this.dataForm.receiptout_item0List = list[0].list;
for (let i = 0; i < list[0].list.length; i++) {
this.dataForm.receiptout_item0List[i].vehicleName = list[0].list[i].vehicleName;
this.dataForm.receiptout_item0List[i].materialName = list[0].list[i].materialName;
this.dataForm.receiptout_item0List[i].amount = list[0].list[i].price;
this.dataForm.receiptout_item0List[i].price = list[0].list[i].unitPrice;
this.dataForm.receiptout_item0List[i].deliveryNum = list[0].list[i].settlement;
this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit;
this.dataForm.receiptout_item0List[i].poundType = list[0].list[i].poundEntity.poundType;
debugger
this.rateOptions.find((item) => {
if (this.dataForm.receiptout_item0List[i].rate == item.id) {
this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.receiptout_item0List[i].amount, item.fullName),100)
debugger
}
})
debugger
this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit;
debugger
this.dataForm.receiptout_item0List[i].poundType = list[0].list[i].poundEntity.poundType;
}
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},

Loading…
Cancel
Save