diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index 3a63066d26..e39c765235 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -65,6 +65,11 @@ public class AsBusrepairBillRest { return asBusrepairBillService.fetchDetailsBySid(sid); } + @ApiOperation("根据维修工单号查询") + @GetMapping("/selectOneByBillNo/{billNo}") + public ResultBean selectOneByBillNo(@PathVariable("billNo") String billNo) { + return asBusrepairBillService.selectOneByBillNo(billNo); + } @PostMapping("carOutFactory") @ApiOperation("维修工单-车辆出厂") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index 5b7de352a9..2c5a705dd9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -987,4 +987,10 @@ public class AsBusrepairBillService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean selectOneByBillNo(String billNo) { + ResultBean rb = ResultBean.fireFail(); + AsBusrepairBill asBusrepairBill = baseMapper.selectOneByBillNo(billNo); + return rb.success().setData(asBusrepairBill); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryDto.java index 6a291b4a0b..5a8238ed68 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryDto.java @@ -9,7 +9,13 @@ import lombok.Data; **/ @Data public class WmsOldInventoryDto { + private String sid; + + //维修工单编号 + private String sourceBillNo; + //厂家 + private String manufacturerName; //商品基础信息sid private String goodSpuSid; //商品名称 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryInitVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryInitVo.java index fc43bc4682..ca957d6ba8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryInitVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryInitVo.java @@ -10,36 +10,31 @@ import lombok.Data; @Data public class WmsOldInventoryInitVo { + private String sid; //维修工单编号 private String sourceBillNo; - //车架号 - private String vinNo; - private String goodSpuSid; //商品名称 - private String goodsSpuName; - private String goodsSkuSid; private String goodsSkuTitle; //商品编码 private String goodsSkuCode; + //车架号 + private String vinNo; + //车牌号 + private String vehMark; //厂家 private String manufacturerName; //规格 private String goodsSkuOwnSpec; - - //单位 - private String unit; - - //未入库数量 - private String notInCount; - //仓库 private String warehouseSid; private String warehouseName; - //库位 private String warehouseRackSid; private String warehouseRackCode; - + //单位 + private String unit; + //未入库数量 + private Integer notInCount; //入库数量 - private String count; + private Integer count; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml index 26289d264c..c625033095 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryMapper.xml @@ -26,31 +26,41 @@ diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java index 1610b14cf9..a1b9a63986 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java @@ -12,7 +12,11 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; +import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatch; +import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatchService; import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; +import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill; +import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,8 +37,12 @@ public class WmsOldInventoryService extends MybatisBaseService listPage(PagerQuery pagerQuery) { @@ -90,9 +98,22 @@ public class WmsOldInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.oldPageList(page, qw); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbill/AsBusrepairBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbill/AsBusrepairBill.java new file mode 100644 index 0000000000..717f24cffc --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbill/AsBusrepairBill.java @@ -0,0 +1,112 @@ +package com.yxt.wms.feign.as.asbusrepairbill; + +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 oldIsInInventory; + @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 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; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbill/AsBusrepairBillFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbill/AsBusrepairBillFeign.java new file mode 100644 index 0000000000..c05d24d22d --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbill/AsBusrepairBillFeign.java @@ -0,0 +1,25 @@ +package com.yxt.wms.feign.as.asbusrepairbill; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeignFallback; +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.RequestParam; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@FeignClient( + contextId = "yxt-as-AsBusrepairBill", + name = "yxt-as", + path = "v1/AsBusrepairBill") +public interface AsBusrepairBillFeign { + + @ApiOperation("根据维修工单号查询") + @GetMapping("/selectOneByBillNo/{billNo}") + public ResultBean selectOneByBillNo(@PathVariable("billNo") String billNo); +}