fanzongzhe
6 months ago
39 changed files with 829 additions and 29 deletions
@ -0,0 +1,31 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/6/25 11:11 |
|||
*/ |
|||
@Data |
|||
public class AppOldGoodsTag { |
|||
|
|||
/** |
|||
* 二维码内容 |
|||
*/ |
|||
private String qrText; |
|||
/** |
|||
* 名称，名称:xxx |
|||
*/ |
|||
private String text1; |
|||
/** |
|||
* 图号，图号:xxx |
|||
*/ |
|||
private String text2; |
|||
/** |
|||
* 入库日期，入库日期:xxx |
|||
*/ |
|||
private String text3; |
|||
|
|||
private String sid; |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/6/25 13:55 |
|||
*/ |
|||
@Data |
|||
public class AppOldGoodsTagQuery { |
|||
|
|||
@ApiModelProperty("维修单号") |
|||
private String billId; |
|||
@ApiModelProperty("选择的旧件goodsId") |
|||
private List<String> sids = new ArrayList<>(); |
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/6/25 13:59 |
|||
*/ |
|||
@Data |
|||
public class AppOldGoodsTagVo { |
|||
private List<AppOldGoodsTag> goods = new ArrayList<>(); |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import com.yxt.common.core.vo.Vo; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/4/18 13:33 |
|||
*/ |
|||
@Data |
|||
public class AppOldPartsDetails implements Vo { |
|||
|
|||
@ApiModelProperty("维修单编号") |
|||
private String billId; |
|||
@ApiModelProperty("车牌号") |
|||
private String vehMark; |
|||
@ApiModelProperty("车架号") |
|||
private String vinNo; |
|||
@ApiModelProperty("商品列表") |
|||
private List<AppOldPartsGoodsDetails> list; |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import com.yxt.common.core.vo.Vo; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/4/18 13:33 |
|||
*/ |
|||
@Data |
|||
public class AppOldPartsGoodsDetails implements Vo { |
|||
|
|||
@ApiModelProperty("商品名称") |
|||
private String goodsName; |
|||
@ApiModelProperty("数量") |
|||
private String count; |
|||
@ApiModelProperty("商品id") |
|||
private String goodsID; |
|||
@ApiModelProperty("图号") |
|||
private String goodsSkuCode; |
|||
@ApiModelProperty("收货明细sid") |
|||
private String sid; |
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import com.yxt.common.core.vo.Vo; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/4/18 13:33 |
|||
*/ |
|||
@Data |
|||
public class AppOldPartsGoodsSJDetails implements Vo { |
|||
|
|||
@ApiModelProperty("商品名称") |
|||
private String name; |
|||
@ApiModelProperty("数量") |
|||
private String number; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import com.yxt.common.core.dto.Dto; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.math.BigDecimal; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/4/18 13:33 |
|||
*/ |
|||
@Data |
|||
public class AppOldPartsGoodsSJDto implements Dto { |
|||
|
|||
@ApiModelProperty("商品ID") |
|||
private String goodsID; |
|||
@ApiModelProperty("库位码") |
|||
private String houseCode; |
|||
@ApiModelProperty("数量") |
|||
private BigDecimal count; |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import com.yxt.common.core.vo.Vo; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/4/18 13:33 |
|||
*/ |
|||
@Data |
|||
public class AppOldPartsSJDetails implements Vo { |
|||
|
|||
@ApiModelProperty("维修单编号") |
|||
private String billId; |
|||
@ApiModelProperty("商品列表") |
|||
private List<AppOldPartsGoodsSJDetails> goods; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package com.yxt.anrui.terminal.api.as.oldparts; |
|||
|
|||
import com.yxt.common.core.dto.Dto; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/4/18 13:33 |
|||
*/ |
|||
@Data |
|||
public class AppOldPartsSJDto implements Dto { |
|||
|
|||
private String userSid; |
|||
private String orgPath; |
|||
@ApiModelProperty("上架单sid") |
|||
private String shelvesSid; |
|||
@ApiModelProperty("上架单sid") |
|||
private List<AppOldPartsGoodsSJDto> goodsList; |
|||
} |
|||
@ -0,0 +1,46 @@ |
|||
package com.yxt.anrui.terminal.fegin.asbusrepairinventorybill; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.math.BigDecimal; |
|||
|
|||
@Data |
|||
public class AsBusrepairInventorybillDetailOld { |
|||
|
|||
private String sid; |
|||
@ApiModelProperty("商品ID") |
|||
private String goodsID; |
|||
@ApiModelProperty("商品基础信息sid") |
|||
private String goodsSpuSid; |
|||
@ApiModelProperty("商品名称") |
|||
private String goodsSpuName; |
|||
@ApiModelProperty("商品Skusid") |
|||
private String goodsSkuSid; |
|||
@ApiModelProperty("商品Sku名称") |
|||
private String goodsSkuTitle; |
|||
@ApiModelProperty("商品编码") |
|||
private String goodsSkuCode; |
|||
@ApiModelProperty("厂家sid") |
|||
private String manufacturerSid; |
|||
@ApiModelProperty("厂家名称") |
|||
private String manufacturerName; |
|||
@ApiModelProperty("规格型号") |
|||
private String goodsSkuOwnSpec; |
|||
@ApiModelProperty("计量单位") |
|||
private String unit; |
|||
@ApiModelProperty("仓库sid") |
|||
private String warehouseSid; |
|||
@ApiModelProperty("仓库名称") |
|||
private String warehouseName; |
|||
@ApiModelProperty("库区Sid") |
|||
private String warehouseAreaSid; |
|||
@ApiModelProperty("库区名称") |
|||
private String warehouseAreaName; |
|||
@ApiModelProperty("库位Sid") |
|||
private String warehouseRackSid; |
|||
@ApiModelProperty("库位编号") |
|||
private String warehouseRackCode; |
|||
@ApiModelProperty("出/退库数量") |
|||
private BigDecimal count; |
|||
} |
|||
@ -0,0 +1,33 @@ |
|||
package com.yxt.anrui.terminal.fegin.asbusrepairinventorybill; |
|||
|
|||
import com.yxt.anrui.terminal.api.wms.inventorySearch.AppBusrepairBillVo; |
|||
import com.yxt.anrui.terminal.api.wms.inventorySearch.InventorySearchQuery; |
|||
import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsBusrepairBillQuery; |
|||
import com.yxt.anrui.terminal.fegin.asbusrepairbill.AsBusrepairBillVo; |
|||
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.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
import org.springframework.web.bind.annotation.RequestParam; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @description: 商品基础信息 |
|||
* @author: fzz |
|||
* @date: 2024/3/7 |
|||
**/ |
|||
@FeignClient( |
|||
contextId = "yxt-as-AsbusrepairInventoryBill", |
|||
name = "yxt-as", |
|||
path = "v1/AsBusrepairInventorybillDetail" |
|||
) |
|||
public interface AsbusrepairInventoryBillFegin { |
|||
|
|||
@PostMapping("getOldDetailsByBillSid") |
|||
@ApiOperation("根据工单sid查询商品明细-旧件") |
|||
ResultBean<List<AsBusrepairInventorybillDetailOld>> getOldDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid); |
|||
} |
|||
@ -0,0 +1,46 @@ |
|||
package com.yxt.anrui.terminal.fegin.wmsoldinventory; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.math.BigDecimal; |
|||
|
|||
@Data |
|||
public class WmsBusrepairInventorybillDetailOld { |
|||
|
|||
private String sid; |
|||
@ApiModelProperty("商品ID") |
|||
private String goodsID; |
|||
@ApiModelProperty("商品基础信息sid") |
|||
private String goodsSpuSid; |
|||
@ApiModelProperty("商品名称") |
|||
private String goodsSpuName; |
|||
@ApiModelProperty("商品Skusid") |
|||
private String goodsSkuSid; |
|||
@ApiModelProperty("商品Sku名称") |
|||
private String goodsSkuTitle; |
|||
@ApiModelProperty("商品编码") |
|||
private String goodsSkuCode; |
|||
@ApiModelProperty("厂家sid") |
|||
private String manufacturerSid; |
|||
@ApiModelProperty("厂家名称") |
|||
private String manufacturerName; |
|||
@ApiModelProperty("规格型号") |
|||
private String goodsSkuOwnSpec; |
|||
@ApiModelProperty("计量单位") |
|||
private String unit; |
|||
@ApiModelProperty("仓库sid") |
|||
private String warehouseSid; |
|||
@ApiModelProperty("仓库名称") |
|||
private String warehouseName; |
|||
@ApiModelProperty("库区Sid") |
|||
private String warehouseAreaSid; |
|||
@ApiModelProperty("库区名称") |
|||
private String warehouseAreaName; |
|||
@ApiModelProperty("库位Sid") |
|||
private String warehouseRackSid; |
|||
@ApiModelProperty("库位编号") |
|||
private String warehouseRackCode; |
|||
@ApiModelProperty("出/退库数量") |
|||
private BigDecimal count; |
|||
} |
|||
@ -0,0 +1,17 @@ |
|||
package com.yxt.anrui.terminal.fegin.wmsoldinventory; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
@Data |
|||
public class WmsOldGroundConfirm { |
|||
|
|||
@ApiModelProperty("创建人sid") |
|||
private String createBySid; |
|||
@ApiModelProperty("组织全路径") |
|||
private String orgPath; |
|||
|
|||
private List<WmsBusrepairInventorybillDetailOld> oldList; |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.yxt.anrui.terminal.fegin.wmsoldinventory; |
|||
|
|||
import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldRegisterDetails; |
|||
import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldRegisterDto; |
|||
import com.yxt.common.core.result.ResultBean; |
|||
import io.swagger.annotations.Api; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.GetMapping; |
|||
import org.springframework.web.bind.annotation.PathVariable; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
|
|||
/** |
|||
* @Author |
|||
* @Date |
|||
* @Description |
|||
*/ |
|||
@FeignClient( |
|||
contextId = "terminal-WmsOldInventory", |
|||
name = "yxt-wms", |
|||
path = "/apiadmin/WmsOldInventory") |
|||
public interface WmsOldInventoryFeign { |
|||
|
|||
@ApiOperation("旧件上架确认") |
|||
@PostMapping("/saveInventory") |
|||
ResultBean saveInventory(@RequestBody WmsOldGroundConfirm dto); |
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
package com.yxt.wms.feign.as; |
|||
|
|||
import com.yxt.common.core.domain.BaseEntity; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @description: 维修出/退库 |
|||
* @author: dimengzhe |
|||
* @date: 2024/3/7 |
|||
**/ |
|||
@Data |
|||
public class AsBusrepairInventorybill extends BaseEntity { |
|||
private static final long serialVersionUID = 4272891517343161399L; |
|||
|
|||
@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; |
|||
@ApiModelProperty("使用组织sid") |
|||
private String useOrgSid; |
|||
@ApiModelProperty("创建组织sid") |
|||
private String createOrgSid; |
|||
@ApiModelProperty("部门sid") |
|||
private String deptSid; |
|||
@ApiModelProperty("部门") |
|||
private String deptName; |
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
package com.yxt.wms.feign.as.asbusrepairbillvech; |
|||
|
|||
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; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/4/16 16:59 |
|||
*/ |
|||
@Data |
|||
@ApiModel(value = "维修工单-车辆", description = "维修工单-车辆") |
|||
@TableName("as_busrepair_bill_vech") |
|||
public class AsBusrepairBillVech extends BaseEntity { |
|||
|
|||
|
|||
@ApiModelProperty("工单sid") |
|||
private String billSid; |
|||
@ApiModelProperty("客户车辆sid") |
|||
private String customerVehicleSid; |
|||
@ApiModelProperty("客户sid") |
|||
private String customerSid; |
|||
@ApiModelProperty("车牌号") |
|||
private String vehMark; |
|||
@ApiModelProperty("车架号") |
|||
private String vinNo; |
|||
@ApiModelProperty("车型") |
|||
private String vehModel; |
|||
@ApiModelProperty("行驶里程") |
|||
private Integer mileage; |
|||
@ApiModelProperty("油量(空、小于1/4、1/4、1/2、3/4、满)") |
|||
private String oil; |
|||
@ApiModelProperty("当前里程（本次里程）") |
|||
private Integer currentMileage; |
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package com.yxt.wms.feign.as.asbusrepairbillvech; |
|||
|
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.GetMapping; |
|||
import org.springframework.web.bind.annotation.RequestParam; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/3/20 |
|||
**/ |
|||
@FeignClient( |
|||
contextId = "yxt-as-AsBusrepairBillVeh", |
|||
name = "yxt-as", |
|||
path = "v1/asbusrepairbillvech") |
|||
public interface AsBusrepairBillVehFeign { |
|||
|
|||
@GetMapping("/fetchByBillSid") |
|||
@ApiOperation("根据维修工单sid查询车辆信息") |
|||
public AsBusrepairBillVech fetchByBillSid(@RequestParam("billSid") String billSid); |
|||
} |
|||
@ -0,0 +1,115 @@ |
|||
package com.yxt.wms.feign.as.asbusrepairinventorybilldetail; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.yxt.common.core.domain.BaseEntity; |
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
|
|||
import java.math.BigDecimal; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/3/7 |
|||
**/ |
|||
@Data |
|||
public class AsBusrepairInventorybillDetail extends BaseEntity { |
|||
private static final long serialVersionUID = 7134535185685249599L; |
|||
@ApiModelProperty("单据sid") |
|||
private String billSid; |
|||
@ApiModelProperty("工单服务项目记录sid") |
|||
private String sitemSid; |
|||
@ApiModelProperty("项目名称") |
|||
private String serviceItem; |
|||
@ApiModelProperty("商品库存sid") |
|||
private String inventorySid; |
|||
@ApiModelProperty("商品ID") |
|||
private String goodsID; |
|||
@ApiModelProperty("商品基础信息sid") |
|||
private String goodsSpuSid; |
|||
@ApiModelProperty("商品名称") |
|||
private String goodsSpuName; |
|||
@ApiModelProperty("商品Skusid") |
|||
private String goodsSkuSid; |
|||
@ApiModelProperty("商品Sku名称") |
|||
private String goodsSkuTitle; |
|||
@ApiModelProperty("商品编码") |
|||
private String goodsSkuCode; |
|||
@ApiModelProperty("规格型号") |
|||
private String goodsSkuOwnSpec; |
|||
@ApiModelProperty("已出库数量") |
|||
private BigDecimal 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 BigDecimal needCount; |
|||
@ApiModelProperty("出/退库数量") |
|||
private BigDecimal count; |
|||
@ApiModelProperty("销售价（元）") |
|||
private BigDecimal price; |
|||
@ApiModelProperty("折扣（0-10，0免费，10不打折）") |
|||
private Integer discount; |
|||
@ApiModelProperty("优惠金额（=销售价*(1-折扣*0.1））") |
|||
private BigDecimal discountAmount; |
|||
@ApiModelProperty("金额（销售价-优惠金额）") |
|||
private BigDecimal amount; |
|||
@ApiModelProperty("库存数量") |
|||
private BigDecimal inventoryNum; //
|
|||
|
|||
@ApiModelProperty("科目sid") |
|||
private String subjectSid; |
|||
@ApiModelProperty("科目") |
|||
private String subject; |
|||
@ApiModelProperty("领料人") |
|||
private String operUserSid; |
|||
@ApiModelProperty("领料人姓名") |
|||
private String operName; |
|||
|
|||
//旧件是否入库（适用于保内业务，0未入库，1已入库完成）
|
|||
private Integer oldIsInInventory; |
|||
@ApiModelProperty("销售价格常量") |
|||
private BigDecimal goodsDetailsPrice; |
|||
//是否含税（1含税，0不含税）
|
|||
private Integer isTaxRate; |
|||
|
|||
@ApiModelProperty("配件销售sid(逗号拼接)") |
|||
private String partsSellersSid; |
|||
@ApiModelProperty("配件销售") |
|||
private String partsSellers; |
|||
|
|||
@ApiModelProperty("接收时间") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") |
|||
private Date receivedTime; |
|||
|
|||
@ApiModelProperty("厂家sid") |
|||
private String manufacturerSid; |
|||
@ApiModelProperty("厂家名称") |
|||
private String manufacturerName; |
|||
@ApiModelProperty("供应商sid") |
|||
private String supplierSid; |
|||
@ApiModelProperty("供应商名称") |
|||
private String supplierName; |
|||
@ApiModelProperty("旧件ID") |
|||
private String oldGoodsID; |
|||
@ApiModelProperty("旧件图号") |
|||
private String oldGoodsSkuCode; |
|||
@ApiModelProperty("库存sid") |
|||
private String oldInventorySid; |
|||
@ApiModelProperty("成本价") |
|||
private BigDecimal cost; |
|||
@ApiModelProperty("成本合计") |
|||
private BigDecimal costTotal; |
|||
@ApiModelProperty("业务类型Key") |
|||
private String billBusTypeKey; |
|||
@ApiModelProperty("业务类型Value") |
|||
private String billBusTypeValue; |
|||
} |
|||
Loading…
Reference in new issue