From f42daa4afb23949f718bcbc3c78ae0ec4079adb0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 12 六月 2023 16:59:34 +0800
Subject: [PATCH] #货物转换状态、货主修改完成
---
src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java | 14 +
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 10
src/main/java/com/zy/asrs/service/LocDetlService.java | 8
src/main/java/com/zy/asrs/controller/LocDetlController.java | 78 +++++
src/main/webapp/views/pakStore/turnOverQuery.html | 12
src/main/resources/mapper/LocDetlMapper.xml | 55 ++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 22 +
src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java | 4
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 4
src/main/resources/mapper/ManLocDetlMapper.xml | 3
src/main/webapp/static/js/pakStore/turnOver2.js | 183 +++++++++++++++
src/main/webapp/views/pakStore/turnOverOwner.html | 201 ++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 19 -
src/main/webapp/views/pakStore/turnOverPayment.html | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 1
src/main/webapp/static/js/pakStore/turnOver.js | 16 +
src/main/java/com/zy/asrs/entity/result/LocDetlAll.java | 50 ++++
17 files changed, 644 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index d06d3d5..b914ab1 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,6 +13,8 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocOwnerService;
@@ -38,6 +40,8 @@
private LocDetlMapper locDetlMapper;
@Autowired
private MatService matService;
+ @Autowired
+ private ManLocDetlService manLocDetlService;
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -318,18 +322,74 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
if (param.get("owner$") != null && param.get("owner$") != ""){
- LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
- param.remove("owner$");
- param.put("owner",locOwner.getId());
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ if(locOwner == null){
+ return R.error("鍙傛暟鏈夎锛�");
+ }
+ param.remove("owner$");
+ param.put("owner",locOwner.getId());
}
+ LocDetlDTO locDetlDTO = new LocDetlDTO();
+ locDetlDTO.setPageSize(limit);
+ locDetlDTO.setPageNumber(curr);
+ String locNo = String.valueOf(param.get("locNo"));
+ String owner = String.valueOf(param.get("owner"));
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ locDetlDTO.setLocNo(locNo);
+ }
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ locDetlDTO.setMatnr(matnr);
+ }
+ if (!Cools.isEmpty(owner) && !owner.equals("null")) {
+ locDetlDTO.setOwner(owner);
+ }
+ List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO);
+ int count = locDetlService.selectAllPymentcount(locDetlDTO);
+ Page<LocDetlAll> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- wrapper.eq("payment",0);
- excludeTrash(param);
- convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ @RequestMapping(value = "/locDetl/selectOwner/list/auth")
+ @ManagerAuth
+ public R selectOwnerlist(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ if (param.get("owner$") != null && param.get("owner$") != ""){
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+ if(locOwner == null){
+ return R.error("鍙傛暟鏈夎锛�");
+ }
+ param.remove("owner$");
+ param.put("owner",locOwner.getId());
+ }
+
+ LocDetlDTO locDetlDTO = new LocDetlDTO();
+ locDetlDTO.setPageSize(limit);
+ locDetlDTO.setPageNumber(curr);
+ String locNo = String.valueOf(param.get("locNo"));
+ String owner = String.valueOf(param.get("owner"));
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ locDetlDTO.setLocNo(locNo);
+ }
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ locDetlDTO.setMatnr(matnr);
+ }
+ if (!Cools.isEmpty(owner) && !owner.equals("null")) {
+ locDetlDTO.setOwner(owner);
+ }
+ List<LocDetlAll> list = locDetlService.selectAllOwner(locDetlDTO);
+ int count = locDetlService.selectAllCount(locDetlDTO);
+ Page<LocDetlAll> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
}
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index be6204b..e630caf 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -218,6 +218,10 @@
@TableField("real_anfme")
private Date realAnfme;
+ @ApiModelProperty(value= "璁㈠崟鍙�")
+ @TableField("order_no")
+ private String orderNo;
+
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 c038160..1ca3d86 100644
--- a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
@@ -29,7 +29,7 @@
public static class LocDetl {
// 搴撲綅鍙�
- private String locNo;
+ private String loc_no;
// 鍟嗗搧缂栧彿
private String matnr;
@@ -41,7 +41,7 @@
private Double count;
// 璁㈠崟
- private String orderNo;
+ private String order_no;
// 缈诲寘
private String memo;
diff --git a/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java b/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java
new file mode 100644
index 0000000..18e7a36
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java
@@ -0,0 +1,50 @@
+package com.zy.asrs.entity.result;
+
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.LocOwner;
+import com.zy.asrs.service.LocOwnerService;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class LocDetlAll {
+ private String loc_no;
+ private String zpallet;
+ private String matnr;
+ private String maktx;
+ private String specs;
+ private Double anfme;
+ private String batch;
+ private Double weight;
+
+ private String order_no;
+ private Integer owner;
+ private Integer payment;
+ private Date modi_time;
+ private Date appe_time;
+ private String meno;
+ private String manu;
+
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
+ public String getPayment$(){
+ if (null == this.payment){ return null; }
+ switch (this.payment){
+ case 1:
+ return "浠撳偍";
+ case 0:
+ return "浠ｉ噰";
+ default:
+ return String.valueOf(this.payment);
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java b/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
new file mode 100644
index 0000000..37f9145
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/LocDetlDTO.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+@Data
+public class LocDetlDTO {
+
+ private int pageNumber;
+ private int pageSize;
+ private Integer row;
+ private String locNo;
+ private String matnr;
+ private String owner;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 4a6440b..af9f2f9 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -79,4 +81,12 @@
List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
List<LocDetl> queryStock2(String matnr, String batch, int owner);
+
+ List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO);
+
+ int selectAllCount(LocDetlDTO locDetlDTO);
+
+ List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO);
+
+ int selectAllPymentcount(LocDetlDTO locDetlDTO);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 4214d81..8afb979 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
import java.util.List;
@@ -63,4 +65,10 @@
//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);
+
+ List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO);
+ List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO);
+
+ int selectAllCount(LocDetlDTO locDetlDTO);
+ int selectAllPymentcount(LocDetlDTO locDetlDTO);
}
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 1612c09..3e3a6bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
@@ -149,4 +151,24 @@
}
return this.baseMapper.searchByLike(orderNo, matnr, maktx, specs, locNo);
}
+
+ @Override
+ public List<LocDetlAll> selectAllOwner(LocDetlDTO locDetlDTO) {
+ return this.baseMapper.selectAllOwner(locDetlDTO);
+ }
+
+ @Override
+ public List<LocDetlAll> selectAllPyment(LocDetlDTO locDetlDTO) {
+ return this.baseMapper.selectAllPyment(locDetlDTO);
+ }
+
+ @Override
+ public int selectAllCount(LocDetlDTO locDetlDTO) {
+ return this.baseMapper.selectAllCount(locDetlDTO);
+ }
+
+ @Override
+ public int selectAllPymentcount(LocDetlDTO locDetlDTO) {
+ return this.baseMapper.selectAllPymentcount(locDetlDTO);
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e938d45..efb7249 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -563,6 +563,7 @@
manLocDetl.setBatch(jsonOrderDetl.getBatch());
manLocDetl.setOwner(orderDetl.getOwner());
manLocDetl.setWeight(jsonOrderDetl.getWeight());
+ manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
if(!manLocDetlService.insert(manLocDetl)){
return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
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 f07908e..3d2dee6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1129,9 +1129,9 @@
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();
+ if (!locNos.contains(locDetl.getLoc_no())){
+ locNos.add(locDetl.getLoc_no());
+ locNos2[i][0]=locDetl.getLoc_no();
locNos2[i][1]=locDetl.getManu();
i++;
}
@@ -1194,15 +1194,10 @@
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();
- if (locDetl.getLocNo().substring(0,2) == "DT"){
- locNos2[i][1]= "骞冲簱";
- }else {
- locNos2[i][1]= "绔嬪簱";
- }
-
+ if (!locNos.contains(locDetl.getLoc_no())){
+ locNos.add(locDetl.getLoc_no());
+ locNos2[i][0]=locDetl.getLoc_no();
+ locNos2[i][1]=locDetl.getManu();
i++;
}
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 08dbbe2..b86e724 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -499,6 +499,61 @@
end
desc
</select>
+ <sql id="selectAllSql">
+ <if test="locNo!=null and locNo!='' ">
+ and t.loc_no like '%' + #{locNo} + '%'
+ </if>
+ <if test="matnr != null and matnr !='' ">
+ and t.matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="owner != null and owner !='' ">
+ and t.owner like '%' + #{owner} + '%'
+ </if>
+
+ </sql>
+ <select id="selectAllOwner" resultType="com.zy.asrs.entity.result.LocDetlAll" parameterType="com.zy.asrs.entity.result.LocDetlDTO">
+ SELECT * FROM (
+ SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
+ SELECT * FROM asr_loc_detl_all
+ ) t
+ WHERE 1=1
+ <include refid="selectAllSql"></include>
+ ) a
+ WHERE a.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+ <select id="selectAllCount" resultType="java.lang.Integer" parameterType="com.zy.asrs.entity.result.LocDetlDTO">
+ SELECT count(*) FROM (
+ SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
+ SELECT * FROM asr_loc_detl_all
+ ) t
+ WHERE 1=1
+ <include refid="selectAllSql"></include>
+ ) a
+
+ </select>
+ <select id="selectAllPyment" resultType="com.zy.asrs.entity.result.LocDetlAll" parameterType="com.zy.asrs.entity.result.LocDetlDTO">
+ SELECT * FROM (
+ SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
+ SELECT * FROM asr_loc_detl_all
+ ) t
+ WHERE 1=1 and t.payment = 0
+ <include refid="selectAllSql"></include>
+ ) a
+ WHERE a.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+
+
+
+ <select id="selectAllPymentcount" resultType="java.lang.Integer" parameterType="com.zy.asrs.entity.result.LocDetlDTO">
+ SELECT count(*) FROM (
+ SELECT ROW_NUMBER() over(order by matnr) as row,* FROM (
+ SELECT * FROM asr_loc_detl_all
+ ) t
+ WHERE 1=1 and t.payment = 0
+ <include refid="selectAllSql"></include>
+ ) a
+
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index a157501..985cd8b 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -33,6 +33,7 @@
<result column="owner" property="owner" />
<result column="payment" property="payment" />
<result column="real_anfme" property="realAnfme" />
+ <result column="order_no" property="orderNo" />
</resultMap>
<sql id="locDetlCondition">
@@ -249,7 +250,7 @@
where loc_no = #{locNo}
and matnr = #{matnr}
</select>
- <select id="selectItem" resultType="com.zy.asrs.entity.ManLocDetl">
+ <select id="selectItem" resultMap="BaseResultMap">
select top 1 * from man_loc_detl
where loc_no = #{locNo}
and matnr = #{matnr}
diff --git a/src/main/webapp/static/js/pakStore/turnOver.js b/src/main/webapp/static/js/pakStore/turnOver.js
index b503792..8d0e95a 100644
--- a/src/main/webapp/static/js/pakStore/turnOver.js
+++ b/src/main/webapp/static/js/pakStore/turnOver.js
@@ -29,7 +29,19 @@
toolbar: '#toolbar',
cellMinWidth: 50,
limit: 500,
- cols: [getCol()],
+ cols: [[
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺',hide: true}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: false}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
+ ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
+ ]],
done: function(res, curr, count) {
tableMerge.render(this);
limit();
@@ -152,7 +164,7 @@
maxmin: false,
area: ['90%', '85%'],
shadeClose: true,
- content: 'turnOverQuery.html',
+ content: 'turnOverOwner.html',
success: function(layero, index){
layer.close(loadIndex);
}
diff --git a/src/main/webapp/static/js/pakStore/turnOver2.js b/src/main/webapp/static/js/pakStore/turnOver2.js
new file mode 100644
index 0000000..b503792
--- /dev/null
+++ b/src/main/webapp/static/js/pakStore/turnOver2.js
@@ -0,0 +1,183 @@
+var locDetlLayerIdx;
+var locDetlData = [];
+function getCol() {
+ var cols = [
+ {field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺'}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ arrRemove(detlCols, 'field', 'anfme');
+ cols.push.apply(cols, detlCols);
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
+ return cols;
+}
+
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+ var admin = layui.admin;
+ var tableMerge = layui.tableMerge;
+
+ tableIns = table.render({
+ elem: '#chooseData',
+ headers: {token: localStorage.getItem('token')},
+ data: [],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ limit: 500,
+ cols: [getCol()],
+ done: function(res, curr, count) {
+ tableMerge.render(this);
+ limit();
+ getOutBound();
+ }
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(chooseData)', function (obj) {
+ switch (obj.event) {
+ case 'outbound':
+ if (locDetlData.length === 0){
+ layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2});
+ } else {
+ var staNo = $("#staNoSelect").val();
+ if (staNo === "" || staNo === null){
+ layer.msg("璇烽�夋嫨鐩爣璐т富", {icon: 2});
+ return;
+ }
+ let param = {
+ ownerId: staNo,
+ locDetls: locDetlData
+ }
+ $.ajax({
+ url: baseUrl+"/turn/over/out/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;
+ 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;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(chooseData)', function(obj){
+ switch (obj.event) {
+ case 'remove':
+ let index = obj.tr.attr("data-index");
+ locDetlData.splice(index, 1);
+ tableIns.reload({data: locDetlData});
+ break;
+ }
+ });
+
+ // 鑾峰彇鎷ユ湁鑰呰〃鏁版嵁
+ function getOutBound(){
+ $.ajax({
+ url: baseUrl+"/turn/over/take/site",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var tpl = $("#takeSiteSelectTemplate").html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#staNoSelect').append(html);
+ form.render('select');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+
+
+ $(document).on('click','#mat-query', function () {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ locDetlLayerIdx = layer.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'turnOverQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
+
+})
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+ for (var i=0;i<data.length;i++){
+ let pass = false;
+ for (var j=0;j<locDetlData.length;j++){
+ if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
+ pass = true;
+ break;
+ }
+ }
+ if (pass) {
+ data.splice(i--, 1);
+ } else {
+ data[i]["count"] = data[i]["anfme"];
+ }
+ }
+ locDetlData.push.apply(locDetlData, data);
+ tableIns.reload({data: locDetlData});
+ layer.close(locDetlLayerIdx);
+}
diff --git a/src/main/webapp/views/pakStore/turnOverOwner.html b/src/main/webapp/views/pakStore/turnOverOwner.html
new file mode 100644
index 0000000..68b8caf
--- /dev/null
+++ b/src/main/webapp/views/pakStore/turnOverOwner.html
@@ -0,0 +1,201 @@
+<!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>
+ body {
+ }
+ .layui-table-box {
+ border-right: 1px solid #9F9F9F;
+ border-left: 1px solid #9F9F9F;
+ }
+
+ #search-box {
+ padding: 30px 0 20px 0;
+ }
+ #search-box .layui-inline:first-child {
+ margin-left: 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+
+ #data-search-btn {
+ margin-left: 10px;
+ display: inline-block;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+ </style>
+</head>
+<body>
+<div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+ <span style="font-size: large; font-weight: bold">鎻愬彇搴撳瓨鍟嗗搧</span>
+</div>
+<!-- 鎼滅储鏍� -->
+<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+ <legend>鎼滅储鏍�</legend>
+ <!-- 鎼滅储鏍� -->
+ <div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="owner$" placeholder="璐т富" autocomplete="off">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ </div>
+ </div>
+</fieldset>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
+ </div>
+</script>
+
+<div class="layui-form">
+ <table class="layui-hide" id="stockOut" lay-filter="stockOut"></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>
+
+</body>
+<script>
+
+ function getCol() {
+ var cols = [
+ {type: 'checkbox'}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ cols.push.apply(cols, detlCols);
+ cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ )
+ return cols;
+ }
+
+ layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+ }).use(['table','laydate', 'form', 'admin', 'admin', 'tableMerge'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+ var tableMerge = layui.tableMerge;
+
+ // 鏁版嵁娓叉煋
+ locDetlTableIns = table.render({
+ elem: '#stockOut',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/locDetl/selectOwner/list/auth',
+ page: true,
+ limits: [16, 30, 50, 100, 200, 500],
+ limit: 16,
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺',hide: true}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: false}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
+ ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
+ ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
+ ]
+
+ ],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ tableMerge.render(this);
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ }
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(stockOut)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ var data = checkStatus.data;
+ switch(obj.event) {
+ case 'confirm':
+ if (data.length === 0){
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ parent.addTableData(data);
+ break;
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ tableReload();
+ });
+
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ })
+
+ function tableReload() {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ locDetlTableIns.reload({
+ where: searchData,
+ });
+ }
+</script>
+</html>
+
diff --git a/src/main/webapp/views/pakStore/turnOverPayment.html b/src/main/webapp/views/pakStore/turnOverPayment.html
index fd600cb..90b06eb 100644
--- a/src/main/webapp/views/pakStore/turnOverPayment.html
+++ b/src/main/webapp/views/pakStore/turnOverPayment.html
@@ -119,7 +119,7 @@
<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/javascript" src="../../static/js/pakStore/turnOver2.js" charset="utf-8"></script>
<script type="text/template" id="takeSiteSelectTemplate">
{{#each data}}
diff --git a/src/main/webapp/views/pakStore/turnOverQuery.html b/src/main/webapp/views/pakStore/turnOverQuery.html
index 8885add..14b2091 100644
--- a/src/main/webapp/views/pakStore/turnOverQuery.html
+++ b/src/main/webapp/views/pakStore/turnOverQuery.html
@@ -56,17 +56,7 @@
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
- </div>
- </div>
- <!-- 鏃ユ湡鑼冨洿 -->
- <div class="layui-inline" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
+
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="owner$" placeholder="璐т富" autocomplete="off">
--
Gitblit v1.9.1