From f545aee6879bc75c2ac9f6ac24cb31db9a08a380 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 27 Feb 2025 10:58:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index 0cc4547453..72949a3fa6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -222,9 +222,11 @@ CONCAT( d.warehouseName, '-', - d.warehouseArea, + z.zoneName, '-', - d.warehouseRackName + d.warehouseArea, + '\n', + r.rackCode ) AS title, SUM(bookCount) - SUM(realCount) AS surplusNumber, SUM(bookCount) AS totalNumber, @@ -234,6 +236,8 @@ SUM(realCount) AS actualNumber FROM wms_inventory_checkbill_detail d + LEFT JOIN wms_warehouse_rack r ON d.warehouseRackSid = r.sid + LEFT JOIN wms_warehouse_zone z on z.sid = r.zoneSid LEFT JOIN wms_inventory_checkbill c ON d.billSid = c.sid ${ew.sqlSegment} From 562c036a315362ba535a062313c21830c60ae82d Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 27 Feb 2025 11:30:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialrebateCheckapplydetailMapper.xml | 10 +++++----- .../ScmSpecialRebateWithApplyMapper.xml | 6 +++--- .../ScmVehrebateCheckapplyMapper.xml | 12 ++++++------ .../java/com/yxt/anrui/oa/api/AdFeteApplyRest.java | 2 +- .../yxt/anrui/oa/api/AdSenpircarpulApplyRest.java | 2 +- .../AdSenpircarpulDetailService.java | 6 ++++++ 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml index d50ba2b84a..26fb32fb93 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml @@ -16,7 +16,7 @@ SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney, ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney, SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney, - SUM(ssc.adjustmentMoney) adjustmentMoney, + SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney, SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost, ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + @@ -41,7 +41,7 @@ SUM(IF(ssc.onceCheckState = 1, ssc.secondaryUploadMoney, ssc.uploadMoney + ssc.secondaryUploadMoney)) uploadMoney, SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney, - SUM(ssc.adjustmentMoney) adjustmentMoney, + SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney, SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost, SUM(IF(ssc.onceCheckState = 1, ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost, ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + @@ -84,7 +84,7 @@ ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost)) AS moneyTotal, SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoneyTotal, - SUM(ssc.adjustmentMoney) adjustmentMoneyTotal, + SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoneyTotal, SUM(IF(ssc.isAdjustment = '是', ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost - @@ -108,7 +108,7 @@ ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost)) AS money, SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney, - SUM(ssc.adjustmentMoney) adjustmentMoney, + SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney, SUM(IF(ssc.isAdjustment = '是', ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost - @@ -134,7 +134,7 @@ ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost)) AS money, SUM(IF(ssc.onceCheckState = 1, 0, ssc.stayDetermineMoney)) stayDetermineMoney, - SUM(ssc.adjustmentMoney) adjustmentMoney, + SUM(CAST(ssc.adjustmentMoney AS DECIMAL(10, 2))) adjustmentMoney, SUM(IF(ssc.isAdjustment = '是', ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost + ssc.secondTreatCost + ssc.secondSuppCost - ssc.expectItureCost - ssc.expectTreatCost - diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml index abed52dd33..8347692d98 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml @@ -6,14 +6,14 @@ SELECT svc.*, - SUM(svr.`estimateRebate`) estimateRebate, - SUM(svr.`uploadMoney`) uploadMoney, - SUM(svr.`stayDetermineMoney`) stayDetermineMoney, - SUM(svr.`adjustmentMoney`) adjustmentMoney, + SUM(svr.estimateRebate) estimateRebate, + SUM(svr.uploadMoney) uploadMoney, + SUM(svr.stayDetermineMoney) stayDetermineMoney, + SUM(svr.adjustmentMoney) adjustmentMoney, SUM(svr.onceTreatCost + svr.onceSuppCost + svr.secondTreatCost + svr.secondSuppCost) money, SUM(svr.expectTreatCost + svr.expectSuppCost) withholdCost FROM scm_vehrebate_checkapply svc LEFT JOIN scm_vehrebate_checkapplydetail svcd - ON svc.`sid` = svcd.`mainSid` + ON svc.sid = svcd.mainSid LEFT JOIN scm_veh_rebate svr - ON svr.`sid` = svcd.`vehRebateSid` + ON svr.sid = svcd.vehRebateSid ${ew.sqlSegment} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java index bd6f5405c2..132e58fdf1 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java @@ -39,7 +39,7 @@ import javax.validation.Valid; @Api(tags = "商务宴请事前申请") @RestController -@RequestMapping("v1/adfeteapply") +@RequestMapping("v1/businessBanquetapply") public class AdFeteApplyRest { @Autowired diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSenpircarpulApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSenpircarpulApplyRest.java index 2253ad104c..bb1819808b 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSenpircarpulApplyRest.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSenpircarpulApplyRest.java @@ -39,7 +39,7 @@ import javax.validation.Valid; @Api(tags = "总经理级固定私车公用申请") @RestController -@RequestMapping("v1/adsenpircarpulapply") +@RequestMapping("v1/fixedPrivateCarPublicUseapply") public class AdSenpircarpulApplyRest { @Autowired diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java index 0430ab682d..ba6adc3838 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java @@ -55,6 +55,12 @@ public class AdSenpircarpulDetailService extends MybatisBaseService detailFiles = details.getDetailFiles(); saveFiles(adSenpircarpulDetail.getSid(), detailFiles, OaFileEnum.ADSENPIRCARPULAPPLY.getAttachType(), "");