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

移动端销售退货

Browse Source
product
杨世强 2 years ago
parent 1aa1a69623
commit 2d5b67fa7e
10 changed files with 142 additions and 3 deletions
Show Stats Download Patch File Download Diff File

39
SC-boot/linkage-scm/src/main/java/jnpf/saleback/controller/SalebackController.java
Unescape View File

@ -344,6 +344,7 @@ public class SalebackController {
List<Saleback_item0Entity> jg_salesback_item0List = salebackService.GetSaleback_item0List(id);
List<Saleback_item0Model> jg_salesback_item0ModelList = JsonUtil.getJsonToList(jg_salesback_item0List,Saleback_item0Model.class);
for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){
Map<String,Object> licenseNumMap = new HashMap<>();
jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap));
Map<String,Object> materialIdMap = new HashMap<>();
@ -364,6 +365,44 @@ public class SalebackController {
return ActionResult.success(vo);
}
/**
* 表单信息(详情页)
*
* @param id
* @return
*/
@GetMapping("/detail2/{id}")
public ActionResult<SalebackInfoVO> detailInfo2(@PathVariable("id") String id){
SalebackEntity entity= salebackService.getInfo(id);
SalebackInfoVO vo=JsonUtil.getJsonToBean(entity, SalebackInfoVO.class);
List<Saleback_item0Entity> saleback_item0Models = salebackService.querySaleBackItemInfo(id);
//子表数据转换
// List<Saleback_item0Entity> jg_salesback_item0List = salebackService.GetSaleback_item0List(id);
List<Saleback_item0Model> jg_salesback_item0ModelList = JsonUtil.getJsonToList(saleback_item0Models,Saleback_item0Model.class);
// for(Saleback_item0Model jg_salesback_item0Model : jg_salesback_item0ModelList){
//
// Map<String,Object> licenseNumMap = new HashMap<>();
// jg_salesback_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("399190838078458949","id","ticketno",jg_salesback_item0Model.getVehicleId(),licenseNumMap));
// Map<String,Object> materialIdMap = new HashMap<>();
// jg_salesback_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesback_item0Model.getMaterialId(),materialIdMap));
// Map<String,Object> businessIdMap = new HashMap<>();
// jg_salesback_item0Model.setBusinessId(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_Id","F_RealName",jg_salesback_item0Model.getBusinessId(),businessIdMap));
// }
vo.setSaleback_item0List(jg_salesback_item0ModelList);
// vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SaleorderModel.class));
//添加到详情表单对象中
Map<String,Object> salesOrderIdMap = new HashMap<>();
vo.setSalesOrderId(generaterSwapUtil.getPopupSelectValue("383568951197606085","id","document_no",vo.getSalesOrderId(),salesOrderIdMap));
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
return ActionResult.success(vo);
}

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

@ -94,4 +94,6 @@ public class SalebackEntity {
@TableField(exist = false)
private String saledocumentNo;
}

27
SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java
Unescape View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@ -110,5 +111,31 @@ public class Saleback_item0Entity {
@TableField("MATERIAL_ID")
private String materialId;
/** 客户 **/
@TableField(exist = false)
private String customerName;
/** 是否垫资 **/
@TableField(exist = false)
private String advance;
/** 含税单价 **/
@TableField(exist = false)
private String salesPrice;
/** 净重 **/
@TableField(exist = false)
private String netWeight;
/** 磅单图片 **/
@TableField(exist = false)
private String poundPictures;
/** 车辆图片 **/
@TableField(exist = false)
private String vehiclePictures;
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java
Unescape View File

@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.saleback.entity.SalebackEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.saleback.entity.Saleback_item0Entity;
import jnpf.saleback.model.saleback.SalebackPagination;
import jnpf.saleback.model.saleback.Saleback_item0Model;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
* saleback
@ -20,4 +24,6 @@ import org.apache.ibatis.annotations.Param;
*/
public interface SalebackMapper extends BaseMapper<SalebackEntity> {
IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination);
List<Saleback_item0Entity> querySaleBackItem(String id);
}

34
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/Saleback_item0Model.java
Unescape View File

@ -1,5 +1,6 @@
package jnpf.saleback.model.saleback;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.List;
import java.util.Date;
@ -61,5 +62,38 @@ public class Saleback_item0Model {
@JsonProperty("salesorderItem0Id")
private String salesorderItem0Id;
/** 客户 **/
@JsonProperty("customerName")
private String customerName;
/** 是否垫资 **/
@JsonProperty("advance")
private String advance;
/** 含税单价 **/
@JsonProperty("salesPrice")
private String salesPrice;
/** 净重 **/
@JsonProperty("netWeight")
private String netWeight;
/** 磅单图片 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
/** 制单时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;
/** 不含税金额 **/
@JsonProperty("noPrice")
private String noPrice;
}

3
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/SalebackService.java
Unescape View File

@ -4,6 +4,8 @@ import jnpf.saleback.entity.Saleback_item0Entity;
import jnpf.saleback.entity.SalebackEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.saleback.model.saleback.SalebackPagination;
import jnpf.saleback.model.saleback.Saleback_item0Model;
import java.util.*;
/**
*
@ -32,6 +34,7 @@ public interface SalebackService extends IService<SalebackEntity> {
// 子表方法
List<Saleback_item0Entity> GetSaleback_item0List(String id);
List<Saleback_item0Entity> querySaleBackItemInfo(String id);
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
Unescape View File

@ -2,6 +2,7 @@ package jnpf.saleback.service.impl;
import jnpf.saleback.entity.*;
import jnpf.saleback.mapper.SalebackMapper;
import jnpf.saleback.model.saleback.Saleback_item0Model;
import jnpf.saleback.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
@ -265,7 +266,10 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
return saleback_item0Service.list(queryWrapper);
}
@Override
public List<Saleback_item0Entity> querySaleBackItemInfo(String id) {
return salebackMapper.querySaleBackItem(id);
}
}

24
SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml
Unescape View File

@ -26,4 +26,28 @@
and a.creator_time &gt; #{salebackPagination.startDate} AND a.POUND_DATE &lt;= #{salebackPagination.endDate}
</if>
</select>
<select id="querySaleBackItem" resultType="jnpf.saleback.entity.Saleback_item0Entity">
SELECT
a.id,
b.rate,
b.price,
b.no_price as noPrice,
c.*,
d.ticketno as vehicleId,
e.item_name as materialId,
f.F_RealName as businessId,
g.supplier_nm as customerName
FROM
jg_salesback_item0 a
LEFT JOIN jg_salesorder_item0 b ON a.salesorder_item0_id = b.id
LEFT JOIN jg_poundlist c ON b.poundlist_id = c.id
LEFT JOIN jg_vehicle d ON c.vehicle_id = d.id
LEFT JOIN jg_material e ON c.material_id = e.id
LEFT JOIN base_user f ON c.business_id = f.F_Id
LEFT JOIN jg_customer g ON c.customer_id = g.id
WHERE
a.sales_back_id = #{id}
</select>
</mapper>

2
SC-web/src/views/scm/basicInformation/saleback/Form.vue
Unescape View File

@ -337,9 +337,9 @@
this.dataForm.saleback_item0List[i].price = b.sales_price;
this.dataForm.saleback_item0List[i].rate = b.rate;
this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement;
this.dataForm.saleback_item0List[i].pountUser = b.business_id;
this.dataForm.saleback_item0List[i].pountType = b.pound_type;
this.dataForm.saleback_item0List[i].businessId = b.business_id;
this.dataForm.saleback_item0List[i].salesorderItem0Id = b.saleitemId;
this.rateOptions.find((item) => {
if (this.dataForm.saleback_item0List[i].rate == item.id) {
this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount*item.fullName/100

2
SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
Unescape View File

@ -342,9 +342,9 @@
this.dataForm.saleback_item0List[i].price = b.sales_price;
this.dataForm.saleback_item0List[i].rate = b.rate;
this.dataForm.saleback_item0List[i].amount = b.sales_price * b.settlement;
this.dataForm.saleback_item0List[i].pountUser = b.business_id;
this.dataForm.saleback_item0List[i].pountType = b.pound_type;
this.dataForm.saleback_item0List[i].businessId = b.business_id;
this.dataForm.saleback_item0List[i].salesorderItem0Id = b.saleitemId;
this.rateOptions.find((item) => {
if (this.dataForm.saleback_item0List[i].rate == item.id) {
this.dataForm.saleback_item0List[i].notAmount = this.dataForm.saleback_item0List[i].amount*item.fullName/100

Write Preview
Loading…
Cancel
Save