From 056fcd9258c821a27624459a49a78ea9a7686a5f Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 14 九月 2023 13:54:23 +0800 Subject: [PATCH] #订单出库有小数时,优先出小数 --- src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2 + src/main/java/com/zy/asrs/service/LocDetlService.java | 2 + src/main/resources/mapper/LocDetlMapper.xml | 83 +++++++++++++++++++++++++++++++++++++++++ src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 ++ src/main/java/com/zy/asrs/controller/OutController.java | 10 ++++ 5 files changed, 101 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index 1134cc2..910d56b 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -76,7 +76,15 @@ Double c1 = a1.subtract(b1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); double issued = Optional.of( c1 ).orElse(0.0D); if (issued <= 0.0D) { continue; } - List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner()); + BigDecimal decimal = BigDecimal.valueOf(c1).subtract(BigDecimal.valueOf(c1).setScale(0,BigDecimal.ROUND_DOWN)); + + List<LocDetl> locDetls = new ArrayList<>(); + if (decimal.doubleValue() > 0){ + locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner()); + }else { + locDetls = locDetlService.queryStock3(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner()); + } + for (LocDetl locDetl : locDetls) { if (issued > 0) { boolean sign = false; diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java index c68537d..d73f4fc 100644 --- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java @@ -96,4 +96,6 @@ Double sumAll(); String selectLocNoF(String locNo); + + List<LocDetl> queryStock3(String matnr, String batch, int owner); } diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java index 9d0c188..18dd497 100644 --- a/src/main/java/com/zy/asrs/service/LocDetlService.java +++ b/src/main/java/com/zy/asrs/service/LocDetlService.java @@ -56,6 +56,8 @@ List<LocDetl> queryStock(String matnr, String batch,int owner); List<LocDetl> queryStock2(String matnr, String batch,int owner); + List<LocDetl> queryStock3(String matnr, String batch,int owner); + Double queryStockAnfme(String matnr, String batch); List<StockVo> queryStockTotal(StockVo stockVo); diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java index 4f44449..0183f3d 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -112,6 +112,11 @@ } @Override + public List<LocDetl> queryStock3(String matnr, String batch, int owner) { + return this.baseMapper.queryStock3(matnr, batch, owner); + } + + @Override public List<LocDetl> queryStockViewMerge(String locNo) { return this.baseMapper.queryStockViewMerge(locNo); } diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index c11b928..b09bbb2 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -597,6 +597,89 @@ where loc_no = #{locNo} </select> + <select id="queryStock3" resultMap="BaseResultMap"> + select a.* + from asr_loc_detl_merge a + left join asr_loc_detl_F_view b on a.loc_no = b.loc_no + where 1=1 + and b.loc_sts = 'F' + and a.matnr = #{matnr} + and a.payment = 1 + <!-- <choose>--> + <!-- <when test="batch != null and batch != ''">--> + <!-- and a.batch = #{batch}--> + <!-- </when>--> + <!-- <otherwise>--> + <!-- and (a.batch IS NULL OR a.batch = '')--> + <!-- </otherwise>--> + <!-- </choose>--> + + <choose> + <when test="owner != null and owner !=0"> + and a.owner = #{owner} + </when> + <otherwise> + and 1!=1 + </otherwise> + </choose> + + order by + a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme + desc, + NEWID(), + case + when (left(a.loc_no, 2) = '01') then 0 + when (left(a.loc_no, 2) = '02') then 1 + when (left(a.loc_no, 2) = '03') then 1 + when (left(a.loc_no, 2) = '04') then 0 + when (left(a.loc_no, 2) = '05') then 0 + when (left(a.loc_no, 2) = '06') then 1 + when (left(a.loc_no, 2) = '07') then 1 + when (left(a.loc_no, 2) = '08') then 0 + when (left(a.loc_no, 2) = '09') then 0 + when (left(a.loc_no, 2) = '10') then 1 + when (left(a.loc_no, 2) = '11') then 1 + when (left(a.loc_no, 2) = '12') then 0 + when (left(a.loc_no, 2) = '13') then 0 + when (left(a.loc_no, 2) = '14') then 1 + when (left(a.loc_no, 2) = '15') then 1 + when (left(a.loc_no, 2) = '16') then 0 + when (left(a.loc_no, 2) = '17') then 0 + when (left(a.loc_no, 2) = '18') then 1 + when (left(a.loc_no, 2) = '19') then 1 + when (left(a.loc_no, 2) = '20') then 0 + when (left(a.loc_no, 2) = '21') then 0 + when (left(a.loc_no, 2) = '22') then 1 + when (left(a.loc_no, 2) = '23') then 1 + when (left(a.loc_no, 2) = '24') then 0 + when (left(a.loc_no, 2) = '25') then 0 + when (left(a.loc_no, 2) = '26') then 1 + when (left(a.loc_no, 2) = '27') then 1 + when (left(a.loc_no, 2) = '28') then 0 + when (left(a.loc_no, 2) = '29') then 0 + when (left(a.loc_no, 2) = '30') then 1 + when (left(a.loc_no, 2) = '31') then 1 + when (left(a.loc_no, 2) = '32') then 0 + when (left(a.loc_no, 2) = '33') then 0 + when (left(a.loc_no, 2) = '34') then 1 + when (left(a.loc_no, 2) = '35') then 1 + when (left(a.loc_no, 2) = '36') then 0 + when (left(a.loc_no, 2) = '37') then 0 + when (left(a.loc_no, 2) = '38') then 1 + when (left(a.loc_no, 2) = '39') then 1 + when (left(a.loc_no, 2) = '40') then 0 + when (left(a.loc_no, 2) = '41') then 0 + when (left(a.loc_no, 2) = '42') then 1 + when (left(a.loc_no, 2) = '43') then 1 + when (left(a.loc_no, 2) = '44') then 0 + when (left(a.loc_no, 2) = '45') then 0 + when (left(a.loc_no, 2) = '46') then 1 + when (left(a.loc_no, 2) = '47') then 1 + when (left(a.loc_no, 2) = '48') then 0 + else 0 + end + desc + </select> </mapper> -- Gitblit v1.9.1