yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

弹窗问题

Browse Source
product
杨世强 2 years ago
parent aa71785aec
commit 9e5a9f6059
8 changed files with 1337 additions and 1195 deletions
Show Stats Download Patch File Download Diff File

27
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
Unescape View File

@ -16,7 +16,13 @@ import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.contractfile.entity.ContractFileEntity;
import jnpf.contractfile.service.ContractFileService;
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.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;
@ -79,6 +85,12 @@ public class PoundlistController {
private PoundlistService poundlistService;
@Autowired
private ContractFileService contractFileService;
@Autowired
private CustomerService customerService;
@Autowired
private VehicleService vehicleService;
@Autowired
private MaterialService materialService;
/**
* 生成销售
@ -98,8 +110,21 @@ public class PoundlistController {
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(poundlistEntity)) {
ContractFileEntity entity = contractFileService.getInfo(poundlistEntity.getSalesId());
if (entity!=null && StringUtils.isNotEmpty(entity.getContractNo())) {
if (ObjectUtils.isNotEmpty(entity) && StringUtils.isNotEmpty(entity.getContractNo())) {
poundlistEntity.setContractNo(entity.getContractNo());
poundlistEntity.setContractName(entity.getContractName());
}
CustomerEntity customerEntity = customerService.getInfo(poundlistEntity.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
poundlistEntity.setCustomerName(customerEntity.getSupplierNm());
}
VehicleEntity vehicleEntity = vehicleService.getInfo(poundlistEntity.getVehicleId());
if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){
poundlistEntity.setVehicleName(vehicleEntity.getTicketno());
}
MaterialEntity materialEntity = materialService.getInfo(poundlistEntity.getMaterialId());
if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
poundlistEntity.setMaterialName(materialEntity.getItemName());
}
poundlistEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
poundlistEntity.setRate("0");

2
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java
Unescape View File

@ -245,4 +245,6 @@ public class PoundlistEntity {
private String colectionBank;
@TableField(exist = false)
private String poundlistId;
@TableField(exist = false)
private String ContractName;
}

29
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -693,10 +693,15 @@ public class SaleorderitemController {
vo.setCreatorTime(vo.getCreatorTime());
//子表
List<Salesorder_item0Entity> Salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
for(Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
}
vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class ));
List<Salesorder_item0Entity> jg_salesorder_item0List = saleorderitemService.querySaleOrderItemInfo(id);
List<Salesorder_item0Model> jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class);
// 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<>();
// jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap));
// }
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);
List<ReceiptoutsoitemModel> jg_receiptoutModelList = new ArrayList<>();
if (jg_receiptoutList!=null && jg_receiptoutList.size()>0) {
@ -758,14 +763,14 @@ public class SaleorderitemController {
//附表数据转换
//添加到详情表单对象中
// ContractFileEntity contractFileEntity = contractFileService.getInfo(vo.getContractId());
// if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
// vo.setContractId(contractFileEntity.getContractName());
// }
// CustomerEntity customerEntity = customerService.getInfo(vo.getCustomerId());
// if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
// vo.setCustomerId(customerEntity.getSupplierNm());
// }
ContractFileEntity contractFileEntity = contractFileService.getInfo(vo.getContractId());
if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
vo.setContractName(contractFileEntity.getContractName());
}
CustomerEntity customerEntity = customerService.getInfo(vo.getCustomerId());
if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
vo.setCustomerName(customerEntity.getSupplierNm());
}
// Map<String,Object> contractCodeMap = new HashMap<>();
// vo.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",vo.getContractId(),contractCodeMap));
// Map<String,Object> costomerCodeMap = new HashMap<>();

6
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
Unescape View File

@ -135,4 +135,10 @@ public class SaleorderitemInfoVO{
/** 所属标段**/
@TableField("bidSection")
private String bidSection;
@TableField("contractName")
private String contractName;
@TableField("customerName")
private String customerName;
}

2
SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
Unescape View File

@ -76,6 +76,7 @@ FROM
jg_salesorder_item0 a
LEFT JOIN jg_vehicle b ON a.vehicle_id = b.id and b.delete_mark = '0'
LEFT JOIN jg_material c ON a.material_id = c.id and c.delete_mark = '0'
LEFT JOIN jg_poundlist d ON a.poundlist_id = d.id and d.delete_mark = '0'
WHERE a.delete_mark = '0'
and a.sales_order_id = #{id}
</select>
@ -97,4 +98,5 @@ FROM
and a.receiptin_id = #{id}
</select>
</mapper>

2366
SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
View File

File diff suppressed because it is too large Load Diff

39
SC-web/src/views/scm/basicInformation/saleorder/Detail.vue
Unescape View File

@ -18,26 +18,34 @@
<el-col :span="8">
<el-form-item label="合同名称"
prop="contractId">
<popupSelect v-model="dataForm.contractId"
<!-- <popupSelect v-model="dataForm.contractId"
placeholder="请选择" clearable field="contractCode" interfaceId="391146878474963333"
:columnOptions="contractCodecolumnOptions" propsValue="id" relationField="contract_name"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="contractSelect" 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="costomerCode" interfaceId="398016916830126469"
:columnOptions="costomerCodecolumnOptions" 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,16 +145,7 @@
<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"-->
<!-- placeholder="请选择" clearable :field="'vehicleId'+scope.$index"-->
<!-- interfaceId="391151974030035653" 398732963950472005-->
<!-- :bissId="dataForm.contractId"-->
<!-- :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="vehicle_id"-->
<!-- relationField="ticketno"-->
<!-- popupType="dialog" :excludeFields="excludeFields"-->
<!-- popupWidth="800px" @change="poundInfoSelect" disabled>-->
<!-- </popupSelect>-->
<popupSelect v-model="scope.row.vehicleId"
<!-- <popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
interfaceId="398732963950472005"
:bissId="dataForm.contractId"
@ -154,19 +153,25 @@
relationField="ticketno"
popupType="dialog" :excludeFields="excludeFields"
popupWidth="800px" @change="poundInfoSelect" 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="398108817931470725"
:columnOptions="salesorder_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="poundType" label="类型" align="center" width="130">

61
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -18,26 +18,34 @@
<el-col :span="8">
<el-form-item label="合同名称"
prop="contractId">
<popupSelect v-model="dataForm.contractId"
placeholder="请选择" clearable field="contractCode" interfaceId="391146878474963333"
:columnOptions="contractCodecolumnOptions" propsValue="id" relationField="contract_name"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="contractSelect" disabled
>
<!-- <popupSelect v-model="dataForm.contractId"-->
<!-- placeholder="请选择" clearable field="contractCode" interfaceId="391146878474963333"-->
<!-- :columnOptions="contractCodecolumnOptions" propsValue="id" relationField="contract_name"-->
<!-- popupType="dialog"-->
<!-- popupTitle="选择数据" popupWidth="800px" @change="contractSelect" 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"
placeholder="请选择" clearable field="costomerCode" interfaceId="398016916830126469"
:columnOptions="costomerCodecolumnOptions" propsValue="id" relationField="supplier_nm"
popupType="dialog"
popupTitle="选择数据" popupWidth="800px" disabled
>
</popupSelect>
<!-- <popupSelect v-model="dataForm.customerId"-->
<!-- placeholder="请选择" clearable field="costomerCode" interfaceId="398016916830126469"-->
<!-- :columnOptions="costomerCodecolumnOptions" propsValue="id" relationField="supplier_nm"-->
<!-- popupType="dialog"-->
<!-- popupTitle="选择数据" popupWidth="800px" disabled-->
<!-- >-->
<!-- </popupSelect>-->
<el-input v-model="dataForm.customerName"
placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@ -139,34 +147,31 @@
<template slot-scope="scope">
<!-- <popupSelect v-model="scope.row.vehicleId"-->
<!-- placeholder="请选择" clearable :field="'vehicleId'+scope.$index"-->
<!-- interfaceId="391151974030035653" 398732963950472005-->
<!-- interfaceId="398732963950472005"-->
<!-- :bissId="dataForm.contractId"-->
<!-- :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="vehicle_id"-->
<!-- :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="id"-->
<!-- relationField="ticketno"-->
<!-- popupType="dialog" :excludeFields="excludeFields"-->
<!-- popupWidth="800px" @change="poundInfoSelect" disabled>-->
<!-- </popupSelect>-->
<popupSelect v-model="scope.row.vehicleId"
placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
interfaceId="398732963950472005"
:bissId="dataForm.contractId"
:columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="id"
relationField="ticketno"
popupType="dialog" :excludeFields="excludeFields"
popupWidth="800px" @change="poundInfoSelect" disabled>
</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="398108817931470725"
:columnOptions="salesorder_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="poundType" label="类型" align="center" width="130">
@ -682,6 +687,8 @@
costomerCode: "",
contractId: "",
customerId: "",
contractName: "",
customerName: "",
currency: "0",
contractNo: '',
bidSection: '',

Write Preview
Loading…
Cancel
Save