Browse Source

售后报表

master
fanzongzhe 7 months ago
parent
commit
6cd4e03c23
  1. 14
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java
  2. 9
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java
  3. 38
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java
  4. 9
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java
  5. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java
  6. 51
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java
  7. 6
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml
  8. 45
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java
  9. 51
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java
  10. 6
      yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java
  11. 9
      yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java
  12. 6
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java
  13. 2
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java
  14. 28
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
  15. 13
      yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java
  16. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java
  17. 18
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java
  18. 19
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java
  19. 17
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
  20. 33
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.java
  21. 5
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java

14
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@ -1,5 +1,6 @@
package com.yxt.anrui.as.api.asbusrepairbill; package com.yxt.anrui.as.api.asbusrepairbill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -149,5 +150,16 @@ public class AsBusrepairBill extends BaseEntity {
private String dockingPhone; private String dockingPhone;
@ApiModelProperty("是否确认材料费(1是,0否)") @ApiModelProperty("是否确认材料费(1是,0否)")
private Integer materialConfirm; private Integer materialConfirm;
@ApiModelProperty("派工时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date dispatchTime;
@ApiModelProperty("竣工时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date finishTime;
@ApiModelProperty("结算时间")
private String settleTime;
@ApiModelProperty("索赔类型key")
private String shClaimTypeKey;
@ApiModelProperty("索赔类型value")
private String shClaimTypeValue;
} }

9
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitem/AsBusrepairBillAitem.java

@ -27,5 +27,12 @@ public class AsBusrepairBillAitem extends BaseEntity {
private BigDecimal price; private BigDecimal price;
@ApiModelProperty("销售价常量") @ApiModelProperty("销售价常量")
private BigDecimal aitemPrice; private BigDecimal aitemPrice;
@ApiModelProperty("业务类型Key")
private String billBusTypeKey;
@ApiModelProperty("业务类型Value")
private String billBusTypeValue;
@ApiModelProperty("成本价")
private BigDecimal cost;
@ApiModelProperty("成本合计(成本价*数量)")
private BigDecimal costTotal;
} }

38
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillaitemspec/AsBusrepairBillAitemspec.java

@ -0,0 +1,38 @@
package com.yxt.anrui.as.api.asbusrepairbillaitemspec;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author Fan
* @description
* @date 2024/4/17 14:56
*/
@Data
@ApiModel(value = "维修工单-固定附加项目", description = "维修工单-固定附加项目")
@TableName("as_busrepair_bill_aitemspec")
public class AsBusrepairBillAitemspec extends BaseEntity {
@ApiModelProperty("工单sid")
private String billSid;
@ApiModelProperty("附加项目sid")
private String attachItemSid;
@ApiModelProperty("项目名称")
private String attachItem;
@ApiModelProperty("项目费用")
private BigDecimal price;
@ApiModelProperty("开票价")
private BigDecimal taxPrice;
@ApiModelProperty("业务类型Key")
private String billBusTypeKey;
@ApiModelProperty("业务类型Value")
private String billBusTypeValue;
@ApiModelProperty("成本价")
private BigDecimal cost;
@ApiModelProperty("成本合计(成本价*数量)")
private BigDecimal costTotal;
}

9
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillsitem/AsBusrepairBillSitem.java

@ -48,6 +48,13 @@ public class AsBusrepairBillSitem extends BaseEntity {
private BigDecimal amount; private BigDecimal amount;
@ApiModelProperty("销售价格常量") @ApiModelProperty("销售价格常量")
private BigDecimal sitemPrice; private BigDecimal sitemPrice;
@ApiModelProperty("业务类型Key")
private String billBusTypeKey;
@ApiModelProperty("业务类型Value")
private String billBusTypeValue;
@ApiModelProperty("成本价")
private BigDecimal cost;
@ApiModelProperty("成本合计(成本价*数量)")
private BigDecimal costTotal;
} }

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java

@ -108,4 +108,8 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
private BigDecimal cost; private BigDecimal cost;
@ApiModelProperty("成本合计") @ApiModelProperty("成本合计")
private BigDecimal costTotal; private BigDecimal costTotal;
@ApiModelProperty("业务类型Key")
private String billBusTypeKey;
@ApiModelProperty("业务类型Value")
private String billBusTypeValue;
} }

51
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.java

@ -0,0 +1,51 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.asbusrepairbillaitemspec;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem;
import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface AsBusrepairBillAitemspecMapper extends BaseMapper<AsBusrepairBillAitemspec> {
@Select("select * from as_busrepair_bill_aitemspec where billSid = #{billSid}")
List<AsBusrepairBillAitemspec> fetchByBillSid(@Param("billSid") String billSid);
@Delete("delete from as_busrepair_bill_aitemspec where billSid = #{sid}")
void delByBillSid(String billSid);
}

6
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecMapper.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.as.biz.asbusrepairbillaitem.AsBusrepairBillAitemMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
</mapper>

45
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecRest.java

@ -0,0 +1,45 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.asbusrepairbillaitemspec;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "维修工单-保险信息")
@RestController
@RequestMapping("v1/AsBusrepairBillAitem")
public class AsBusrepairBillAitemspecRest {
}

51
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillaitemspec/AsBusrepairBillAitemspecService.java

@ -0,0 +1,51 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.biz.asbusrepairbillaitemspec;
import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem;
import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AsBusrepairBillAitemspecService extends MybatisBaseService<AsBusrepairBillAitemspecMapper, AsBusrepairBillAitemspec> {
public List<AsBusrepairBillAitemspec> fetchByBillSid(String billSid) {
return baseMapper.fetchByBillSid(billSid);
}
public void delByBillSid(String billSid) {
baseMapper.delByBillSid(billSid);
}
}

6
yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java

@ -21,6 +21,12 @@ public class BaseGoodsSpuRest {
BaseGoodsSpuService baseGoodsSpuService; BaseGoodsSpuService baseGoodsSpuService;
@ApiOperation("根据sid查询商品")
@GetMapping("/fetchEntityBySid")
public ResultBean<BaseGoodsSpu> fetchEntityBySid(@RequestParam("sid") String sid) {
return baseGoodsSpuService.fetchEntityBySid(sid);
}
@ApiOperation("商品管理分页列表") @ApiOperation("商品管理分页列表")
@PostMapping("/goodsListPage") @PostMapping("/goodsListPage")
public ResultBean<PagerVo<BaseGoodsSpuListVo>> goodsListPage(@RequestBody PagerQuery<BaseGoodsSpuListQuery> pq) { public ResultBean<PagerVo<BaseGoodsSpuListVo>> goodsListPage(@RequestBody PagerQuery<BaseGoodsSpuListQuery> pq) {

9
yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@ -554,4 +554,13 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
} }
return rb.success().setData(isGoodsID); return rb.success().setData(isGoodsID);
} }
public ResultBean<BaseGoodsSpu> fetchEntityBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseGoodsSpu baseGoodsSpu = fetchBySid(sid);
if (baseGoodsSpu != null) {
return rb.success().setData(baseGoodsSpu);
}
return rb;
}
} }

6
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java

@ -40,8 +40,6 @@ public class SalesGoodsVo {
@ApiModelProperty("库存数量") @ApiModelProperty("库存数量")
private String currentCount; private String currentCount;
@ApiModelProperty("厂家")
private String supplierName;
@ApiModelProperty("商品ID") @ApiModelProperty("商品ID")
private String goodsID; // 商品ID private String goodsID; // 商品ID
@ -63,6 +61,10 @@ public class SalesGoodsVo {
private String billObjSid; private String billObjSid;
//供应商 //供应商
private String billObjName; private String billObjName;
//供应商sid
private String supplierSid;
//供应商
private String supplierName;
//销售价常量 //销售价常量
private String goodsDetailsPrice; private String goodsDetailsPrice;
//是否含税(0含税,1不含税) //是否含税(0含税,1不含税)

2
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java

@ -106,4 +106,6 @@ public class SmsSalesBill extends BaseEntity {
private BigDecimal goodsAmount; private BigDecimal goodsAmount;
@ApiModelProperty("附加费") @ApiModelProperty("附加费")
private BigDecimal addAmount; private BigDecimal addAmount;
@ApiModelProperty("结算时间")
private String settleTime;
} }

28
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java

@ -241,6 +241,14 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
SmsSalesBillDetail salesBillDetail = new SmsSalesBillDetail(); SmsSalesBillDetail salesBillDetail = new SmsSalesBillDetail();
BeanUtil.copyProperties(goodsVo, salesBillDetail, "id", "sid"); BeanUtil.copyProperties(goodsVo, salesBillDetail, "id", "sid");
salesBillDetail.setBillSid(entity.getSid()); salesBillDetail.setBillSid(entity.getSid());
if (StringUtils.isNotBlank(goodsVo.getBillObjName())) {
salesBillDetail.setSupplierName(goodsVo.getBillObjName());
}
if (StringUtils.isNotBlank(goodsVo.getBillObjSid())) {
salesBillDetail.setSupplierSid(goodsVo.getBillObjSid());
}
salesBillDetail.setBillBusTypeKey("004");
salesBillDetail.setBillBusTypeValue("配件销售");
smsSalesBillDetailService.insert(salesBillDetail); smsSalesBillDetailService.insert(salesBillDetail);
} }
} }
@ -278,6 +286,14 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
SmsSalesBillDetail salesBillDetail = new SmsSalesBillDetail(); SmsSalesBillDetail salesBillDetail = new SmsSalesBillDetail();
BeanUtil.copyProperties(goodsVo, salesBillDetail, "id", "sid"); BeanUtil.copyProperties(goodsVo, salesBillDetail, "id", "sid");
salesBillDetail.setBillSid(dtoSid); salesBillDetail.setBillSid(dtoSid);
if (StringUtils.isNotBlank(goodsVo.getBillObjName())) {
salesBillDetail.setSupplierName(goodsVo.getBillObjName());
}
if (StringUtils.isNotBlank(goodsVo.getBillObjSid())) {
salesBillDetail.setSupplierSid(goodsVo.getBillObjSid());
}
salesBillDetail.setBillBusTypeKey("004");
salesBillDetail.setBillBusTypeValue("配件销售");
smsSalesBillDetailService.insert(salesBillDetail); smsSalesBillDetailService.insert(salesBillDetail);
} }
} }
@ -325,12 +341,12 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
for (SmsSalesBillDetail smsSalesBillDetail : billDetailList) { for (SmsSalesBillDetail smsSalesBillDetail : billDetailList) {
SalesGoodsVo salesGoodsVo = new SalesGoodsVo(); SalesGoodsVo salesGoodsVo = new SalesGoodsVo();
BeanUtil.copyProperties(smsSalesBillDetail, salesGoodsVo); BeanUtil.copyProperties(smsSalesBillDetail, salesGoodsVo);
// SmsGoods goods = smsGoodsService.fetchEntityByGoodsID(smsSalesBillDetail.getGoodsID()); if (StringUtils.isNotBlank(smsSalesBillDetail.getSupplierSid())) {
// if (null != goods) { salesGoodsVo.setBillObjSid(smsSalesBillDetail.getSupplierSid());
// if (StringUtils.isNotBlank(goods.getSupplierName())) { }
// salesGoodsVo.setSupplierName(goods.getSupplierName()); if (StringUtils.isNotBlank(smsSalesBillDetail.getSupplierName())) {
// } salesGoodsVo.setBillObjName(smsSalesBillDetail.getSupplierName());
// } }
goodsVos.add(salesGoodsVo); goodsVos.add(salesGoodsVo);
} }
vo.setGoodsVos(goodsVos); vo.setGoodsVos(goodsVos);

13
yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbilldetail/SmsSalesBillDetail.java

@ -97,9 +97,9 @@ public class SmsSalesBillDetail extends BaseEntity {
//库位编码 //库位编码
private String warehouseRackCode; private String warehouseRackCode;
//供应商sid //供应商sid
private String billObjSid; private String supplierSid;
//供应商 //供应商
private String billObjName; private String supplierName;
//销售价常量 //销售价常量
private BigDecimal goodsDetailsPrice; private BigDecimal goodsDetailsPrice;
//是否含税(0含税,1不含税) //是否含税(0含税,1不含税)
@ -109,7 +109,14 @@ public class SmsSalesBillDetail extends BaseEntity {
private String manufacturerSid; // 库位sid private String manufacturerSid; // 库位sid
@ApiModelProperty("厂家名称") @ApiModelProperty("厂家名称")
private String manufacturerName; // 库位编号 private String manufacturerName; // 库位编号
@ApiModelProperty("业务类型Key")
private String billBusTypeKey;
@ApiModelProperty("业务类型Value")
private String billBusTypeValue;
@ApiModelProperty("成本价")
private BigDecimal cost;
@ApiModelProperty("成本合计(成本价*数量)")
private BigDecimal costTotal;
} }

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventory.java

@ -68,8 +68,8 @@ public class WmsInventory extends BaseEntity {
private String manufacturerSid; // 库位sid private String manufacturerSid; // 库位sid
@ApiModelProperty("厂家名称") @ApiModelProperty("厂家名称")
private String manufacturerName; // 库位编号 private String manufacturerName; // 库位编号
@ApiModelProperty("供应商sid") @ApiModelProperty("客户/供应商sid,出库是为客户,入库时为供应商")
private String billObjSid; // 供应商sid private String supplierSid;
@ApiModelProperty("供应商名称") @ApiModelProperty("客户/供应商名称")
private String billObjName; // 供应商名称 private String supplierName;
} }

18
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecord.java

@ -66,10 +66,6 @@ public class WmsInventoryRecord extends BaseEntity {
private String busTypeKey; // 业务类型key(采购入库、维修出入库、销售出入库等) private String busTypeKey; // 业务类型key(采购入库、维修出入库、销售出入库等)
@ApiModelProperty("业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等)") @ApiModelProperty("业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等)")
private String busTypeValue; // 业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等) private String busTypeValue; // 业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等)
@ApiModelProperty("客户/供应商sid,出库是为客户,入库时为供应商")
private String billObjSid; // 客户/供应商sid,出库是为客户,入库时为供应商
@ApiModelProperty("客户/供应商名称")
private String billObjName; // 客户/供应商名称
@ApiModelProperty("批次号") @ApiModelProperty("批次号")
private String batchNumber; // 批次号 private String batchNumber; // 批次号
@ApiModelProperty("商品基础信息Sid") @ApiModelProperty("商品基础信息Sid")
@ -104,8 +100,22 @@ public class WmsInventoryRecord extends BaseEntity {
private BigDecimal tax; private BigDecimal tax;
@ApiModelProperty("入库金额") @ApiModelProperty("入库金额")
private BigDecimal amount; private BigDecimal amount;
@ApiModelProperty("销售指导价")
private BigDecimal guidPrice;
@ApiModelProperty("经办人sid") @ApiModelProperty("经办人sid")
private String handlerSid; // 库位sid private String handlerSid; // 库位sid
@ApiModelProperty("经办人") @ApiModelProperty("经办人")
private String handlerName; // 库位编号 private String handlerName; // 库位编号
@ApiModelProperty("客户/供应商sid,出库是为客户,入库时为供应商")
private String supplierSid;
@ApiModelProperty("客户/供应商名称")
private String supplierName;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("厂家sid")
private String manufacturerSid;
@ApiModelProperty("前一单据明细sid(溯源使用)")
private String preBillSid;
@ApiModelProperty("前一单编号")
private String preBillNo;
} }

19
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordDto.java

@ -69,10 +69,6 @@ public class WmsInventoryRecordDto implements Dto {
private String busTypeKey; // 业务类型key(采购入库、维修出入库、销售出入库等) private String busTypeKey; // 业务类型key(采购入库、维修出入库、销售出入库等)
@ApiModelProperty("业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等)") @ApiModelProperty("业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等)")
private String busTypeValue; // 业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等) private String busTypeValue; // 业务类型value(采购入库、调拨入库、退货入库、盘盈入库等销售出库、调拨出库、采购退货出库、报损出库、盘亏出库等)
@ApiModelProperty("客户/供应商sid,出库是为客户,入库时为供应商")
private String billObjSid; // 客户/供应商sid,出库是为客户,入库时为供应商
@ApiModelProperty("客户/供应商名称")
private String billObjName; // 客户/供应商名称
@ApiModelProperty("批次号") @ApiModelProperty("批次号")
private String batchNumber; // 批次号 private String batchNumber; // 批次号
@ApiModelProperty("商品基础信息Sid") @ApiModelProperty("商品基础信息Sid")
@ -117,4 +113,19 @@ public class WmsInventoryRecordDto implements Dto {
private String useOrgSid; private String useOrgSid;
@ApiModelProperty("厂家订单号") @ApiModelProperty("厂家订单号")
private String manufactorBillNo; private String manufactorBillNo;
@ApiModelProperty("销售指导价")
private String guidPrice;
@ApiModelProperty("客户/供应商sid,出库是为客户,入库时为供应商")
private String supplierSid;
@ApiModelProperty("客户/供应商名称")
private String supplierName;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("厂家sid")
private String manufacturerSid;
@ApiModelProperty("前一单据明细sid(溯源使用)")
private String preBillSid;
@ApiModelProperty("前一单编号")
private String preBillNo;
} }

17
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@ -36,6 +36,7 @@ import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetailServic
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService; import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.*; import com.yxt.wms.biz.inventory.wmsshelfbill.app.*;
import com.yxt.wms.biz.inventory.wmsshelfbilldetail.*; import com.yxt.wms.biz.inventory.wmsshelfbilldetail.*;
import com.yxt.wms.feign.base.basegoodspu.BaseGoodsSpu;
import com.yxt.wms.feign.base.basegoodspu.BaseGoodsSpuFeign; import com.yxt.wms.feign.base.basegoodspu.BaseGoodsSpuFeign;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
@ -788,9 +789,25 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
if (null != ansBill.getTaxRate()) { if (null != ansBill.getTaxRate()) {
recordDto.setTaxRate(ansBill.getTaxRate().toString()); recordDto.setTaxRate(ansBill.getTaxRate().toString());
} }
if (StringUtils.isNotBlank(ansBill.getSupplierName())) {
recordDto.setSupplierName(ansBill.getSupplierName());
}
if (StringUtils.isNotBlank(ansBill.getSupplierSid())) {
recordDto.setSupplierSid(ansBill.getSupplierSid());
}
} }
} }
} }
ResultBean<BaseGoodsSpu> goodsSpuResultBean = baseGoodsSpuFeign.fetchEntityBySid(recordDto.getGoodsSpuSid());
if (goodsSpuResultBean.getSuccess()) {
BaseGoodsSpu goodsSpu = goodsSpuResultBean.getData();
if (StringUtils.isNotBlank(goodsSpu.getManufacturerName())) {
recordDto.setManufacturerName(goodsSpu.getManufacturerName());
}
if (StringUtils.isNotBlank(goodsSpu.getManufacturerSid())) {
recordDto.setManufacturerSid(goodsSpu.getManufacturerSid());
}
}
wmsInventoryRecordService.saveRecord(recordDto); wmsInventoryRecordService.saveRecord(recordDto);
} }
List<WmsShelfBillDetail> vos = wmsShelfBillDetailService.selectByMainSid(dto.getShelvesSid()); List<WmsShelfBillDetail> vos = wmsShelfBillDetailService.selectByMainSid(dto.getShelvesSid());

33
yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpu.java

@ -0,0 +1,33 @@
package com.yxt.wms.feign.base.basegoodspu;
import com.yxt.common.core.domain.BaseEntity;
import lombok.Data;
/**
* @author wangpengfei
* @date 2024/2/26 13:36
*/
@Data
public class BaseGoodsSpu extends BaseEntity {
private String goodsCode;//商品代码
private String barCode;//条形码
private String goodsName;//商品名称
private String subTitle;//副标题
private String goodsPY;//拼音缩写
private String goodsShortName;//商品简称
private String goodsTypeSid;//商品分类sid
private String brandSid;//品牌sid
private String manufacturerSid;//厂家sid
private String manufacturerName;//厂家名称
private String goodsUnitSid;//商品单位sid
private String goodsUnitName;//商品单位名称
private String taxRate;//税率
private Integer shelfLife;//保质期天
private String nationalStandardCode;//国标码
private String sortNo;//排序
private String externalCode;//外部编码
private String factoryCode;//厂家货号
private String isListed;//是否上架
private String useOrgSid;//使用组织sid
private String createOrgSid;//创建组织sid
}

5
yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java

@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
/** /**
@ -24,4 +25,8 @@ public interface BaseGoodsSpuFeign {
@ApiOperation("查询商品是否为一品一码") @ApiOperation("查询商品是否为一品一码")
@GetMapping("/selIsGoodsID/{sid}") @GetMapping("/selIsGoodsID/{sid}")
public ResultBean<String> selIsGoodsID(@PathVariable("sid") String sid); public ResultBean<String> selIsGoodsID(@PathVariable("sid") String sid);
@ApiOperation("根据sid查询商品")
@GetMapping("/fetchEntityBySid")
public ResultBean<BaseGoodsSpu> fetchEntityBySid(@RequestParam("sid") String sid);
} }

Loading…
Cancel
Save