From 210822fcf3bfd6084afeed3710c522018b270cd5 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 24 Apr 2025 09:16:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/storage/oldPartsInvertory.js | 5 +++-- .../src/views/purchase/purchasereturn/purchasereturn.vue | 2 +- .../oldpPartStocktakingLossEdit.vue | 1 - .../oldpPartStocktakingSurplusEdit.vue | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/yxt-as-ui/src/api/storage/oldPartsInvertory.js b/yxt-as-ui/src/api/storage/oldPartsInvertory.js index d422268adb..8b1c0e2c80 100644 --- a/yxt-as-ui/src/api/storage/oldPartsInvertory.js +++ b/yxt-as-ui/src/api/storage/oldPartsInvertory.js @@ -15,8 +15,9 @@ export default { // 获取旧件出入库记录详情 init: function(data) { return request({ - url: '/wms/apiadmin/WmsOldInventory/getDetailsList?sid=' + data, - method: 'get' + url: '/wms/apiadmin/WmsOldInventory/getDetailsList', + method: 'get', + params: data }) }, deleteBySids: function(data) { diff --git a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue index 704ffac16e..6b7b992337 100644 --- a/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue +++ b/yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue @@ -284,7 +284,7 @@ export default { userSid: '' } } - this.init() + this.getList() }, toAdd() { this.viewState = 2 diff --git a/yxt-as-ui/src/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit.vue b/yxt-as-ui/src/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit.vue index 50d820fb98..cc5b9012c5 100644 --- a/yxt-as-ui/src/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit.vue +++ b/yxt-as-ui/src/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit.vue @@ -263,7 +263,6 @@ showAdd() { this.title = "【新增】" - this.init() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) diff --git a/yxt-as-ui/src/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit.vue b/yxt-as-ui/src/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit.vue index 023dda1abc..35c27969da 100644 --- a/yxt-as-ui/src/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit.vue +++ b/yxt-as-ui/src/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit.vue @@ -296,7 +296,6 @@ }, showAdd() { this.title = "【新增】" - this.init() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) From 6857308c1c5c0ba704f884f087595daf6ae937e0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 24 Apr 2025 09:58:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoshoudingdanFlow/xiaoshoudingdan.vue | 8 ++++---- .../xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue | 4 ++-- .../xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue | 4 ++-- .../xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue | 8 ++++---- .../xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue index 86cbe5a5b7..7bc0949fd9 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue @@ -193,11 +193,11 @@ - +
政策明细
{{ formobj.vehicleCostObj.policyDetails }} - +
备注
{{ formobj.vehicleCostObj.remarks }} @@ -941,10 +941,10 @@ export default { border-top: 1px solid #E0E3EB; } .span-sty { - width: 140px !important; + width: 160px !important; } .addinputInfo { - margin-left: 130px !important; + margin-left: 150px !important; } .jinrong { padding: 7px; diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue index 2bbe1fd849..db1eb488cd 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue @@ -193,11 +193,11 @@ - +
政策明细
{{ formobj.vehicleCostObj.policyDetails }} - +
备注
{{ formobj.vehicleCostObj.remarks }} diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue index 62734f1074..c77ce20531 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue @@ -193,11 +193,11 @@ - +
政策明细
{{ formobj.vehicleCostObj.policyDetails }} - +
备注
{{ formobj.vehicleCostObj.remarks }} diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue index f1883c87ab..20c3f914cd 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue @@ -193,11 +193,11 @@ - +
政策明细
{{ formobj.vehicleCostObj.policyDetails }} - +
备注
{{ formobj.vehicleCostObj.remarks }} @@ -1002,10 +1002,10 @@ export default { padding: 30px 0 20px 0; } .span-sty { - width: 140px !important; + width: 160px !important; } .addinputInfo { - margin-left: 130px !important; + margin-left: 150px !important; } .jinrong { padding: 7px; diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue index e704f50320..ec236ea590 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue @@ -189,11 +189,11 @@ - +
政策明细
{{ formobj.vehicleCostObj.policyDetails }} - +
备注
{{ formobj.vehicleCostObj.remarks }} @@ -675,10 +675,10 @@ export default { padding: 30px 0 20px 0; } .span-sty { - width: 140px !important; + width: 160px !important; } .addinputInfo { - margin-left: 130px !important; + margin-left: 150px !important; } .jinrong { padding: 7px; From 52cf0fb2f6b3f3564fae3539612df3fdf3b97d6d Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 24 Apr 2025 10:47:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=9B=BE=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/as/oldparts/AppOldPartsGoodsSJDto.java | 3 +++ .../terminal/api/as/oldparts/AppOldPartsScanVo.java | 3 +++ .../biz/as/oldparts/AppOldPartsService.java | 2 ++ .../WmsBusrepairInventorybillDetailOldApp.java | 2 ++ .../inventory/wmsinventory/WmsInventoryService.java | 3 +++ .../inventory/wmsinventory/WmsUpdateCountQuery.java | 2 ++ .../WmsBusrepairInventorybillDetailOldApp.java | 2 ++ .../wmsoldinventory/WmsOldInventoryService.java | 13 +++++++++++-- 8 files changed, 28 insertions(+), 2 deletions(-) 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 index 75cc68d6a7..9f2e8ee2f5 100644 --- 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 @@ -20,4 +20,7 @@ public class AppOldPartsGoodsSJDto implements Dto { private String houseCode; @ApiModelProperty("数量") private BigDecimal count; + + @ApiModelProperty("图号") + private String goodsCode; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java index c029594dd9..e2d93baca2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java @@ -26,4 +26,7 @@ public class AppOldPartsScanVo implements Vo { private String houseName; @ApiModelProperty("仓库地址") private String houseAddress; + + @ApiModelProperty("图号") + private String goodsCode; } 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 741a86db2f..333c24d676 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 @@ -190,6 +190,7 @@ public class AppOldPartsService { wmsBusrepairInventorybillDetailOldApp.setGoodsID(appOldPartsGoodsSJDto.getGoodsID()); wmsBusrepairInventorybillDetailOldApp.setWarehouseRackCode(appOldPartsGoodsSJDto.getHouseCode()); wmsBusrepairInventorybillDetailOldApp.setCount(appOldPartsGoodsSJDto.getCount()); + wmsBusrepairInventorybillDetailOldApp.setGoodsCode(appOldPartsGoodsSJDto.getGoodsCode()); wmsBusrepairInventorybillDetailOldApps.add(wmsBusrepairInventorybillDetailOldApp); } wmsOldGroundConfirmApp.setOldList(wmsBusrepairInventorybillDetailOldApps); @@ -222,6 +223,7 @@ public class AppOldPartsService { appOldPartsScanVo.setGoodsID(content); appOldPartsScanVo.setGoodsName(asBusrepairInventorybillDetail.getGoodsSkuTitle()); appOldPartsScanVo.setGoodsMax(chae.setScale(0,BigDecimal.ROUND_DOWN).toString()); + appOldPartsScanVo.setGoodsCode(asBusrepairInventorybillDetail.getGoodsSkuCode()); } else if ("1".equals(type)) {//库位码 if (!content.contains("#")) { return rb.setMsg("请扫描库位码"); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java index 77aa4f407b..c72c8ee331 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java @@ -14,4 +14,6 @@ public class WmsBusrepairInventorybillDetailOldApp { private String warehouseRackCode; @ApiModelProperty("出/退库数量") private BigDecimal count; + + private String goodsCode; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index 1aa3e55c49..bf40993273 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -406,6 +406,9 @@ public class WmsInventoryService extends MybatisBaseService Date: Thu, 24 Apr 2025 11:43:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A7=E4=BB=B6?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=90=8E=E7=9A=84=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=BD=A6=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/wmsoldinventory/WmsOldInventoryMapper.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 8145ae6568..42bb1fbe4f 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 @@ -179,12 +179,18 @@