yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 months ago
parent
d23f8730f8 562c036a31
commit
c44827a4be
7 changed files with 28 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
  2. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml
  3. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml
  4. 2
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java
  5. 2
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSenpircarpulApplyRest.java
  6. 6
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java
  7. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
View File

@ -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 -

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml
View File

@ -6,14 +6,14 @@
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo">
SELECT
ssrwa.*,
SUM(ssr.`estimateRebate`) withRebateTotal,
SUM(ssr.estimateRebate) withRebateTotal,
SUM(ssr.expectItureCost + ssr.expectTreatCost + ssr.expectSuppCost) as withholdCost
FROM
scm_special_rebate_with_apply ssrwa
LEFT JOIN scm_special_rebate_with ssrw
ON ssrwa.`sid` = ssrw.`mainSid`
ON ssrwa.sid = ssrw.mainSid
LEFT JOIN scm_special_rebate ssr
ON ssr.`sid` = ssrw.`specialRebateSid`
ON ssr.sid = ssrw.specialRebateSid
<where>
${ew.sqlSegment}
</where>

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml
View File

@ -6,18 +6,18 @@
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo">
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
<where>
${ew.sqlSegment}
</where>

2
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdFeteApplyRest.java
View File

@ -39,7 +39,7 @@ import javax.validation.Valid;
@Api(tags = "商务宴请事前申请")
@RestController
@RequestMapping("v1/adfeteapply")
@RequestMapping("v1/businessBanquetapply")
public class AdFeteApplyRest {
@Autowired

2
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdSenpircarpulApplyRest.java
View File

@ -39,7 +39,7 @@ import javax.validation.Valid;
@Api(tags = "总经理级固定私车公用申请")
@RestController
@RequestMapping("v1/adsenpircarpulapply")
@RequestMapping("v1/fixedPrivateCarPublicUseapply")
public class AdSenpircarpulApplyRest {
@Autowired

6
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adsenpircarpuldetail/AdSenpircarpulDetailService.java
View File

@ -55,6 +55,12 @@ public class AdSenpircarpulDetailService extends MybatisBaseService<AdSenpircarp
AdSenpircarpulDetail adSenpircarpulDetail = new AdSenpircarpulDetail();
BeanUtil.copyProperties(details, adSenpircarpulDetail);
adSenpircarpulDetail.setMainSid(sid);
adSenpircarpulDetail.setUserSid(details.getUserKey());
adSenpircarpulDetail.setUserName(details.getUserValue());
adSenpircarpulDetail.setDeptSid(details.getDeptKey());
adSenpircarpulDetail.setDeptName(details.getDeptValue());
adSenpircarpulDetail.setPostSid(details.getJobKey());
adSenpircarpulDetail.setPostName(details.getJobValue());
baseMapper.insert(adSenpircarpulDetail);
List<String> detailFiles = details.getDetailFiles();
saveFiles(adSenpircarpulDetail.getSid(), detailFiles, OaFileEnum.ADSENPIRCARPULAPPLY.getAttachType(), "");

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml
View File

@ -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
<where> ${ew.sqlSegment} </where>

Write Preview
Loading…
Cancel
Save