From b8fe52c3660f5d580ab66dc7f7935b2f569c16d7 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 13 Nov 2024 16:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/as/oldparts/AppOldGoodsTag.java | 31 +++++ .../api/as/oldparts/AppOldGoodsTagQuery.java | 21 ++++ .../api/as/oldparts/AppOldGoodsTagVo.java | 16 +++ .../api/as/oldparts/AppOldPartsDetails.java | 25 ++++ .../api/as/oldparts/AppOldPartsFeign.java | 13 +- .../as/oldparts/AppOldPartsGoodsDetails.java | 25 ++++ .../oldparts/AppOldPartsGoodsSJDetails.java | 19 +++ .../as/oldparts/AppOldPartsGoodsSJDto.java | 23 ++++ .../api/as/oldparts/AppOldPartsReDto.java | 4 +- .../api/as/oldparts/AppOldPartsSJDetails.java | 21 ++++ .../api/as/oldparts/AppOldPartsSJDto.java | 23 ++++ .../anrui/terminal/TerminalApplication.java | 2 +- .../biz/as/oldparts/AppOldPartsRest.java | 18 ++- .../biz/as/oldparts/AppOldPartsService.java | 81 ++++++++++-- .../AsBusrepairInventorybillDetailOld.java | 46 +++++++ .../AsbusrepairInventoryBillFegin.java | 33 +++++ .../WmsBusrepairInventorybillDetailOld.java | 46 +++++++ .../wmsoldinventory/WmsOldGroundConfirm.java | 17 +++ .../wmsoldinventory/WmsOldInventoryFeign.java | 28 +++++ .../wmsoldregister/WmsOldRegisterDetails.java | 2 + .../AsBusrepairBillVechRest.java | 12 ++ .../AsBusrepairInventorybillRest.java | 6 + .../AsBusrepairInventorybillDetailMapper.java | 4 + .../AsBusrepairInventorybillDetailRest.java | 8 ++ ...AsBusrepairInventorybillDetailService.java | 4 + .../apiadmin/inventroy/WmsGoodsTagRest.java | 9 +- .../apiadmin/inventroy/WmsShelfBillRest.java | 7 ++ .../wmsgoodstag/WmsGoodsTagMapper.java | 4 + .../wmsgoodstag/WmsGoodsTagService.java | 4 + .../wmsoldregister/WmsOldRegisterDetails.java | 6 + .../wmsoldregister/WmsOldRegisterService.java | 9 ++ .../wmsshelfbill/WmsShelfBillService.java | 65 ++++++++-- .../feign/as/AsBusrepairInventorybill.java | 38 ++++++ .../as/AsBusrepairInventorybillFeign.java | 3 + .../asbusrepairbill/AsBusrepairBillFeign.java | 3 + .../AsBusrepairBillVech.java | 38 ++++++ .../AsBusrepairBillVehFeign.java | 22 ++++ .../AsBusrepairInventorybillDetail.java | 115 ++++++++++++++++++ .../AsBusrepairInventorybillDetailFeign.java | 7 +- 39 files changed, 829 insertions(+), 29 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTag.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTagQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTagVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsDetails.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsDetails.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDetails.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDetails.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDto.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairinventorybill/AsBusrepairInventorybillDetailOld.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairinventorybill/AsbusrepairInventoryBillFegin.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirm.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldInventoryFeign.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybill.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbillvech/AsBusrepairBillVech.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbillvech/AsBusrepairBillVehFeign.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTag.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTag.java new file mode 100644 index 0000000000..22c065a5bc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTag.java @@ -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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTagQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTagQuery.java new file mode 100644 index 0000000000..6da5712b22 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTagQuery.java @@ -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 sids = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTagVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTagVo.java new file mode 100644 index 0000000000..bba8aa7398 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldGoodsTagVo.java @@ -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 goods = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsDetails.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsDetails.java new file mode 100644 index 0000000000..e1dbdbeb8c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsDetails.java @@ -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 list; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java index e43d2ff5da..473370b533 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java @@ -1,6 +1,5 @@ package com.yxt.anrui.terminal.api.as.oldparts; -import com.yxt.anrui.terminal.api.as.oldpartreturnapply.AppOldpartreturnApplyDetailsVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -32,4 +31,16 @@ public interface AppOldPartsFeign { @ApiOperation("旧件回收登记保存") @PostMapping("/recycle/saveRegistered") ResultBean saveRegistered(@RequestBody AppOldPartsReDto dto); + + @ApiOperation("旧件入库打印选择页面") + @GetMapping("/printDetail/{sid}") + public ResultBean printDetail(@PathVariable("sid") String sid); + + @ApiOperation("上架操作页面初始化") + @GetMapping("/initShelves/{sid}") + public ResultBean initShelves(@PathVariable("sid") String sid); + + @ApiOperation("上架保存") + @PostMapping("/shelvesSave") + ResultBean saveInventory(@RequestBody AppOldPartsSJDto dto); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsDetails.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsDetails.java new file mode 100644 index 0000000000..8ed0130a5a --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsDetails.java @@ -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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDetails.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDetails.java new file mode 100644 index 0000000000..aa99dc5c58 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDetails.java @@ -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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java new file mode 100644 index 0000000000..75cc68d6a7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java @@ -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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsReDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsReDto.java index 88e7f906f3..7d027d8b06 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsReDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsReDto.java @@ -1,6 +1,6 @@ package com.yxt.anrui.terminal.api.as.oldparts; -import com.yxt.common.core.vo.Vo; +import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.List; * @date 2024/4/18 13:33 */ @Data -public class AppOldPartsReDto implements Vo { +public class AppOldPartsReDto implements Dto { @ApiModelProperty("维修单编号") private String billId; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDetails.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDetails.java new file mode 100644 index 0000000000..a3b9cd8286 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDetails.java @@ -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 goods; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDto.java new file mode 100644 index 0000000000..ea9864266b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDto.java @@ -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 goodsList; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index 249fb8e1ac..3b7c004428 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java @@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.terminal", "com.yxt.common.base.config" },exclude = {DataSourceAutoConfiguration.class}) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory"}) public class TerminalApplication { public static void main(String[] args) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsRest.java index c852821856..e67fa8c97e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsRest.java @@ -25,10 +25,7 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.as.oldparts; -import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageQuery; -import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageVo; import com.yxt.anrui.terminal.api.as.oldparts.*; -import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionPageVo; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -62,4 +59,19 @@ public class AppOldPartsRest implements AppOldPartsFeign { public ResultBean saveRegistered(AppOldPartsReDto dto) { return appOldPartsService.saveRegistered(dto); } + + @Override + public ResultBean printDetail(String sid) { + return appOldPartsService.printDetail(sid); + } + + @Override + public ResultBean initShelves(String sid) { + return appOldPartsService.initShelves(sid); + } + + @Override + public ResultBean saveInventory(AppOldPartsSJDto dto) { + return appOldPartsService.saveInventory(dto); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java index cb0c1259b4..5026260a53 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java @@ -25,13 +25,15 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.as.oldparts; -import com.yxt.anrui.terminal.api.as.oldparts.AppOldPartsQuery; -import com.yxt.anrui.terminal.api.as.oldparts.AppOldPartsReDto; -import com.yxt.anrui.terminal.api.as.oldparts.AppOldPartsReVo; -import com.yxt.anrui.terminal.api.as.oldparts.AppOldPartsVo; +import com.yxt.anrui.terminal.api.as.oldparts.*; +import com.yxt.anrui.terminal.fegin.asbusrepairinventorybill.AsBusrepairInventorybillDetailOld; +import com.yxt.anrui.terminal.fegin.asbusrepairinventorybill.AsbusrepairInventoryBillFegin; import com.yxt.anrui.terminal.fegin.asoldparts.AsBusrepairPageQuery; import com.yxt.anrui.terminal.fegin.asoldparts.AsBusrepairPageVo; import com.yxt.anrui.terminal.fegin.asoldparts.AsOldPartsFeign; +import com.yxt.anrui.terminal.fegin.wmsoldinventory.WmsBusrepairInventorybillDetailOld; +import com.yxt.anrui.terminal.fegin.wmsoldinventory.WmsOldGroundConfirm; +import com.yxt.anrui.terminal.fegin.wmsoldinventory.WmsOldInventoryFeign; import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldPartsReFeign; import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldRegisterDetails; import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldRegisterDto; @@ -51,6 +53,10 @@ public class AppOldPartsService { private AsOldPartsFeign asOldPartsFeign; @Resource private WmsOldPartsReFeign wmsOldPartsReFeign; + @Resource + private AsbusrepairInventoryBillFegin asbusrepairInventoryBillFegin; + @Resource + private WmsOldInventoryFeign wmsOldInventoryFeign; public ResultBean> list(PagerQuery pq) { AsBusrepairPageQuery asBusrepairPageQuery = new AsBusrepairPageQuery(); @@ -61,6 +67,7 @@ public class AppOldPartsService { asBusrepairPageQuery.setName(params.getName()); PagerQuery query = new PagerQuery<>(); query.setParams(asBusrepairPageQuery); + query.setSize(10000); ResultBean> pagerVoResultBean = asOldPartsFeign.pageBillList(query); ResultBean> resultBean = new ResultBean<>(); PagerVo appOldPartsVoPagerVo = new PagerVo<>(); @@ -73,15 +80,15 @@ public class AppOldPartsService { appOldPartsVo.setVehMark(record.getVehMark()); appOldPartsVo.setVinNo(record.getVinNo()); appOldPartsVo.setState(record.getTaskName()); - if ("维修".equals(record.getTaskName())){ + if ("维修".equals(record.getTaskName())) { appOldPartsVo.setShowHsBtn(true); - }else { + } else { appOldPartsVo.setShowHsBtn(false); } - if ("结算".equals(record.getTaskName())){ + if ("结算".equals(record.getTaskName())) { appOldPartsVo.setShowPrintBtn(true); appOldPartsVo.setShowSjBtn(true); - }else { + } else { appOldPartsVo.setShowPrintBtn(false); appOldPartsVo.setShowSjBtn(false); } @@ -112,4 +119,62 @@ public class AppOldPartsService { wmsOldPartsReFeign.saveorUpdateOldRegister(wmsOldRegisterDto); return rb.success(); } + + public ResultBean printDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsOldRegisterDetails wmsOldRegisterDetails = wmsOldPartsReFeign.fetchDetailsBySid(sid).getData(); + AppOldPartsDetails appOldPartsDetails = new AppOldPartsDetails(); + List asBusrepairInventorybillDetailOlds = asbusrepairInventoryBillFegin.getOldDetailsByBillSid(wmsOldRegisterDetails.getBillSid()).getData(); + appOldPartsDetails.setBillId(sid); + appOldPartsDetails.setVinNo(wmsOldRegisterDetails.getVinNo()); + appOldPartsDetails.setVehMark(wmsOldRegisterDetails.getVehMark()); + List appOldPartsGoodsDetailsList = new ArrayList<>(); + for (AsBusrepairInventorybillDetailOld asBusrepairInventorybillDetailOld : asBusrepairInventorybillDetailOlds) { + AppOldPartsGoodsDetails appOldPartsGoodsDetails = new AppOldPartsGoodsDetails(); + appOldPartsGoodsDetails.setGoodsID(asBusrepairInventorybillDetailOld.getGoodsID()); + appOldPartsGoodsDetails.setGoodsName(asBusrepairInventorybillDetailOld.getGoodsSkuTitle()); + appOldPartsGoodsDetails.setGoodsSkuCode(asBusrepairInventorybillDetailOld.getGoodsSkuCode()); + appOldPartsGoodsDetails.setCount(asBusrepairInventorybillDetailOld.getCount().toString()); + appOldPartsGoodsDetails.setSid(asBusrepairInventorybillDetailOld.getGoodsID()); + appOldPartsGoodsDetailsList.add(appOldPartsGoodsDetails); + } + appOldPartsDetails.setList(appOldPartsGoodsDetailsList); + return rb.success().setData(appOldPartsDetails); + } + + public ResultBean initShelves(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppOldPartsSJDetails appOldPartsSJDetails = new AppOldPartsSJDetails(); + appOldPartsSJDetails.setBillId(sid); + WmsOldRegisterDetails wmsOldRegisterDetails = wmsOldPartsReFeign.fetchDetailsBySid(sid).getData(); + List asBusrepairInventorybillDetailOlds = asbusrepairInventoryBillFegin.getOldDetailsByBillSid(wmsOldRegisterDetails.getBillSid()).getData(); + List appOldPartsGoodsSJDetailsList = new ArrayList<>(); + for (AsBusrepairInventorybillDetailOld asBusrepairInventorybillDetailOld : asBusrepairInventorybillDetailOlds) { + AppOldPartsGoodsSJDetails appOldPartsGoodsSJDetails = new AppOldPartsGoodsSJDetails(); + appOldPartsGoodsSJDetails.setName(asBusrepairInventorybillDetailOld.getGoodsSkuTitle()); + appOldPartsGoodsSJDetails.setNumber(asBusrepairInventorybillDetailOld.getCount().toString()); + appOldPartsGoodsSJDetailsList.add(appOldPartsGoodsSJDetails); + } + appOldPartsSJDetails.setGoods(appOldPartsGoodsSJDetailsList); + return rb.success().setData(appOldPartsSJDetails); + } + + public ResultBean saveInventory(AppOldPartsSJDto dto) { + ResultBean rb = ResultBean.fireFail(); + WmsOldGroundConfirm wmsOldGroundConfirm = new WmsOldGroundConfirm(); + wmsOldGroundConfirm.setCreateBySid(dto.getUserSid()); + wmsOldGroundConfirm.setOrgPath(dto.getOrgPath()); + List wmsBusrepairInventorybillDetailOlds = new ArrayList<>(); + List goodsList = dto.getGoodsList(); + for (AppOldPartsGoodsSJDto appOldPartsGoodsSJDto : goodsList) { + WmsBusrepairInventorybillDetailOld wmsBusrepairInventorybillDetailOld = new WmsBusrepairInventorybillDetailOld(); + wmsBusrepairInventorybillDetailOld.setGoodsID(appOldPartsGoodsSJDto.getGoodsID()); + wmsBusrepairInventorybillDetailOld.setWarehouseRackCode(appOldPartsGoodsSJDto.getHouseCode()); + wmsBusrepairInventorybillDetailOld.setCount(appOldPartsGoodsSJDto.getCount()); + wmsBusrepairInventorybillDetailOlds.add(wmsBusrepairInventorybillDetailOld); + } + wmsOldGroundConfirm.setOldList(wmsBusrepairInventorybillDetailOlds); + wmsOldInventoryFeign.saveInventory(wmsOldGroundConfirm); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairinventorybill/AsBusrepairInventorybillDetailOld.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairinventorybill/AsBusrepairInventorybillDetailOld.java new file mode 100644 index 0000000000..b9ecbe29fe --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairinventorybill/AsBusrepairInventorybillDetailOld.java @@ -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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairinventorybill/AsbusrepairInventoryBillFegin.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairinventorybill/AsbusrepairInventoryBillFegin.java new file mode 100644 index 0000000000..ab63d65a07 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairinventorybill/AsbusrepairInventoryBillFegin.java @@ -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> getOldDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java new file mode 100644 index 0000000000..7912b2a0b2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java @@ -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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirm.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirm.java new file mode 100644 index 0000000000..52c3b0a5a1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirm.java @@ -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 oldList; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldInventoryFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldInventoryFeign.java new file mode 100644 index 0000000000..c9a31d11a4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldInventoryFeign.java @@ -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); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldregister/WmsOldRegisterDetails.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldregister/WmsOldRegisterDetails.java index 04c44f080a..a131c369c8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldregister/WmsOldRegisterDetails.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldregister/WmsOldRegisterDetails.java @@ -17,6 +17,8 @@ public class WmsOldRegisterDetails { private String sid; //维修工单编号 private String billNo; + //维修工单sid + private String billSid; //工单创建日期 private String billTime; //客户sid diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechRest.java index fed05892d0..fad24acb03 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillvech/AsBusrepairBillVechRest.java @@ -26,7 +26,12 @@ package com.yxt.anrui.as.biz.asbusrepairbillvech; +import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo; +import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** @@ -40,5 +45,12 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("v1/asbusrepairbillvech") public class AsBusrepairBillVechRest { + @Autowired + private AsBusrepairBillVechService asBusrepairBillVechService; + @GetMapping("/fetchByBillSid") + @ApiOperation("根据维修工单sid查询车辆信息") + public AsBusrepairBillVech fetchByBillSid(@RequestParam("billSid") String billSid) { + return asBusrepairBillVechService.fetchByBillSid(billSid); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java index 890991aea4..01dfb346fd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java @@ -74,6 +74,12 @@ public class AsBusrepairInventorybillRest { return asBusrepairInventorybillService.details(sid); } + @GetMapping("/fetchBySid") + ResultBean fetchBySid(@RequestParam("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + AsBusrepairInventorybill asBusrepairInventorybill = asBusrepairInventorybillService.fetchBySid(sid); + return rb.success().setData(asBusrepairInventorybill); + } @GetMapping("/init") @ApiOperation("出库/退库初始化") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java index 0372a883fb..3cc4612f97 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java @@ -6,6 +6,7 @@ import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventoryb import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -31,4 +32,7 @@ public interface AsBusrepairInventorybillDetailMapper extends BaseMapper getOldDetailsByBillSid(String busRepairBillSid); void updateOldBySid(@Param("sid") String sid,@Param("goodsID") String goodsID,@Param("goodsSkuCode") String goodsSkuCode,@Param("inSid") String inSid); + + @Select("SELECT * FROM as_busrepair_inventorybill_detail WHERE oldGoodsID = #{oldGoodsId}") + AsBusrepairInventorybillDetail getOldDetailsByOldGoodsId(String oldGoodsId); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java index 1548aa11d3..d539dd15a3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java @@ -38,6 +38,14 @@ public class AsBusrepairInventorybillDetailRest { return rb.success().setData(list); } + @PostMapping("getOldDetailsByOldGoodsId") + @ApiOperation("根据旧件商品id查询商品明细-旧件") + ResultBean getOldDetailsByOldGoodsId(@RequestParam("oldGoodsId") String oldGoodsId){ + ResultBean rb = ResultBean.fireFail(); + AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailService.getOldDetailsByOldGoodsId(oldGoodsId); + return rb.success().setData(asBusrepairInventorybillDetail); + } + @PostMapping("updateOldBySid") @ApiOperation("旧件入库修改") ResultBean updateOldBySid(@RequestParam("sid") String sid, @RequestParam("goodsID") String goodsID, @RequestParam("goodsSkuCode") String goodsSkuCode, @RequestParam("inSid") String inSid) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java index b8f2548f6e..8d77d875ef 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java @@ -84,4 +84,8 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService selectByGoodsId(@RequestParam("oldGoodsId") String oldGoodsId){ + ResultBean rb = ResultBean.fireFail(); + WmsGoodsTag wmsGoodsTag = wmsWmsGoodsTagService.selectByGoodsId(oldGoodsId); + return rb.success().setData(wmsGoodsTag); + }; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java index 627581e479..621c4a5195 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java @@ -122,15 +122,22 @@ public class WmsShelfBillRest { public ResultBean print0(@RequestBody TagQuery query) { return wmsShelfBillService.print0(query); } + @ApiOperation("打印次数") @PostMapping("/printCount") public ResultBean printCount(@RequestBody PrintQuery query) { return wmsShelfBillService.printCount(query); } + @ApiOperation("库位打印") @PostMapping("/print1") public ResultBean print1(@RequestBody TagQuery query) { return wmsShelfBillService.print1(query); } + @ApiOperation("旧件商品打印") + @PostMapping("/print2") + public ResultBean print2(@RequestBody TagQuery query) { + return wmsShelfBillService.print2(query); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java index be137a3e30..047d35b277 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java @@ -9,6 +9,7 @@ import com.yxt.wms.biz.inventory.wmsgoodstag.app.HouseRackVo; import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBill; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -30,4 +31,7 @@ public interface WmsGoodsTagMapper extends BaseMapper { String selectGoodsIDNum(String s); IPage houseList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + @Select("select * from wms_goods_tag where goodsID = #{oldGoodsId}") + WmsGoodsTag selectByGoodsId(String oldGoodsId); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java index c311241459..a3c201eebb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java @@ -157,4 +157,8 @@ public class WmsGoodsTagService extends MybatisBaseService p = MyPagerUtil.pageToVo(pagging, null); return p; } + + public WmsGoodsTag selectByGoodsId(String oldGoodsId) { + return baseMapper.selectByGoodsId(oldGoodsId); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterDetails.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterDetails.java index da846bc920..39b7a499f2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterDetails.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterDetails.java @@ -13,8 +13,14 @@ import java.util.List; @Data public class WmsOldRegisterDetails { + //维修工单sid + private String billSid; //维修工单编号 private String billNo; + //车牌号 + private String vehMark; + //车架号 + private String vinNo; //旧件回收说明 private String shortss; //旧件照片 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java index a87ace50ff..329e8abf6e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java @@ -8,6 +8,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill; import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign; +import com.yxt.wms.feign.as.asbusrepairbillvech.AsBusrepairBillVech; +import com.yxt.wms.feign.as.asbusrepairbillvech.AsBusrepairBillVehFeign; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -27,6 +29,8 @@ public class WmsOldRegisterService extends MybatisBaseService { - @Autowired private WmsShelfBillDetailService wmsShelfBillDetailService; @Autowired private WmsShelfBillDetailMapper wmsShelfBillDetailMapper; - @Autowired private WmsInventoryService wmsInventoryService; @Resource private BaseGoodsSkuFeign baseGoodsSkuFeign; - @Autowired private WmsInventoryRecordService wmsInventoryRecordService; @Autowired @@ -86,8 +84,6 @@ public class WmsShelfBillService extends MybatisBaseService listPage(PagerQuery pq) { WmsShelfBillQuery query = pq.getParams(); @@ -1224,4 +1226,47 @@ public class WmsShelfBillService extends MybatisBaseService print2(TagQuery query) { + ResultBean rb = ResultBean.fireFail(); + GoodsTagVo vo = new GoodsTagVo(); + List sids = query.getSids(); + List list = new ArrayList<>(); + for (String sid : sids) { + GoodsTag goodsTag = new GoodsTag(); + //根据旧件GoodsId查询旧件 + AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(sid).getData(); + AsBusrepairInventorybill asBusrepairInventorybill = asBusrepairInventorybillFeign.fetchBySid(asBusrepairInventorybillDetail.getBillSid()).getData(); + WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selectByGoodsId(sid); + if (wmsGoodsTag == null) { + wmsGoodsTag = new WmsGoodsTag(); + wmsGoodsTag.setBillSid(asBusrepairInventorybill.getSourceBillSid()); + wmsGoodsTag.setBillDetailSid(asBusrepairInventorybillDetail.getSid()); + wmsGoodsTag.setGoodsID(sid); + wmsGoodsTag.setGoodsSpuSid(asBusrepairInventorybillDetail.getGoodsSpuSid()); + wmsGoodsTag.setGoodsSpuName(asBusrepairInventorybillDetail.getGoodsSpuName()); + wmsGoodsTag.setGoodsSkuSid(asBusrepairInventorybillDetail.getGoodsSkuSid()); + wmsGoodsTag.setGoodsSkuTitle(asBusrepairInventorybillDetail.getGoodsSkuTitle()); + wmsGoodsTag.setGoodsSkuCode(asBusrepairInventorybillDetail.getGoodsSkuCode()); + wmsGoodsTag.setGoodsSkuOwnSpec(asBusrepairInventorybillDetail.getGoodsSkuOwnSpec()); + wmsGoodsTag.setUnit(asBusrepairInventorybillDetail.getUnit()); + wmsGoodsTag.setGoodsCount(asBusrepairInventorybillDetail.getCount()); + wmsGoodsTagService.save(wmsGoodsTag); + goodsTag.setQrText(sid); + goodsTag.setText1(wmsGoodsTag.getGoodsSkuTitle()); + goodsTag.setText2(wmsGoodsTag.getGoodsSkuCode()); + goodsTag.setText3(DateUtil.formatDate(new Date())); + goodsTag.setSid(asBusrepairInventorybill.getSourceBillSid()); + } else { + goodsTag.setQrText(sid); + goodsTag.setText1(wmsGoodsTag.getGoodsSkuTitle()); + goodsTag.setText2(wmsGoodsTag.getGoodsSkuCode()); + goodsTag.setText3(DateUtil.formatDate(wmsGoodsTag.getCreateTime())); + goodsTag.setSid(wmsGoodsTag.getBillSid()); + } + list.add(goodsTag); + } + vo.setGoods(list); + return rb.success().setData(vo); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybill.java new file mode 100644 index 0000000000..0d1b7f4b80 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybill.java @@ -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; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybillFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybillFeign.java index 1000a855f1..dbdc6a6b00 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybillFeign.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/AsBusrepairInventorybillFeign.java @@ -25,4 +25,7 @@ public interface AsBusrepairInventorybillFeign { ResultBean selOutBoundCount(@RequestParam("sourceBillSid") String sourceBillSid, @RequestParam("busTypeKey") String busTypeKey, @RequestParam("goodsID") String goodsID); + + @GetMapping("/fetchBySid") + ResultBean fetchBySid(@RequestParam("sid") String sid); } 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 index ac07665943..7be87bfc3a 100644 --- 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 @@ -24,6 +24,9 @@ public interface AsBusrepairBillFeign { @GetMapping("/selectOneByBillNo/{billNo}") public ResultBean selectOneByBillNo(@PathVariable("billNo") String billNo); + @GetMapping("/fetchBySid") + public ResultBean fetchBySid(@RequestParam("sid") String sid); + @PostMapping("/updateOldIsReclaim") @ApiOperation("修改维修工单是否登记") ResultBean updateOldIsReclaim(@RequestParam("billNo") String billNo); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbillvech/AsBusrepairBillVech.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbillvech/AsBusrepairBillVech.java new file mode 100644 index 0000000000..accd3ec736 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbillvech/AsBusrepairBillVech.java @@ -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; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbillvech/AsBusrepairBillVehFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbillvech/AsBusrepairBillVehFeign.java new file mode 100644 index 0000000000..858a108176 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbillvech/AsBusrepairBillVehFeign.java @@ -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); +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java new file mode 100644 index 0000000000..b5f4a3f3d5 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java @@ -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; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailFeign.java index 32e38a6cdf..db7c5d4d8b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailFeign.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailFeign.java @@ -1,11 +1,8 @@ package com.yxt.wms.feign.as.asbusrepairinventorybilldetail; import com.yxt.common.core.result.ResultBean; -import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill; 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.RequestParam; @@ -23,4 +20,8 @@ public interface AsBusrepairInventorybillDetailFeign { @PostMapping("updateOldBySid") @ApiOperation("旧件入库修改") ResultBean updateOldBySid(@RequestParam("sid") String sid,@RequestParam("goodsID") String goodsID,@RequestParam("goodsSkuCode") String goodsSkuCode,@RequestParam("inSid") String inSid); + + @PostMapping("getOldDetailsByOldGoodsId") + @ApiOperation("根据旧件商品id查询商品明细") + ResultBean getOldDetailsByOldGoodsId(@RequestParam("oldGoodsId") String oldGoodsId); }