23 changed files with 612 additions and 132 deletions
@ -1,31 +0,0 @@ |
|||
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; |
|||
} |
|||
@ -1,21 +0,0 @@ |
|||
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<>(); |
|||
} |
|||
@ -1,16 +0,0 @@ |
|||
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,29 @@ |
|||
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 AppOldPartsScanVo implements Vo { |
|||
|
|||
@ApiModelProperty("0商品码,1库位码") |
|||
private String type; |
|||
@ApiModelProperty("商品名称") |
|||
private String goodsName; |
|||
@ApiModelProperty("商品id") |
|||
private String goodsID; |
|||
@ApiModelProperty("商品最大可上架数量") |
|||
private String goodsMax; |
|||
@ApiModelProperty("库位码") |
|||
private String houseCode; |
|||
@ApiModelProperty("库区名+库位名") |
|||
private String houseName; |
|||
@ApiModelProperty("仓库地址") |
|||
private String houseAddress; |
|||
} |
|||
@ -0,0 +1,165 @@ |
|||
package com.yxt.anrui.terminal.fegin.asbusrepairbill; |
|||
|
|||
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 AsBusrepairBill extends BaseEntity { |
|||
private static final long serialVersionUID = -3448985502134489814L; |
|||
@ApiModelProperty("制单人姓名") |
|||
private String createByName; |
|||
@ApiModelProperty("单据编号") |
|||
private String billNo; |
|||
@ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") |
|||
private Integer billTypeKey; |
|||
@ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位") |
|||
private String billType; |
|||
@ApiModelProperty("进厂时间") |
|||
private Date entryTime; |
|||
@ApiModelProperty("预计完工时间-工单") |
|||
private Date estimatedFinishTime; |
|||
@ApiModelProperty("科目sid") |
|||
private String subjectSid; |
|||
@ApiModelProperty("科目") |
|||
private String subject; |
|||
@ApiModelProperty("服务顾问sid") |
|||
private String waitorSid; |
|||
@ApiModelProperty("服务顾问姓名") |
|||
private String waitorName; |
|||
@ApiModelProperty("主修人（可多选）销售单") |
|||
private String mainRepairers; |
|||
@ApiModelProperty("条形码-销售单") |
|||
private String barCode; |
|||
@ApiModelProperty("快捷备注-销售单") |
|||
private String shotRemarks; |
|||
@ApiModelProperty("备注") |
|||
private String printRemarks; |
|||
@ApiModelProperty("整体优惠金额") |
|||
private BigDecimal discountAmount; |
|||
@ApiModelProperty("整体优惠券") |
|||
private BigDecimal coupon; |
|||
@ApiModelProperty("积分抵扣") |
|||
private BigDecimal scoreDeduct; |
|||
@ApiModelProperty("当前环节编码(登记1、派工2、维修3、竣工4、结算5、出厂6") |
|||
private Integer nodeCode; |
|||
@ApiModelProperty("当前环节") |
|||
private String nodeName; |
|||
@ApiModelProperty("进入当前环节时间") |
|||
private Date nodeTime; |
|||
@ApiModelProperty("出厂状态 (0未出厂，1已出厂)") |
|||
private String outDoorState; |
|||
@ApiModelProperty("出厂时间") |
|||
private Date outDoorTime; |
|||
@ApiModelProperty("使用组织sid") |
|||
private String useOrgSid; |
|||
@ApiModelProperty("创建组织sid") |
|||
private String createOrgSid; |
|||
@ApiModelProperty("客户sid") |
|||
private String customerSid; |
|||
@ApiModelProperty("客户名称") |
|||
private String customerName; |
|||
@ApiModelProperty("联系电话") |
|||
private String mobile; |
|||
@ApiModelProperty("客户单位") |
|||
private String customerOrg; |
|||
@ApiModelProperty("会员卡sid") |
|||
private String memberCardSid; |
|||
@ApiModelProperty("会员卡号") |
|||
private String memberCarNumber; |
|||
@ApiModelProperty("旧件是否收回登记（0未收回，1已收回）") |
|||
private Integer oldIsReclaim; |
|||
@ApiModelProperty("使用组织名称") |
|||
private String useOrgName; |
|||
@ApiModelProperty("创建组织名称") |
|||
private String createOrgName; |
|||
@ApiModelProperty("组织全路径") |
|||
private String orgSidPath; |
|||
@ApiModelProperty("制单部门sid") |
|||
private String deptSid; // 制单部门sid
|
|||
@ApiModelProperty("制单部门") |
|||
private String deptName; // 制单部门
|
|||
@ApiModelProperty("班组sid") |
|||
private String groupSid; |
|||
@ApiModelProperty("班组名称") |
|||
private String groupName; |
|||
@ApiModelProperty("应收金额") |
|||
private BigDecimal receivableAmount; |
|||
@ApiModelProperty("实收金额") |
|||
private BigDecimal actualAmount; |
|||
@ApiModelProperty("工时费") |
|||
private BigDecimal hourAmount; |
|||
@ApiModelProperty("材料费") |
|||
private BigDecimal goodsAmount; |
|||
@ApiModelProperty("外出费") |
|||
private BigDecimal outAmount; |
|||
@ApiModelProperty("厂家补助") |
|||
private BigDecimal subsidyAmount; |
|||
@ApiModelProperty("其他费用") |
|||
private BigDecimal otherAmount; |
|||
@ApiModelProperty("附加费") |
|||
private BigDecimal addAmount; |
|||
@ApiModelProperty("税额") |
|||
private BigDecimal taxAmount; |
|||
@ApiModelProperty("是否外出（1是，2否）") |
|||
private String isGoOut; |
|||
@ApiModelProperty("索赔厂家") |
|||
private String claimManufacturer; |
|||
@ApiModelProperty("索赔厂家sid") |
|||
private String claimManufacturerSid; |
|||
@ApiModelProperty("特殊标志（1有，0无）") |
|||
private Integer isSpecialSign; |
|||
@ApiModelProperty("施救费") |
|||
private BigDecimal rescueAmount; |
|||
@ApiModelProperty("外出费开票金额") |
|||
private BigDecimal outKPAmount; |
|||
@ApiModelProperty("厂家补助开票金额") |
|||
private BigDecimal subsidyKPAmount; |
|||
@ApiModelProperty("施救费开票金额") |
|||
private BigDecimal rescueKPAmount; |
|||
@ApiModelProperty("厂家补助备注") |
|||
private String subsidyRemarks; |
|||
@ApiModelProperty("施救费备注") |
|||
private String rescueRemarks; |
|||
@ApiModelProperty("外出费备注") |
|||
private String outRemarks; |
|||
@ApiModelProperty("商品登记备注") |
|||
private String registerRemarks; |
|||
@ApiModelProperty("维修状态（0未维修，1维修中，2维修完成）") |
|||
private Integer repairState; |
|||
@ApiModelProperty("维修工作状态（0未完成，1已完成）") |
|||
private Integer completeState; |
|||
@ApiModelProperty("是否可出厂") |
|||
private Integer isOutFactory; |
|||
@ApiModelProperty("出库确认备注") |
|||
private String outboundRemarks; |
|||
@ApiModelProperty("对接人sid") |
|||
private String dockingPeopleSid; |
|||
@ApiModelProperty("对接人") |
|||
private String dockingPeople; |
|||
@ApiModelProperty("对接人电话") |
|||
private String dockingPhone; |
|||
@ApiModelProperty("是否确认材料费（1是，0否）") |
|||
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; |
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
package com.yxt.anrui.terminal.fegin.asbusrepairinventorybill; |
|||
|
|||
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,21 @@ |
|||
package com.yxt.anrui.terminal.fegin.asbusrepairinventorybill; |
|||
|
|||
import com.yxt.common.core.result.ResultBean; |
|||
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-AsBusrepairInventorybill", |
|||
name = "yxt-as", |
|||
path = "/v1/AsBusrepairInventorybill") |
|||
public interface AsBusrepairInventorybillFeign { |
|||
|
|||
@GetMapping("/fetchBySid") |
|||
ResultBean<AsBusrepairInventorybill> fetchBySid(@RequestParam("sid") String sid); |
|||
} |
|||
@ -1,33 +0,0 @@ |
|||
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,115 @@ |
|||
package com.yxt.anrui.terminal.fegin.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; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail; |
|||
|
|||
import com.yxt.common.core.result.ResultBean; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestParam; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: dimengzhe |
|||
* @date: 2024/3/20 |
|||
**/ |
|||
@FeignClient( |
|||
contextId = "yxt-as-AsBusrepairInventorybillDetail", |
|||
name = "yxt-as", |
|||
path = "v1/AsBusrepairInventorybillDetail") |
|||
public interface AsBusrepairInventorybillDetailFeign { |
|||
|
|||
@PostMapping("getOldDetailsByOldGoodsId") |
|||
@ApiOperation("根据旧件商品id查询商品明细") |
|||
ResultBean<AsBusrepairInventorybillDetail> getOldDetailsByOldGoodsId(@RequestParam("oldGoodsId") String oldGoodsId); |
|||
|
|||
@PostMapping("getOldDetailsByBillSid") |
|||
@ApiOperation("根据工单sid查询商品明细-旧件") |
|||
ResultBean<List<AsBusrepairInventorybillDetailOld>> getOldDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid); |
|||
} |
|||
@ -1,4 +1,4 @@ |
|||
package com.yxt.anrui.terminal.fegin.asbusrepairinventorybill; |
|||
package com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail; |
|||
|
|||
import io.swagger.annotations.ApiModelProperty; |
|||
import lombok.Data; |
|||
@ -0,0 +1,22 @@ |
|||
package com.yxt.anrui.terminal.fegin.wmswarehouserack; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @author Fan |
|||
* @description |
|||
* @date 2024/5/30 11:29 |
|||
*/ |
|||
@Data |
|||
public class WmsHouseInfoVo { |
|||
|
|||
private String warehouseSid;//仓库
|
|||
private String warehouseName; |
|||
private String wareAreaSid;//库区
|
|||
private String wareAreaName; |
|||
private String warehouseRackSid;//库位sid
|
|||
private String warehouseRackCode; |
|||
private String warehouseRackName; |
|||
private String warehouseZoneSid;//区域
|
|||
private String warehouseZoneName; |
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package com.yxt.anrui.terminal.fegin.wmswarehouserack; |
|||
|
|||
import com.yxt.common.core.result.ResultBean; |
|||
import io.swagger.annotations.ApiOperation; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
/** |
|||
* @Author |
|||
* @Date |
|||
* @Description |
|||
*/ |
|||
@FeignClient( |
|||
contextId = "terminal-WmsWarehouseRack", |
|||
name = "yxt-wms", |
|||
path = "/apiadmin/base/wmswarehouserack") |
|||
public interface WmsWarehouseRackFeign { |
|||
|
|||
@ApiOperation("根据库位全码查仓库库区库位信息") |
|||
@GetMapping("/selHouseInfoByFullCode") |
|||
public ResultBean<WmsHouseInfoVo> selHouseInfoByFullCode(@RequestParam("rackFullCode") String rackFullCode); |
|||
} |
|||
Loading…
Reference in new issue