From d6220c0485733477a099d67f20ad622c3daad6ef Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 05 九月 2023 16:35:59 +0800 Subject: [PATCH] # --- src/main/resources/mapper/ManLocDetlMapper.xml | 9 ++++ src/main/webapp/static/js/order/out.js | 18 -------- src/main/java/com/zy/asrs/service/ManLocDetlService.java | 3 - src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 4 +- src/main/java/com/zy/common/model/LocDto.java | 14 +++++-- src/main/java/com/zy/asrs/controller/OutController.java | 12 ++--- src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java | 3 - 7 files changed, 29 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index c71a1f9..5dad0b1 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -76,14 +76,14 @@ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D); if (issued <= 0.0D) { continue; } - List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch()); - for (LocDetl locDetl : locDetls) { + List<ManLocDetl> manLocDetls = manLocDetlService.queryStock(orderDetl.getMatnr()); + for (ManLocDetl locDetl : manLocDetls) { if (issued > 0) { boolean sign = false; if (issued > locDetl.getAnfme() || locDetl.getAnfme().equals(issued)){ sign=true; } - LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), + LocDto locDto = new LocDto(locDetl.getHostId(),locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), sign ? locDetl.getAnfme() : issued); List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), sign? 101 : 103); // LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(), @@ -91,7 +91,6 @@ // //閫熻吘鍙湁鍏ㄦ澘锛屾墍浠ュ彧鑳�101鍏ㄦ澘鍑哄簱 // List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), 101); locDto.setStaNos(staNos); - locDto.setManu(locDetl.getManu()); locDtos.add(locDto); exist.add(locDetl.getLocNo()); BigDecimal iss=new BigDecimal(Double.toString(issued)).setScale(2,BigDecimal.ROUND_HALF_UP); @@ -103,7 +102,7 @@ } } if (issued > 0) { - LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued); + LocDto locDto = new LocDto(null,null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued); // LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued); locDto.setLack(Boolean.TRUE); locDtos.add(locDto); @@ -176,8 +175,6 @@ LocDto locDto = locDtos.get(locDtos.size() - 1 - i); if (locDto.getLocNo() == null) { is[i][0] = 1; - } else if (locDto.getManu().equals("绔嬪簱")){ - is[i][0] = 2; } else { is[i][0] = 0; } @@ -269,6 +266,7 @@ private R addPakOUT(LocDto locDto,String uuid){ ManPakOut manPakOut=new ManPakOut(); + manPakOut.setDocId(locDto.getHostId()); manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis()); manPakOut.setWrkSts((long)1); manPakOut.setAnfme(locDto.getAnfme()); diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java index 1d9ae14..f3e7f83 100644 --- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.Map; -import java.util.Set; @Mapper @Repository @@ -54,7 +53,7 @@ // ------------------------------------------------- - List<ManLocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos); + List<ManLocDetl> queryStock(@Param("matnr")String matnr); Double queryStockAnfme(String matnr, String batch); diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java index 1eb828d..51b92ab 100644 --- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java +++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java @@ -9,7 +9,6 @@ import com.zy.system.entity.User; import java.util.List; -import java.util.Set; public interface ManLocDetlService extends IService<ManLocDetl> { Page<ManLocDetl> getPage(Page<ManLocDetl> page); @@ -44,7 +43,7 @@ // -------------------------------------------------- - List<ManLocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos); + List<ManLocDetl> queryStock(String matnr); Double queryStockAnfme(String matnr, String batch); diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java index f9731fc..b1bd458 100644 --- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java @@ -91,8 +91,8 @@ } @Override - public List<ManLocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) { - return this.baseMapper.queryStock(matnr, batch, orderNo, locNos); + public List<ManLocDetl> queryStock(String matnr) { + return this.baseMapper.queryStock(matnr); } @Override diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java index 435baa0..11e3c51 100644 --- a/src/main/java/com/zy/common/model/LocDto.java +++ b/src/main/java/com/zy/common/model/LocDto.java @@ -12,6 +12,8 @@ @Data public class LocDto { + private Long hostId; + private String locNo; private String matnr; @@ -39,32 +41,35 @@ public LocDto() { } - public LocDto(String locNo, String matnr, String batch, Double anfme) { + public LocDto(Long hostId,String locNo, String matnr, String batch, Double anfme) { this.locNo = locNo; this.matnr = matnr; this.batch = batch; this.anfme = anfme; + this.hostId = hostId; } - public LocDto(String locNo, String matnr, String batch, String orderNo, Double anfme) { + public LocDto(Long hostId,String locNo, String matnr, String batch, String orderNo, Double anfme) { this.locNo = locNo; this.matnr = matnr; this.batch = batch; this.orderNo = orderNo; this.anfme = anfme; + this.hostId = hostId; } - public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) { + public LocDto(Long hostId,String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) { this.locNo = locNo; this.matnr = matnr; this.maktx = maktx; this.batch = batch; this.orderNo = orderNo; this.anfme = anfme; + this.hostId = hostId; } - public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme, Double needQty) { + public LocDto(Long hostId,String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme, Double needQty) { this.locNo = locNo; this.matnr = matnr; this.maktx = maktx; @@ -72,6 +77,7 @@ this.orderNo = orderNo; this.anfme = anfme; this.needQty = needQty; + this.hostId = hostId; } public String getTitle() { diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml index 51cd24b..5453e83 100644 --- a/src/main/resources/mapper/ManLocDetlMapper.xml +++ b/src/main/resources/mapper/ManLocDetlMapper.xml @@ -416,6 +416,15 @@ </select> + <select id="queryStock" 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} + + </select> <delete id="deleteDatailed"> delete from man_loc_detl where loc_no = #{locNo} diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js index 9dc629a..21099b0 100644 --- a/src/main/webapp/static/js/order/out.js +++ b/src/main/webapp/static/js/order/out.js @@ -35,25 +35,10 @@ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160} ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160} ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200} - // ,{field: 'anfme', align: 'center',title: '鏁伴噺'} - // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'} ,{field: 'anfme', align: 'center',title: '鎬绘暟閲�', style: 'font-weight: bold'} ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'} - // ,{field: 'name', align: 'center',title: '鍚嶇О'} - // ,{field: 'model', align: 'center',title: '鍨嬪彿'} ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true} ,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉$爜', hide: true} - // ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'} - // ,{field: 'unitPrice', align: 'center',title: '鍗曚环'} - // ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'} - // ,{field: 'count', align: 'center',title: '鏁伴噺'} - // ,{field: 'weight', align: 'center',title: '閲嶉噺'} - // ,{field: 'status$', align: 'center',title: '鐘舵��'} - // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'} - // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} - // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} - // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} - // ,{field: 'memo', align: 'center',title: '澶囨敞'} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 160} ]], request: { @@ -160,8 +145,7 @@ // {type: 'checkbox', merge: ['orderNo']}, {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'}, {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350}, - {field: 'batch', title: '搴忓垪鐮�', align: 'center'}, - {field: 'manu', title: '浠撳簱', align: 'center'}, + {field: 'hostId', title: 'id', align: 'center'}, // { title: '鍓╀綑闇�姹傞噺', align: 'center' , width: 120, toolbar: '#checkNeedQty'}, // {field: 'anfme', title: '瀹為檯鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'}, { title: '鍑哄簱鏁伴噺', align: 'center',field: 'anfme', width: 90, style: 'font-weight: bold; color: red'}, -- Gitblit v1.9.1