From 9bc8133ba383186f84186ab30a5b86bb391fa9eb Mon Sep 17 00:00:00 2001 From: LSH Date: 星期四, 25 五月 2023 08:11:02 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 10 src/main/java/com/zy/asrs/service/WorkService.java | 5 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 4 src/main/java/com/zy/asrs/service/LocDetlService.java | 2 src/main/java/com/zy/asrs/controller/LocDetlController.java | 4 src/main/webapp/views/pakStore/turnOverQuery.html | 2 src/main/resources/mapper/LocDetlMapper.xml | 60 +++++-- src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 14 + src/main/java/com/zy/asrs/controller/WorkController.java | 7 src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java | 3 src/main/webapp/views/pakStore/turnOver.html | 4 src/main/java/com/zy/asrs/entity/ManLocDetl.java | 8 src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 8 src/main/java/com/zy/asrs/entity/WaitPakin.java | 8 src/main/java/com/zy/asrs/entity/LocDetl.java | 8 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 107 ++++++++++-- src/main/webapp/views/pakStore/turnOverPayment.html | 131 ++++++++++++++++ src/main/java/com/zy/asrs/entity/WrkDetl.java | 8 src/main/webapp/static/js/pakStore/turnOver.js | 34 ++++ src/main/webapp/static/js/common.js | 3 21 files changed, 358 insertions(+), 74 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java index 8c097e8..f9e1bd1 100644 --- a/src/main/java/com/zy/asrs/controller/LocDetlController.java +++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java @@ -86,7 +86,7 @@ param.remove("modi_time"); } } - return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class))); + return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"2")); } @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂 @@ -309,7 +309,7 @@ } } - return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class))); + return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"1")); } diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java index 2908f18..b3406ea 100644 --- a/src/main/java/com/zy/asrs/controller/WorkController.java +++ b/src/main/java/com/zy/asrs/controller/WorkController.java @@ -99,6 +99,13 @@ return R.ok("瀹㈡埛杞崲鎴愬姛"); } + @RequestMapping("/turn/over/out/payment/start") + @ManagerAuth(memo = "璐х墿褰㈡�佽浆鎹�") + public R turnOverOutStartPayment(@RequestBody EmptyPlateOutParam param) { + workService.turnOverOutPayment(param, getUserId()); + return R.ok("璐х墿褰㈡�佸凡杞负浠撳偍"); + } + @RequestMapping("/empty/plate/in/start") @ManagerAuth(memo = "绌烘澘鍏ュ簱") public R emptyPlateInStart(@RequestParam Integer sourceStaNo) { diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index 5468ff9..3d43daa 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -167,9 +167,9 @@ private Integer owner; /** - * 鏄惁浠樻 + * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌� */ - @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ") + @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�") private Integer payment; /** @@ -193,9 +193,9 @@ if (null == this.payment){ return null; } switch (this.payment){ case 1: - return "宸蹭粯娆�"; + return "浠撳偍"; case 0: - return "鏈粯娆�"; + return "浠i噰"; default: return String.valueOf(this.payment); } diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java index c773d93..583fd81 100644 --- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java +++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java @@ -210,9 +210,9 @@ private Integer owner; /** - * 鏄惁浠樻 + * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌� */ - @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ") + @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�") private Integer payment; /** @@ -292,9 +292,9 @@ if (null == this.payment){ return null; } switch (this.payment){ case 1: - return "宸蹭粯娆�"; + return "浠撳偍"; case 0: - return "鏈粯娆�"; + return "浠i噰"; default: return String.valueOf(this.payment); } diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index e7dcc1a..c632dad 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakin.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java @@ -166,9 +166,9 @@ private Integer owner; /** - * 鏄惁浠樻 + * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌� */ - @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ") + @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�") private Integer payment; /** @@ -192,9 +192,9 @@ if (null == this.payment){ return null; } switch (this.payment){ case 1: - return "宸蹭粯娆�"; + return "浠撳偍"; case 0: - return "鏈粯娆�"; + return "浠i噰"; default: return String.valueOf(this.payment); } diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java index 39011f1..152a385 100644 --- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java +++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java @@ -162,9 +162,9 @@ private Integer owner; /** - * 鏄惁浠樻 + * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌� */ - @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ") + @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�") private Integer payment; /** @@ -188,9 +188,9 @@ if (null == this.payment){ return null; } switch (this.payment){ case 1: - return "宸蹭粯娆�"; + return "浠撳偍"; case 0: - return "鏈粯娆�"; + return "浠i噰"; default: return String.valueOf(this.payment); } diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java index 136d6f7..60c175a 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetl.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java @@ -279,9 +279,9 @@ private Integer owner; /** - * 鏄惁浠樻 + * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌� */ - @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ") + @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�") private Integer payment; /** @@ -305,9 +305,9 @@ if (null == this.payment){ return null; } switch (this.payment){ case 1: - return "宸蹭粯娆�"; + return "浠撳偍"; case 0: - return "鏈粯娆�"; + return "浠i噰"; default: return String.valueOf(this.payment); } diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java index 7a560ba..b201894 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java @@ -274,13 +274,13 @@ /** * 鎷ユ湁鑰� */ - @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ") + @ApiModelProperty(value= "璐т富 1: 椤圭洰瀹㈡埛 ") private Integer owner; /** - * 鏄惁浠樻 + * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌� */ - @ApiModelProperty(value= "鏄惁浠樻0锛氭湭浠樻銆�1锛氬凡浠樻 ") + @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�") private Integer payment; /** @@ -304,9 +304,9 @@ if (null == this.payment){ return null; } switch (this.payment){ case 1: - return "宸蹭粯娆�"; + return "浠撳偍"; case 0: - return "鏈粯娆�"; + return "浠i噰"; default: return String.valueOf(this.payment); } diff --git a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java index 8e254b2..c038160 100644 --- a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java +++ b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java @@ -46,6 +46,9 @@ // 缈诲寘 private String memo; + // 缈诲寘 + private String manu; + } public Integer getOutSite() { diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java index e7a9795..6c7fdad 100644 --- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java @@ -31,6 +31,10 @@ Integer getStockOutPageCount(Map<String, Object> map); + List<LocDetl> getStockOutPage2(Map<String, Object> map); + + Integer getStockOutPageCount2(Map<String, Object> map); + @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}") int updateLocNo(String newLocNo, String oldLocNo); diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java index 47eb851..0c55cbd 100644 --- a/src/main/java/com/zy/asrs/service/LocDetlService.java +++ b/src/main/java/com/zy/asrs/service/LocDetlService.java @@ -15,7 +15,7 @@ LocDetl selectItem(String locNo, String matnr, String batch); - Page<LocDetl> getStockOut(Page<LocDetl> page); + Page<LocDetl> getStockOut(Page<LocDetl> page,String view); /** * 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍 diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java index 5d7e2ad..3683646 100644 --- a/src/main/java/com/zy/asrs/service/WorkService.java +++ b/src/main/java/com/zy/asrs/service/WorkService.java @@ -71,6 +71,11 @@ void turnOverOut(EmptyPlateOutParam param, Long userId); /** + * 绉讳氦浣滀笟 + */ + void turnOverOutPayment(EmptyPlateOutParam param, Long userId); + + /** * 鎵嬪姩瀹屾垚宸ヤ綔妗� */ void completeWrkMast(String workNo, Long userId); 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 bd4ef60..7187a96 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java @@ -22,9 +22,17 @@ } @Override - public Page<LocDetl> getStockOut(Page<LocDetl> page) { - page.setRecords(baseMapper.getStockOutPage(page.getCondition())); - page.setTotal(baseMapper.getStockOutPageCount(page.getCondition())); + public Page<LocDetl> getStockOut(Page<LocDetl> page,String view) { + if (view.equals("1")){ + page.setRecords(baseMapper.getStockOutPage2(page.getCondition())); + page.setTotal(baseMapper.getStockOutPageCount2(page.getCondition())); + }else if (view.equals("2")){ + page.setRecords(baseMapper.getStockOutPage(page.getCondition())); + page.setTotal(baseMapper.getStockOutPageCount(page.getCondition())); + }else { + page.setRecords(baseMapper.getStockOutPage(page.getCondition())); + page.setTotal(baseMapper.getStockOutPageCount(page.getCondition())); + } return page; } diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 858d7f1..a26c34f 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -61,7 +61,7 @@ @Autowired private WrkDetlLogService wrkDetlLogService; @Autowired - private SnowflakeIdWorker snowflakeIdWorker; + private ManLocDetlService manLocDetlService; @Autowired private OrderService orderService; @Autowired @@ -1118,9 +1118,14 @@ throw new CoolException("璇锋彁鍙栨槑缁�"); } ArrayList<String> locNos = new ArrayList<>(); + String[][] locNos2 =new String[param.getLocDetls().size()][2]; + int i=0; for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){ if (!locNos.contains(locDetl.getLocNo())){ locNos.add(locDetl.getLocNo()); + locNos2[i][0]=locDetl.getLocNo(); + locNos2[i][1]=locDetl.getManu(); + i++; } } LocOwner locOwner = locOwnerService.selectById(param.getOwnerId()); @@ -1128,27 +1133,40 @@ String lgort = ""; String owner=""; List<DetlDto> detlDtos = new ArrayList<>(); - for (String locNo : locNos) { - List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo)); - for (LocDetl locDetl:locDetls){ - if (Cools.isEmpty(lgort)) { - lgort = locDetl.getOrigin(); + for (String[] locNo1 : locNos2) { + String locNo = locNo1[0]; + if (locNo1[1].equals("骞冲簱")){ + List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo)); + for (ManLocDetl manLocDetl:manLocDetls){ + if (Cools.isEmpty(owner)) { + owner = manLocDetl.getOwner$(); + } + detlDtos.add(new DetlDto(manLocDetl.getMatnr(), manLocDetl.getBatch(), manLocDetl.getAnfme())); + manLocDetl.setOwner(param.getOwnerId()); + try{ + manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("uuid",manLocDetl.getUuid())); + }catch (Exception e){ + throw new Exception("鏇存柊搴撳瓨鏄庣粏鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡"); + } } - if (Cools.isEmpty(owner)) { - owner = locDetl.getOwner$(); + }else if (locNo1[1].equals("绔嬪簱")){ + List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo)); + for (LocDetl locDetl:locDetls){ + if (Cools.isEmpty(lgort)) { + lgort = locDetl.getOrigin(); + } + if (Cools.isEmpty(owner)) { + owner = locDetl.getOwner$(); + } + detlDtos.add(new DetlDto(locDetl.getMatnr(), locDetl.getBatch(), locDetl.getAnfme())); + locDetl.setOwner(param.getOwnerId()); + try{ + locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("uuid",locDetl.getUuid())); + }catch (Exception e){ + throw new Exception("鏇存柊搴撳瓨鏄庣粏鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡"); + } } - detlDtos.add(new DetlDto(locDetl.getMatnr(), locDetl.getBatch(), locDetl.getAnfme())); - locDetl.setOwner(param.getOwnerId()); - try{ - locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getBatch()).eq("anfme",locDetl.getAnfme())); - }catch (Exception e){ - throw new Exception("鏇存柊搴撳瓨鏄庣粏鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡"); - } - } - LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo)); - try { - locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no",locMast.getLocNo())); - }catch (Exception e){ + }else { throw new Exception("鏇存柊搴撲綅鎷ユ湁鑰呭瓧娈典俊鎭嚭閿欎簡"); } } @@ -1157,4 +1175,53 @@ } } + @Override + @Transactional + public void turnOverOutPayment(EmptyPlateOutParam param, Long userId) { + try { + if (param.getLocDetls().size()<=0){ + throw new CoolException("璇锋彁鍙栨槑缁�"); + } + ArrayList<String> locNos = new ArrayList<>(); + String[][] locNos2 =new String[param.getLocDetls().size()][2]; + int i=0; + for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){ + if (!locNos.contains(locDetl.getLocNo())){ + locNos.add(locDetl.getLocNo()); + locNos2[i][0]=locDetl.getLocNo(); + locNos2[i][1]=locDetl.getManu(); + i++; + } + } + for (String[] locNo1 : locNos2) { + String locNo = locNo1[0]; + if (locNo1[1].equals("骞冲簱")){ + List<ManLocDetl> manLocDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo)); + for (ManLocDetl manLocDetl:manLocDetls){ + manLocDetl.setPayment(1); + try{ + manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("uuid",manLocDetl.getUuid())); + }catch (Exception e){ + throw new Exception("鏇存柊搴撳瓨鏄庣粏璐х墿褰㈡�佸瓧娈典俊鎭嚭閿欎簡"); + } + } + }else if (locNo1[1].equals("绔嬪簱")){ + List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo)); + for (LocDetl locDetl:locDetls){ + locDetl.setPayment(1); + try{ + locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("uuid",locDetl.getUuid())); + }catch (Exception e){ + throw new Exception("鏇存柊搴撳瓨鏄庣粏璐х墿褰㈡�佸瓧娈典俊鎭嚭閿欎簡"); + } + } + }else { + throw new Exception("鏇存柊搴撲綅璐х墿褰㈡�佸瓧娈典俊鎭嚭閿欎簡"); + } + } + }catch (Exception e){ + throw new CoolException("璐х墿褰㈡�佽浆鎹㈠嚭閿欎簡锛�"+e); + } + } + } diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index c32f397..a2c7dee 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -118,22 +118,6 @@ left join asr_loc_mast b on a.loc_no = b.loc_no where 1=1 and b.loc_sts = 'F' - <choose> - <when test="owner != null and owner != 0"> - and owner = #{owner} - </when> - <otherwise> - and 1!=1 - </otherwise> - </choose> - <choose> - <when test="payment != null and payment != 0"> - and payment = #{payment} - </when> - <otherwise> - and 1!=1 - </otherwise> - </choose> <include refid="stockOutCondition"></include> ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) </select> @@ -145,6 +129,19 @@ left join asr_loc_mast b on a.loc_no = b.loc_no where 1=1 and b.loc_sts = 'F' + <include refid="stockOutCondition"></include> + </select> + + <select id="getStockOutPage2" resultMap="BaseResultMap"> + select * from + ( + select + ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row, + a.* + from asr_loc_detl_merge a + left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no + where 1=1 + and b.loc_sts = 'F' <choose> <when test="owner != null and owner != 0"> and owner = #{owner} @@ -153,14 +150,41 @@ and 1!=1 </otherwise> </choose> +<!-- <choose>--> +<!-- <when test="payment != null and payment != 0">--> +<!-- and payment = #{payment}--> +<!-- </when>--> +<!-- <otherwise>--> +<!-- and 1!=1--> +<!-- </otherwise>--> +<!-- </choose>--> + <include refid="stockOutCondition"></include> + ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) + </select> + + <select id="getStockOutPageCount2" parameterType="java.util.Map" resultType="java.lang.Integer"> + select + count(1) + from asr_loc_detl_merge a + left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no + where 1=1 + and b.loc_sts = 'F' <choose> - <when test="payment != null and payment != 0"> - and payment = #{payment} + <when test="owner != null and owner != 0"> + and owner = #{owner} </when> <otherwise> and 1!=1 </otherwise> </choose> +<!-- <choose>--> +<!-- <when test="payment != null and payment != 0">--> +<!-- and payment = #{payment}--> +<!-- </when>--> +<!-- <otherwise>--> +<!-- and 1!=1--> +<!-- </otherwise>--> +<!-- </choose>--> <include refid="stockOutCondition"></include> </select> diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index db93a82..3f72ce0 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -270,6 +270,7 @@ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true} ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true} ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true} - ,{field: 'owner$', align: 'center',title: '瀹㈡埛鍚嶇О', hide: false} + ,{field: 'owner$', align: 'center',title: '璐т富', hide: false} + ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false} ] diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js index 86d2dfa..6a7c918 100644 --- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js +++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js @@ -35,6 +35,8 @@ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true} ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true} ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true} + ,{field: 'owner$', align: 'center',title: '璐т富', hide: false} + ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false} ]; diff --git a/src/main/webapp/static/js/pakStore/turnOver.js b/src/main/webapp/static/js/pakStore/turnOver.js index fb1f72a..b503792 100644 --- a/src/main/webapp/static/js/pakStore/turnOver.js +++ b/src/main/webapp/static/js/pakStore/turnOver.js @@ -46,7 +46,7 @@ } else { var staNo = $("#staNoSelect").val(); if (staNo === "" || staNo === null){ - layer.msg("璇烽�夋嫨鐩爣瀹㈡埛", {icon: 2}); + layer.msg("璇烽�夋嫨鐩爣璐т富", {icon: 2}); return; } let param = { @@ -73,6 +73,38 @@ }); } break; + case 'outboundPayment': + if (locDetlData.length === 0){ + layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2}); + } else { + // var staNo = $("#staNoSelect").val(); + // if (staNo === "" || staNo === null){ + // layer.msg("璇烽�夋嫨鐩爣璐т富", {icon: 2}); + // return; + // } + let param = { + locDetls: locDetlData + } + $.ajax({ + url: baseUrl+"/turn/over/out/payment/start", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(param), + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + if (res.code === 200){ + locDetlData = []; + tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}}); + layer.msg(res.msg, {icon: 1}); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }); + } + break; } }); diff --git a/src/main/webapp/views/pakStore/turnOver.html b/src/main/webapp/views/pakStore/turnOver.html index fccf129..44536d5 100644 --- a/src/main/webapp/views/pakStore/turnOver.html +++ b/src/main/webapp/views/pakStore/turnOver.html @@ -96,9 +96,9 @@ <div class="layui-form"> <div class="layui-btn-container"> <!-- 1.閫夋嫨瀹㈡埛 --> - <span id="staNoSpan">瀹㈡埛鍚嶇О锛�</span> + <span id="staNoSpan">璐т富锛�</span> <select id="staNoSelect" lay-verify="required"> - <option value="">璇烽�夋嫨鐩爣瀹㈡埛</option> + <option value="">璇烽�夋嫨鐩爣璐т富</option> </select> <!-- 2.鍚姩鍑哄簱 --> <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">寮�濮嬭浆鎹�</button> diff --git a/src/main/webapp/views/pakStore/turnOverPayment.html b/src/main/webapp/views/pakStore/turnOverPayment.html new file mode 100644 index 0000000..fd600cb --- /dev/null +++ b/src/main/webapp/views/pakStore/turnOverPayment.html @@ -0,0 +1,131 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/common.css" media="all"> + <style> + html { + height: 100%; + padding: 10px; + background-color: #f1f1f1; + box-sizing: border-box; + } + body { + background-color: #fff; + border-radius: 5px; + box-shadow: 0 0 3px rgba(0,0,0,.3); + padding-bottom: 20px; + } + + #staNoSpan { + text-align: center; + display: inline-block; + width: 100px; + font-size: 13px; + } + .layui-btn-container .layui-form-select { + display: inline-block; + width: 150px; + height: 30px; + } + .layui-btn-container .layui-form-select.layui-form-selected { + display: inline-block; + width: 150px; + } + .layui-btn-container .layui-select-title input { + font-size: 13px; + } + .layui-btn-container .layui-anim.layui-anim-upbit dd { + font-size: 13px; + } + + #btn-outbound { + margin-left: 60px; + /*display: none;*/ + } + + /*----------------------------------*/ + .function-area { + padding: 20px 50px; + } + .function-btn { + font-size: 16px; + padding: 1px 2px; + width: 100px; + height: 50px; + border-color: #2b425b; + border-radius: 4px; + border-width: 2px; + background: none; + border-style: solid; + transition: 0.4s; + cursor: pointer; + letter-spacing: 1.5px; + } + .function-btn:hover { + background-color: #2b425b; + color: #fff; + } + + #mat-query { + /*display: none;*/ + } + </style> +</head> +<body> + +<!-- 鍔熻兘鍖� --> +<div class="function-area"> + <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button> +</div> + +<hr> + +<!-- 琛ㄦ牸 --> +<div style="padding-bottom: 5px; margin-bottom: 45px"> + + <!-- 澶撮儴 --> + <script type="text/html" id="toolbar"> + <div class="layui-form"> + <div class="layui-btn-container"> +<!-- <!– 1.閫夋嫨瀹㈡埛 –>--> +<!-- <span id="staNoSpan">璐т富锛�</span>--> +<!-- <select id="staNoSelect" lay-verify="required">--> +<!-- <option value="">璇烽�夋嫨鐩爣璐т富</option>--> +<!-- </select>--> + <!-- 2.鍚姩鍑哄簱 --> + <button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outboundPayment">杞崲璐х墿褰㈡�佷负浠撳偍</button> + </div> + </div> + </script> + + <!-- 琛� --> + <script type="text/html" id="operate"> + <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a> + </script> + + <table class="layui-table" id="chooseData" lay-filter="chooseData"></table> +</div> + +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script> +<script type="text/javascript" src="../../static/js/pakStore/turnOver.js" charset="utf-8"></script> + +<script type="text/template" id="takeSiteSelectTemplate"> + {{#each data}} + <option value="{{siteId}}">{{desc}}</option> + {{/each}} +</script> +</body> +</html> + diff --git a/src/main/webapp/views/pakStore/turnOverQuery.html b/src/main/webapp/views/pakStore/turnOverQuery.html index 0f71ccc..b414156 100644 --- a/src/main/webapp/views/pakStore/turnOverQuery.html +++ b/src/main/webapp/views/pakStore/turnOverQuery.html @@ -69,7 +69,7 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> - <input class="layui-input" type="text" name="owner" placeholder="瀹㈡埛" autocomplete="off"> + <input class="layui-input" type="text" name="owner" placeholder="璐т富" autocomplete="off"> </div> </div> <!-- 寰呮坊鍔� --> -- Gitblit v1.9.1