Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 12 months ago
parent
commit
e4344ddc6a
  1. 23
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillDto.java
  2. 48
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/InventoryBillDetailsVo.java
  3. 44
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java
  4. 46
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java
  5. 71
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java
  6. 50
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/SitemsVo.java
  7. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
  8. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
  9. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
  10. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java
  11. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java
  12. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java
  13. 16
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml
  14. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
  15. 18
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java
  16. 19
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

23
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/AsBusrepairInventorybillDto.java

@ -16,22 +16,29 @@ import java.util.List;
public class AsBusrepairInventorybillDto {
private String sid;
@ApiModelProperty("操作人sid")
private String createBySid;
@ApiModelProperty("来源单sid")
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("操作部门sid")
private String createDeptSid;
@ApiModelProperty("操作日期")
private String createTime;
@ApiModelProperty("领料人sid")
private String warehouseManagerSid;
@ApiModelProperty("领料人名称")
private String warehouseManager;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("维修工单sid")
private String sourceBillSid;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("业务类型key")
private String busTypeKey;
@ApiModelProperty("业务类型value")
private String busTypeValue;
@ApiModelProperty("库管操作人sid")
private String warehouseManagerSid;
@ApiModelProperty("库管操作人")
private String warehouseManager;
private List<AsBusrepairInventorybillDetailDto> detailList = new ArrayList<>();

48
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybill/InventoryBillDetailsVo.java

@ -0,0 +1,48 @@
package com.yxt.anrui.as.api.asbusrepairinventorybill;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailSDto;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/6
**/
@Data
public class InventoryBillDetailsVo {
private String sid;
@ApiModelProperty("操作人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("操作部门sid")
private String createDeptSid;
@ApiModelProperty("操作日期")
private String createTime;
@ApiModelProperty("领料人sid")
private String warehouseManagerSid;
@ApiModelProperty("领料人名称")
private String warehouseManager;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("维修工单sid")
private String sourceBillSid;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("业务类型key")
private String busTypeKey;
@ApiModelProperty("业务类型value")
private String busTypeValue;
private List<SitemsVo> sitemVoList = new ArrayList<>();
private List<AsBusrepairInventorybillDetailSDto> detailList = new ArrayList<>();
private String orgPath;
}

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

@ -16,35 +16,25 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
private static final long serialVersionUID = 7134535185685249599L;
@ApiModelProperty("单据sid")
private String billSid;
//工单服务项目记录sid
@ApiModelProperty("工单服务项目记录sid")
private String sitemSid;
@ApiModelProperty("商品库存sid")
private String inventorySid;
//商品ID
@ApiModelProperty("商品ID")
private String goodsID;
//商品基础信息sid
@ApiModelProperty("商品基础信息sid")
private String goodSpuSid;
//商品名称
@ApiModelProperty("商品名称")
private String goodsSpuName;
//商品Skusid
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
//商品Sku名称
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
//商品编码(图号)
@ApiModelProperty("商品编码")
private String goodsSkuCode;
//规格型号
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
/* @ApiModelProperty("商品sid")
private String goodsSid;
@ApiModelProperty("商品名称")
private String goodsName;*/
/* @ApiModelProperty("商品编码")
private String goodsCode;
@ApiModelProperty("规格")
private String specification;
@ApiModelProperty("型号")
private String goodsModel;*/
@ApiModelProperty("出库前的库存量")
@ApiModelProperty("已出库数量")
private BigDecimal currentCount;
@ApiModelProperty("计量单位")
private String unit;
@ -52,27 +42,21 @@ public class AsBusrepairInventorybillDetail extends BaseEntity {
private String warehouseSid;
@ApiModelProperty("仓库名称")
private String warehouseName;
//库位Sid
@ApiModelProperty("库位Sid")
private String warehouseRackSid;
//库位编号
@ApiModelProperty("库位编号")
private String warehouseRackCode;
/* @ApiModelProperty("货位")
private String warehouseArea;*/
@ApiModelProperty("需求数量(维修工单中)")
private BigDecimal needCount;
/* @ApiModelProperty("已出库数量")
private BigDecimal outboundCount;*/
@ApiModelProperty("出/退库数量")
private BigDecimal count;
@ApiModelProperty("销售价(元)")
private BigDecimal price;
//折扣(0-10,0免费,10不打折)
@ApiModelProperty("折扣(0-10,0免费,10不打折)")
private Integer discount;
//优惠金额(=销售价*(1-折扣*0.1))
@ApiModelProperty("优惠金额(=销售价*(1-折扣*0.1))")
private BigDecimal discountAmount;
//金额(销售价-优惠金额)
@ApiModelProperty("金额(销售价-优惠金额)")
private BigDecimal amount;

46
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailDto.java

@ -13,52 +13,42 @@ import java.math.BigDecimal;
**/
@Data
public class AsBusrepairInventorybillDetailDto {
@ApiModelProperty("工单服务项目记录sid")
private String sitemSid;
@ApiModelProperty("商品库存sid")
private String inventorySid;
//商品ID
@ApiModelProperty("商品ID")
@JsonProperty("goodsID")
private String goodsID;
//商品基础信息sid
@ApiModelProperty("商品基础信息sid")
private String goodSpuSid;
//商品名称
@ApiModelProperty("商品名称")
private String goodsSpuName;
//商品Skusid
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
//商品Sku名称
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
//商品编码(图号)
@ApiModelProperty("商品编码")
private String goodsSkuCode;
//规格型号
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
/* @ApiModelProperty("商品sid")
private String goodsSid;
@ApiModelProperty("商品名称")
private String goodsName;
@ApiModelProperty("商品编码")
private String goodsCode;
@ApiModelProperty("规格")
private String specification;
@ApiModelProperty("型号")
private String goodsModel;*/
@ApiModelProperty("出库前的库存量")
private BigDecimal currentCount;
@ApiModelProperty("已出数量")
private String currentCount;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("仓库名称")
private String warehouseName;
//库位Sid
@ApiModelProperty("库位Sid")
private String warehouseRackSid;
//库位编号
@ApiModelProperty("库位编号")
private String warehouseRackCode;
/*@ApiModelProperty("货位")
private String warehouseArea;*/
@ApiModelProperty("需求数量")
private String needCount;
/* @ApiModelProperty("已出库数量")
private BigDecimal outboundCount;*/
@ApiModelProperty("出/退库数量")
private String count;
@ApiModelProperty("销售价(元)")
@ -66,9 +56,9 @@ public class AsBusrepairInventorybillDetailDto {
//折扣(0-10,0免费,10不打折)
private Integer discount;
//优惠金额(=销售价*(1-折扣*0.1))
private BigDecimal discountAmount;
private String discountAmount;
//金额(销售价-优惠金额)
private BigDecimal amount;
private String amount;
@ApiModelProperty("科目sid")
private String subjectSid;
@ApiModelProperty("科目")

71
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java

@ -0,0 +1,71 @@
package com.yxt.anrui.as.api.asbusrepairinventorybilldetail;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/6
**/
@Data
public class AsBusrepairInventorybillDetailSDto {
@ApiModelProperty("工单服务项目记录sid")
private String sitemSid;
@ApiModelProperty("商品库存sid")
private String inventorySid;
@ApiModelProperty("商品ID")
@JsonProperty("goodsID")
private String goodsID;
@ApiModelProperty("商品基础信息sid")
private String goodSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
@ApiModelProperty("商品编码")
private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("已出数量")
private String currentCount;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("仓库名称")
private String warehouseName;
@ApiModelProperty("库位Sid")
private String warehouseRackSid;
@ApiModelProperty("库位编号")
private String warehouseRackCode;
@ApiModelProperty("需求数量")
private String needCount;
@ApiModelProperty("出/退库数量")
private String count;
@ApiModelProperty("销售价(元)")
private String price;
//折扣(0-10,0免费,10不打折)
private Integer discount;
//优惠金额(=销售价*(1-折扣*0.1))
private String discountAmount;
//金额(销售价-优惠金额)
private String amount;
@ApiModelProperty("科目sid")
private String subjectSid;
@ApiModelProperty("科目")
private String subject;
@ApiModelProperty("领料人")
private String operUserSid;
@ApiModelProperty("领料人姓名")
private String operName;
}

50
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/SitemsVo.java

@ -0,0 +1,50 @@
package com.yxt.anrui.as.api.asbusrepairinventorybilldetail;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/6
**/
@Data
public class SitemsVo {
//服务项目
private String serviceItem;
//工种
private String serviceType;
//科目
private String subject;
//维修人
private String repairerName;
//考核工时
private String examineHourPrice;
//工时单价
private String hourPrice;
//工时数
private String hours;
//销售价
private String price;
//折扣
private String discount;
//优惠
private String discountAmount;
//金额
private String amount;
//备注
private String remarks;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java

@ -62,8 +62,6 @@ public class AsOldparthandle extends BaseEntity {
private String goodsSkuName; // 商品名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("厂家")
private String manufacturerName; // 厂家
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("规格")

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java

@ -63,8 +63,6 @@ public class AsOldparthandleDetailsVo implements Vo {
private String goodsSkuName; // 商品名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("厂家")
private String manufacturerName; // 厂家
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("规格")

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java

@ -63,8 +63,6 @@ public class AsOldparthandleDto implements Dto {
private String goodsSkuName; // 商品名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("厂家")
private String manufacturerName; // 厂家
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("规格")

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleQuery.java

@ -61,8 +61,8 @@ public class AsOldparthandleQuery implements Query {
private String goodsSkuName; // 商品名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("厂家")
private String manufacturerName; // 厂家
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("规格")
private String goodsSkuOwnSpec; // 规格
@ApiModelProperty("单位")

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleVo.java

@ -63,8 +63,8 @@ public class AsOldparthandleVo implements Vo {
private String goodsSkuName; // 商品名称
@ApiModelProperty("图号")
private String goodsSkuCode; // 图号
@ApiModelProperty("厂家")
private String manufacturerName; // 厂家
@ApiModelProperty("供应商")
private String supplierName;
@ApiModelProperty("规格")
private String goodsSkuOwnSpec; // 规格
@ApiModelProperty("单位")

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java

@ -8,10 +8,13 @@ import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillListVo;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillVo;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -35,4 +38,6 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
IPage<AsBusrepairPageVo> pageBillList(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusrepairBill> qw);
AsBusrepairPageVo selectByBillNo(String sid);
List<SitemsVo> selectSitemList(String sourceBillSid);
}

16
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@ -93,4 +93,20 @@
LEFT JOIN as_busrepair_bill_vech AS b on a.sid = b.billSid
where b.sid = #{sid}
</select>
<select id="selectSitemList" resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo">
select a.serviceItem,
a.serviceType,
a.subject,
a.examineHourPrice,
a.hourPrice,
a.hours,
a.price,
a.discount,
a.discountAmount,
a.amount,
a.remarks
from as_busrepair_bill_sitem a
where a.billSid = #{sourceBillSid}
</select>
</mapper>

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@ -16,6 +16,7 @@ import com.yxt.anrui.as.api.asbusrepairbillsitem.AsBusrepairBillSitem;
import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairer;
import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
import com.yxt.anrui.as.api.enums.AsBillTypeEnum;
import com.yxt.anrui.as.api.utils.AsRule;
import com.yxt.anrui.as.api.utils.domain.AsBillNo;
@ -724,4 +725,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
public ResultBean<AsBusrepairBillOutDetailsVo> detailsInit(String sid) {
return null;
}
public List<SitemsVo> selectSitemList(String sourceBillSid) {
return baseMapper.selectSitemList(sourceBillSid);
}
}

18
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java

@ -3,15 +3,13 @@ package com.yxt.anrui.as.biz.asbusrepairinventorybill;
import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillQuery;
import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillDto;
import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillVo;
import com.yxt.anrui.as.api.asbusrepairinventorybill.InventoryBillDetailsVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* @description: 维修出/退库单
@ -39,6 +37,12 @@ public class AsBusrepairInventorybillRest {
return asBusrepairInventorybillService.saveOrUdateBill(dto);
}
/* @PostMapping("/outBill")
@ApiOperation("出库")
ResultBean outBill(@RequestBody AsBusrepairInventorybillDto dto) {
return asBusrepairInventorybillService.outBill(dto);
}*/
@PostMapping("/outBill")
@ApiOperation("出库")
ResultBean outBill(@RequestBody AsBusrepairInventorybillDto dto) {
@ -51,5 +55,11 @@ public class AsBusrepairInventorybillRest {
return asBusrepairInventorybillService.quitBill(dto);
}
@PostMapping("/details")
@ApiOperation("详情")
ResultBean<InventoryBillDetailsVo> details(@RequestParam("sid") String sid) {
return asBusrepairInventorybillService.details(sid);
}
}

19
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@ -4,12 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybill;
import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillQuery;
import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillDto;
import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillVo;
import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
import com.yxt.anrui.as.api.asbusrepairinventorybill.*;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto;
import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo;
import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService;
import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.as.feign.wms.wmsinventorybill.WmsInventoryBillDetailDto;
@ -45,6 +45,8 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
private WmsInventoryBillFeign wmsInventoryBillFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private AsBusrepairBillService asBusrepairBillService;
/**
* 维修出/退库分页列表
@ -159,4 +161,13 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
wmsInventoryBillFeign.inStorage(wmsInventoryBillDto);
return rb.success();
}
public ResultBean<InventoryBillDetailsVo> details(String sid) {
ResultBean<InventoryBillDetailsVo> rb = ResultBean.fireFail();
AsBusrepairInventorybill asBusrepairInventorybill = fetchBySid(sid);
InventoryBillDetailsVo inventoryBillDetailsVo = new InventoryBillDetailsVo();
BeanUtil.copyProperties(asBusrepairInventorybill, inventoryBillDetailsVo, "sid");
List<SitemsVo> sitemVoList = asBusrepairBillService.selectSitemList(asBusrepairInventorybill.getSourceBillSid());
return null;
}
}

Loading…
Cancel
Save