From 8523da65331b827a42952c0ea7a09f15fe1a6f91 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 27 八月 2021 09:42:13 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 11
src/main/webapp/views/waitMatchk/waitMatchk_detail.html | 202 +++++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 7
src/main/webapp/static/js/waitMatchk/waitMatchk.js | 627 +++++++++++++++++
src/main/java/com/zy/asrs/service/LocDetlService.java | 23
src/main/java/waitMatchk.sql | 20
src/main/webapp/views/locStatis/locStatis.html | 72 ++
src/main/resources/mapper/LocDetlMapper.xml | 25
src/main/resources/mapper/WaitMatchkMapper.xml | 28
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 14
src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java | 12
src/main/webapp/static/js/locStatis/locStatis.js | 222 ++++++
src/main/java/com/zy/ints/service/WaitMatchkService.java | 8
src/main/java/com/zy/common/CodeBuilder.java | 2
src/main/java/com/zy/asrs/controller/StatisController.java | 84 ++
src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java | 12
src/main/java/com/zy/ints/entity/WaitMatchk.java | 479 +++++++++++++
src/main/java/com/zy/asrs/entity/LocDetl.java | 1
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 37 +
src/main/java/com/zy/ints/controller/WaitMatchkController.java | 130 +++
src/main/resources/application.yml | 3
src/main/webapp/views/waitMatchk/waitMatchk.html | 90 ++
22 files changed, 2,102 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StatisController.java b/src/main/java/com/zy/asrs/controller/StatisController.java
new file mode 100644
index 0000000..80b6f6d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/StatisController.java
@@ -0,0 +1,84 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by vincent on 2021/4/2
+ */
+@RestController
+public class StatisController extends BaseController {
+
+ @Autowired
+ private MatCodeService matCodeService;
+ @Autowired
+ private LocDetlService locDetlService;
+
+ // 搴撳瓨缁熻 ------------------------------------------------------------------------------------------
+
+ @RequestMapping(value = "/stock/statis/auth")
+ @ManagerAuth
+ public R stockStatis(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "14")Integer limit,
+// @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param) {
+ System.out.println(param);
+ Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
+ for (LocDetl locDetl : stockStatis.getRecords()) {
+ MatCode mat = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no",locDetl.getMatNo()).eq("str8",locDetl.getColor()));
+// MatCode mat = matCodeService.selectById(locDetl.getMatnr());
+ if (mat != null) {
+ VersionUtils.setLocDetl(locDetl, mat);
+ }
+ }
+ return R.ok().add(stockStatis);
+ }
+
+ //搴撲綅鎶ヨ〃瀵煎嚭
+ @RequestMapping(value = "/stock/statis/export")
+ public void stockStatisExport(HttpServletResponse response) throws IOException {
+ List<LocDetl> excel = locDetlService.getStockStatisExcel();
+ for (LocDetl locDetl : excel) {
+ MatCode mat = matCodeService.selectById(locDetl.getMatNo());
+ if (mat != null) {
+ VersionUtils.setLocDetl(locDetl, mat);
+ }
+ }
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("搴撳瓨鏄庣粏缁熻鎶ヨ〃", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), LocDetl.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("sheet1")
+ .doWrite(excel);
+ }
+
+// @RequestMapping(value = "/stock/statis/queryLocByMatNoAndMatName")
+// public R queryLocByMatNoAndMatName(@RequestParam LocDetl locDetl){
+// List<LocDetl> locDetls=locDetlService.getlocDetlByMatNoAndMatName(locDetl);
+//// locDetl.
+// return R.ok().add(locDetls);
+// }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 18c972d..36db1be 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -128,5 +128,4 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index c71915a..46dc8de 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -31,4 +31,11 @@
List<LocDetl> selectLocDetlList(@Param("mat_no") String matNo);
Double selectLocDetlSumQty(String locNo);
+
+
+ List<LocDetl> getStockStatis(Map<String, Object> condition);
+
+ Integer getStockStatisCount(Map<String, Object> condition);
+
+ List<LocDetl> getStockStatisExcel();
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 15aff8a..7e2ba91 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -8,6 +8,8 @@
public interface LocDetlService extends IService<LocDetl> {
+// Page<LocDetl> getStockStatis(Page<LocDetl> page);
+
Page<LocDetl> getStockOut(Page<LocDetl> page);
/**
@@ -36,4 +38,25 @@
* @return
*/
Double getLocDetlSumQty(String locNo);
+
+ /**
+ * 鏌ヨ搴撲綅鐘舵�佸苟涓斿垎椤�
+ * @param toPage 鍒嗛〉淇℃伅
+ * @return
+ */
+ Page<LocDetl> getStockStatis(Page<LocDetl> toPage);
+
+
+ /**
+ * 瀵煎嚭鍏ㄩ儴搴撳瓨缁熻
+ * @return
+ */
+ List<LocDetl> getStockStatisExcel();
+
+ /**
+ * 鎼滅储搴撳瓨缁熻
+ * @param locDetl
+ * @return
+ */
+// List<LocDetl> getlocDetlByMatNoAndMatName(LocDetl locDetl);
}
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 823655b..d3aa9e4 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -13,6 +13,7 @@
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+
@Autowired
private LocDetlMapper locDetlMapper;
@@ -54,4 +55,17 @@
return locDetlMapper.selectLocDetlSumQty(locNo);
}
+ @Override
+ public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
+ page.setRecords(baseMapper.getStockStatis(page.getCondition()));
+ page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+ return page;
+
+ }
+
+ @Override
+ public List<LocDetl> getStockStatisExcel() {
+ return this.baseMapper.getStockStatisExcel();
+ }
+
}
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 a551d93..5438dd4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -17,6 +17,9 @@
import com.zy.common.model.OutLocDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
+import com.zy.ints.entity.WaitMatchk;
+import com.zy.ints.entity.WaitMatout;
+import com.zy.ints.service.WaitMatchkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +33,7 @@
*/
@Service
public class WorkServiceImpl implements WorkService {
+ static int i =1;
// 宸ヤ綔鍙风敓鎴愯鍒欓粯璁ょ被鍨�
private static final int DEFAULT_WORK_NO_TYPE = 0;
@@ -58,6 +62,9 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+
+ @Autowired
+ private WaitMatchkService waitMatchkService;
@Override
@Transactional
@@ -155,6 +162,7 @@
@Override
@Transactional
public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Integer ioType, Long userId) {
+
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
locDetlDtos.forEach(dto -> locNos.add(dto.getLocDetl().getLocNo()));
@@ -166,13 +174,38 @@
LocDetlDto dto = iterator.next();
if (locNo.equals(dto.getLocDetl().getLocNo())) {
list.add(dto);
- iterator.remove();
+// iterator.remove();
}
}
dtos.add(new OutLocDto(locNo, list));
}
+ //鐢熸垚鐩樼偣鏂囨。
+ for (LocDetlDto locDetlDto : locDetlDtos) {
+ String replace = UUID.randomUUID().toString().replace("-", "");
+ LocDetl locDetl = locDetlDto.getLocDetl();
+ //鐢熸垚鐩樼偣妗�
+ WaitMatchk waitMatchk = new WaitMatchk();
+ waitMatchk.setBillNo(replace);//璁㈠崟缂栧彿
+ waitMatchk.setLocNo(locDetl.getLocNo());//搴撲綅鍙�
+ waitMatchk.setStockQty(locDetl.getQty());
+ waitMatchk.setMatNo(locDetl.getMatNo());//浜у搧缂栧彿
+ waitMatchk.setMatName(locDetl.getMatName());//閾插钩鍚嶇О
+ waitMatchk.setSeqNo(i);
+ waitMatchk.setIoTime(new Date());
+ waitMatchk.setZpallet(locDetl.getZpallet());
+ waitMatchk.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ waitMatchk.setAppeTime(new Date());
+ waitMatchk.setModiUser(userId);
+ waitMatchk.setModiTime(new Date());
+ if (!waitMatchkService.insert(waitMatchk)){
+ throw new CoolException("淇濆瓨鐩樼偣妗ｅけ璐�");
+ }
+ i++;
+ }
+
// 鐢熸垚宸ヤ綔妗�
for (OutLocDto dto : dtos) {
+
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
if (ioType == null) {
ioType = dto.isAll() ? 101 : 103;
@@ -190,6 +223,8 @@
}
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+
+
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index fd230f0..72295b8 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -18,7 +18,7 @@
generator.url="192.168.4.208:1433;databasename=xgmasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="ints_wait_matout";
+ generator.table="ints_wait_matchk";
generator.packagePath="com.zy.ints";
generator.build();
}
diff --git a/src/main/java/com/zy/ints/controller/WaitMatchkController.java b/src/main/java/com/zy/ints/controller/WaitMatchkController.java
new file mode 100644
index 0000000..e6cb4a9
--- /dev/null
+++ b/src/main/java/com/zy/ints/controller/WaitMatchkController.java
@@ -0,0 +1,130 @@
+package com.zy.ints.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.common.web.BaseController;
+import com.zy.ints.entity.WaitMatchk;
+import com.zy.ints.service.WaitMatchkService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.controller.AbstractBaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class WaitMatchkController extends BaseController {
+
+ @Autowired
+ private WaitMatchkService waitMatchkService;
+
+ //鐩樼偣閫氱煡妗�
+
+ @RequestMapping(value = "/waitMatchk/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(waitMatchkService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/waitMatchk/list/auth")
+ @ManagerAuth
+ public R list(@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){
+ EntityWrapper<WaitMatchk> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(waitMatchkService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/waitMatchk/add/auth")
+ @ManagerAuth
+ public R add(WaitMatchk waitMatchk) {
+ waitMatchkService.insert(waitMatchk);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/waitMatchk/update/auth")
+ @ManagerAuth
+ public R update(WaitMatchk waitMatchk){
+ if (Cools.isEmpty(waitMatchk) || null==waitMatchk.getMatNo()){
+ return R.error();
+ }
+ waitMatchkService.updateById(waitMatchk);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/waitMatchk/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam String param){
+ List<WaitMatchk> list = JSONArray.parseArray(param, WaitMatchk.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (WaitMatchk entity : list){
+ waitMatchkService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/waitMatchk/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<WaitMatchk> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("waitMatchk"));
+ convert(map, wrapper);
+ List<WaitMatchk> list = waitMatchkService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/waitMatchkQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<WaitMatchk> wrapper = new EntityWrapper<>();
+ wrapper.like("mat_no", condition);
+ Page<WaitMatchk> page = waitMatchkService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (WaitMatchk waitMatchk : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", waitMatchk.getMatNo());
+ map.put("value", waitMatchk.getMatNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/waitMatchk/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<WaitMatchk> wrapper = new EntityWrapper<WaitMatchk>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != waitMatchkService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(WaitMatchk.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/ints/entity/WaitMatchk.java b/src/main/java/com/zy/ints/entity/WaitMatchk.java
new file mode 100644
index 0000000..6322468
--- /dev/null
+++ b/src/main/java/com/zy/ints/entity/WaitMatchk.java
@@ -0,0 +1,479 @@
+package com.zy.ints.entity;
+
+import com.core.common.Cools;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.LocMastService;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import com.core.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import com.core.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
+import com.core.common.SpringUtils;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import com.core.common.SpringUtils;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@TableName("ints_wait_matchk")
+public class WaitMatchk implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableId(value = "bill_no", type = IdType.INPUT)
+ @TableField("bill_no")
+ private String billNo;
+
+ /**
+ * 搴忓彿
+ */
+ @ApiModelProperty(value= "搴忓彿")
+ @TableField("seq_no")
+ private Integer seqNo;
+
+ /**
+ * 鍗曟嵁绫诲瀷 1: 鎶界洏 2: 鏈堝害鐩樼偣 3: 瀛ｅ害鐩樼偣 4: 骞村害鐩樼偣 5: 鍏ㄧ洏
+ */
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷 1: 鎶界洏 2: 鏈堝害鐩樼偣 3: 瀛ｅ害鐩樼偣 4: 骞村害鐩樼偣 5: 鍏ㄧ洏 ")
+ @TableField("bill_type")
+ private Integer billType;
+
+ /**
+ * 搴撲綅鍙�
+ */
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableId(value = "loc_no", type = IdType.INPUT)
+ @TableField("loc_no")
+ private String locNo;
+
+ /**
+ * 鎵樼洏鍙�
+ */
+ @ApiModelProperty(value= "鎵樼洏鍙�")
+ private String zpallet;
+
+ /**
+ * 鐗╂枡缂栫爜
+ */
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @TableId(value = "mat_no", type = IdType.INPUT)
+ @TableField("mat_no")
+ private String matNo;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @TableField("mat_name")
+ private String matName;
+
+ /**
+ * 搴撳瓨鏁伴噺
+ */
+ @ApiModelProperty(value= "搴撳瓨鏁伴噺")
+ @TableField("stock_qty")
+ private Double stockQty;
+
+ /**
+ * 鐩樼偣鏁伴噺
+ */
+ @ApiModelProperty(value= "鐩樼偣鏁伴噺")
+ @TableField("check_qty")
+ private Double checkQty;
+
+ /**
+ * ERP杩炵嚎 0: 闈炶繛绾� 1: ERP杩炵嚎
+ */
+ @ApiModelProperty(value= "ERP杩炵嚎 0: 闈炶繛绾� 1: ERP杩炵嚎 ")
+ @TableField("link_erp")
+ private Integer linkErp;
+
+ /**
+ * 瀹屾垚鐘舵�� 0: 寰呭鐞� 1: 鐩樼偣涓� 2: 鐩樼偣瀹屾垚 3: 鍙栨秷鐩樼偣
+ */
+ @ApiModelProperty(value= "瀹屾垚鐘舵�� 0: 寰呭鐞� 1: 鐩樼偣涓� 2: 鐩樼偣瀹屾垚 3: 鍙栨秷鐩樼偣 ")
+ @TableField("io_status")
+ private Integer ioStatus;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @ApiModelProperty(value= "瀹屾垚鏃堕棿")
+ @TableField("io_time")
+ private Date ioTime;
+
+ /**
+ * 瀹℃牳鐘舵�� 0: 寰呭 1: 宸插 2: 鎷掔粷
+ */
+ @ApiModelProperty(value= "瀹℃牳鐘舵�� 0: 寰呭 1: 宸插 2: 鎷掔粷 ")
+ @TableField("verify_status")
+ private Integer verifyStatus;
+
+ /**
+ * 瀹℃牳浜哄憳
+ */
+ @ApiModelProperty(value= "瀹℃牳浜哄憳")
+ @TableField("verify_user")
+ private Long verifyUser;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
+ private Long modiUser;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("modi_time")
+ private Date modiTime;
+
+ /**
+ * 寤烘。浜哄憳
+ */
+ @ApiModelProperty(value= "寤烘。浜哄憳")
+ @TableField("appe_user")
+ private Long appeUser;
+
+ /**
+ * 寤烘。鏃堕棿
+ */
+ @ApiModelProperty(value= "寤烘。鏃堕棿")
+ @TableField("appe_time")
+ private Date appeTime;
+
+ public WaitMatchk() {}
+
+ public WaitMatchk(String billNo,Integer seqNo,Integer billType,String locNo,String zpallet,String matNo,String matName,Double stockQty,Double checkQty,Integer linkErp,Integer ioStatus,Date ioTime,Integer verifyStatus,Long verifyUser,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ this.seqNo = seqNo;
+ this.billType = billType;
+ this.zpallet = zpallet;
+ this.matName = matName;
+ this.stockQty = stockQty;
+ this.checkQty = checkQty;
+ this.linkErp = linkErp;
+ this.ioStatus = ioStatus;
+ this.ioTime = ioTime;
+ this.verifyStatus = verifyStatus;
+ this.verifyUser = verifyUser;
+ this.modiUser = modiUser;
+ this.modiTime = modiTime;
+ this.appeUser = appeUser;
+ this.appeTime = appeTime;
+ }
+
+// WaitMatchk waitMatchk = new WaitMatchk(
+// null, // 鍗曟嵁缂栧彿[闈炵┖]
+// null, // 搴忓彿[闈炵┖]
+// null, // 鍗曟嵁绫诲瀷
+// null, // 搴撲綅鍙穂闈炵┖]
+// null, // 鎵樼洏鍙�
+// null, // 鐗╂枡缂栫爜[闈炵┖]
+// null, // 鐗╂枡鍚嶇О[闈炵┖]
+// null, // 搴撳瓨鏁伴噺
+// null, // 鐩樼偣鏁伴噺
+// null, // ERP杩炵嚎
+// null, // 瀹屾垚鐘舵��
+// null, // 瀹屾垚鏃堕棿
+// null, // 瀹℃牳鐘舵��
+// null, // 瀹℃牳浜哄憳
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 寤烘。浜哄憳
+// null // 寤烘。鏃堕棿
+// );
+
+ public String getBillNo() {
+ return billNo;
+ }
+
+ public void setBillNo(String billNo) {
+ this.billNo = billNo;
+ }
+
+ public Integer getSeqNo() {
+ return seqNo;
+ }
+
+ public void setSeqNo(Integer seqNo) {
+ this.seqNo = seqNo;
+ }
+
+ public Integer getBillType() {
+ return billType;
+ }
+
+ public String getBillType$(){
+ if (null == this.billType){ return null; }
+ switch (this.billType){
+ case 1:
+ return "鎶界洏";
+ case 2:
+ return "鏈堝害鐩樼偣";
+ case 3:
+ return "瀛ｅ害鐩樼偣";
+ case 4:
+ return "骞村害鐩樼偣";
+ case 5:
+ return "鍏ㄧ洏";
+ default:
+ return String.valueOf(this.billType);
+ }
+ }
+
+ public void setBillType(Integer billType) {
+ this.billType = billType;
+ }
+
+ public String getLocNo() {
+ return locNo;
+ }
+
+ public String getLocNo$(){
+ LocMastService service = SpringUtils.getBean(LocMastService.class);
+ LocMast locMast = service.selectById(this.locNo);
+ if (!Cools.isEmpty(locMast)){
+ return String.valueOf(locMast.getLocNo());
+ }
+ return null;
+ }
+
+ public void setLocNo(String locNo) {
+ this.locNo = locNo;
+ }
+
+ public String getZpallet() {
+ return zpallet;
+ }
+
+ public void setZpallet(String zpallet) {
+ this.zpallet = zpallet;
+ }
+
+ public String getMatNo() {
+ return matNo;
+ }
+
+ public void setMatNo(String matNo) {
+ this.matNo = matNo;
+ }
+
+ public String getMatName() {
+ return matName;
+ }
+
+ public void setMatName(String matName) {
+ this.matName = matName;
+ }
+
+ public Double getStockQty() {
+ return stockQty;
+ }
+
+ public void setStockQty(Double stockQty) {
+ this.stockQty = stockQty;
+ }
+
+ public Double getCheckQty() {
+ return checkQty;
+ }
+
+ public void setCheckQty(Double checkQty) {
+ this.checkQty = checkQty;
+ }
+
+ public Integer getLinkErp() {
+ return linkErp;
+ }
+
+ public String getLinkErp$(){
+ if (null == this.linkErp){ return null; }
+ switch (this.linkErp){
+ case 0:
+ return "闈炶繛绾�";
+ case 1:
+ return "ERP杩炵嚎";
+ default:
+ return String.valueOf(this.linkErp);
+ }
+ }
+
+ public void setLinkErp(Integer linkErp) {
+ this.linkErp = linkErp;
+ }
+
+ public Integer getIoStatus() {
+ return ioStatus;
+ }
+
+ public String getIoStatus$(){
+ if (null == this.ioStatus){ return null; }
+ switch (this.ioStatus){
+ case 0:
+ return "寰呭鐞�";
+ case 1:
+ return "鐩樼偣涓�";
+ case 2:
+ return "鐩樼偣瀹屾垚";
+ case 3:
+ return "鍙栨秷鐩樼偣";
+ default:
+ return String.valueOf(this.ioStatus);
+ }
+ }
+
+ public void setIoStatus(Integer ioStatus) {
+ this.ioStatus = ioStatus;
+ }
+
+ public Date getIoTime() {
+ return ioTime;
+ }
+
+ public String getIoTime$(){
+ if (Cools.isEmpty(this.ioTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+ }
+
+ public void setIoTime(Date ioTime) {
+ this.ioTime = ioTime;
+ }
+
+ public Integer getVerifyStatus() {
+ return verifyStatus;
+ }
+
+ public String getVerifyStatus$(){
+ if (null == this.verifyStatus){ return null; }
+ switch (this.verifyStatus){
+ case 0:
+ return "寰呭";
+ case 1:
+ return "宸插";
+ case 2:
+ return "鎷掔粷";
+ default:
+ return String.valueOf(this.verifyStatus);
+ }
+ }
+
+ public void setVerifyStatus(Integer verifyStatus) {
+ this.verifyStatus = verifyStatus;
+ }
+
+ public Long getVerifyUser() {
+ return verifyUser;
+ }
+
+ public String getVerifyUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.verifyUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setVerifyUser(Long verifyUser) {
+ this.verifyUser = verifyUser;
+ }
+
+ public Long getModiUser() {
+ return modiUser;
+ }
+
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public Date getModiTime() {
+ return modiTime;
+ }
+
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public Long getAppeUser() {
+ return appeUser;
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public Date getAppeTime() {
+ return appeTime;
+ }
+
+ public String getAppeTime$(){
+ if (Cools.isEmpty(this.appeTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ }
+
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java b/src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java
new file mode 100644
index 0000000..61ef707
--- /dev/null
+++ b/src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java
@@ -0,0 +1,12 @@
+package com.zy.ints.mapper;
+
+import com.zy.ints.entity.WaitMatchk;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface WaitMatchkMapper extends BaseMapper<WaitMatchk> {
+
+}
diff --git a/src/main/java/com/zy/ints/service/WaitMatchkService.java b/src/main/java/com/zy/ints/service/WaitMatchkService.java
new file mode 100644
index 0000000..96fa040
--- /dev/null
+++ b/src/main/java/com/zy/ints/service/WaitMatchkService.java
@@ -0,0 +1,8 @@
+package com.zy.ints.service;
+
+import com.zy.ints.entity.WaitMatchk;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface WaitMatchkService extends IService<WaitMatchk> {
+
+}
diff --git a/src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java b/src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java
new file mode 100644
index 0000000..d34c3d2
--- /dev/null
+++ b/src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.ints.service.impl;
+
+import com.zy.ints.mapper.WaitMatchkMapper;
+import com.zy.ints.entity.WaitMatchk;
+import com.zy.ints.service.WaitMatchkService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("waitMatchkService")
+public class WaitMatchkServiceImpl extends ServiceImpl<WaitMatchkMapper, WaitMatchk> implements WaitMatchkService {
+
+}
diff --git a/src/main/java/waitMatchk.sql b/src/main/java/waitMatchk.sql
new file mode 100644
index 0000000..9719b66
--- /dev/null
+++ b/src/main/java/waitMatchk.sql
@@ -0,0 +1,20 @@
+-- save waitMatchk record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waitMatchk/waitMatchk.html', 'waitMatchk绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waitMatchk#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waitMatchk#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waitMatchk#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waitMatchk#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waitMatchk#btn-export', '瀵煎嚭', '', '3', '4', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'waitMatchk#btn-into', '瀵煎叆', '', '3', '5', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk/waitMatchk.html', N'鐩樼偣閫氱煡妗�', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-export', N'瀵煎嚭', '', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'waitMatchk#btn-into', N'瀵煎叆', '', '3', '5', '1');
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8016187..ea1a31d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,6 +16,9 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
+ #username: sa
+ #password: eisoft
url: jdbc:sqlserver://192.168.4.208:1433;databasename=xgmasrs
username: sa
password: sa@123
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 66f1960..14d0369 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -83,4 +83,29 @@
from asr_loc_detl
where loc_no=#{locNo}
</select>
+ <select id="getStockStatis" resultMap="BaseResultMap">
+ select a.mat_name,a.mat_no,sum(a.qty) qty from
+ (
+ select
+ ROW_NUMBER() over (order by c.appe_time,c.mat_no,c.loc_no) as row,
+ c.*
+ from asr_loc_detl c
+ ) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ <include refid="stockOutCondition"></include>
+ group by a.mat_no,a.mat_name
+ </select>
+ <select id="getStockStatisCount" resultType="integer">
+ select
+ count(1)
+ from asr_loc_detl a
+ </select>
+ <select id="getStockStatisExcel" resultMap="BaseResultMap">
+ select
+ ROW_NUMBER() over (order by a.mat_no, sum(a.qty) desc) as row
+ , a.mat_no, a.mat_name
+ , sum(a.qty) as qty
+ from asr_loc_detl a
+ where 1=1
+ group by a.mat_no,a.mat_name
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/WaitMatchkMapper.xml b/src/main/resources/mapper/WaitMatchkMapper.xml
new file mode 100644
index 0000000..241c3e0
--- /dev/null
+++ b/src/main/resources/mapper/WaitMatchkMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.ints.mapper.WaitMatchkMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.ints.entity.WaitMatchk">
+ <result column="bill_no" property="billNo" />
+ <result column="seq_no" property="seqNo" />
+ <result column="bill_type" property="billType" />
+ <result column="loc_no" property="locNo" />
+ <result column="zpallet" property="zpallet" />
+ <result column="mat_no" property="matNo" />
+ <result column="mat_name" property="matName" />
+ <result column="stock_qty" property="stockQty" />
+ <result column="check_qty" property="checkQty" />
+ <result column="link_erp" property="linkErp" />
+ <result column="io_status" property="ioStatus" />
+ <result column="io_time" property="ioTime" />
+ <result column="verify_status" property="verifyStatus" />
+ <result column="verify_user" property="verifyUser" />
+ <result column="modi_user" property="modiUser" />
+ <result column="modi_time" property="modiTime" />
+ <result column="appe_user" property="appeUser" />
+ <result column="appe_time" property="appeTime" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/locStatis/locStatis.js b/src/main/webapp/static/js/locStatis/locStatis.js
new file mode 100644
index 0000000..2f49b1a
--- /dev/null
+++ b/src/main/webapp/static/js/locStatis/locStatis.js
@@ -0,0 +1,222 @@
+
+var pageCurr;
+function getCol() {
+ // var cols = [
+ // {type: 'numbers', fixed: 'left'},
+ // {field: 'qty', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold', width: 120}
+ // ];
+ arrRemove(detlCols, "field", "qty")
+ // arrRemove(detlCols, "field", "zpallet")
+ cols.push.apply(cols, detlCols);
+ // cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150});
+ return cols;
+}
+
+// function right(data){
+// top.popupRight = top.layui.admin.popupRight({
+// id: 'LAY_adminPopupLayer_LOCCHART'
+// , area: '550px'
+// , success: function(layero, index){
+// var result = null;
+// $.ajax({
+// url: baseUrl + "/locDetl/chart/auth",
+// headers: {'token': localStorage.getItem('token')},
+// data: {matnr: data.matnr},
+// method: 'POST',
+// async: false,
+// success: function (res) {
+// if (res.code === 200) {
+// result = res;
+// } else if (res.code === 403) {
+// top.location.href = baseUrl + "/";
+// } else {
+// layer.msg(res.msg, {icon: 2})
+// }
+// }
+// })
+// top.layui.view(this.id).render('locChart', {res: result});
+// }
+// , end: function () {
+// $(".layui-laypage-btn")[0].click();
+// }
+// });
+// }
+
+layui.use(['table','laydate', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#locStatis',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/stock/statis/auth',
+ page: true,
+ limit: 30,
+ limits: [ 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[{field: 'qty', align: 'center', title: '鏁伴噺', width: 80}
+ , {field: 'matNo', align: 'center', title: '浜у搧缂栫爜'}
+ , {field: 'matName', align: 'center', title: '浜у搧鍚嶇О'}
+ ]],
+ 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) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(locStatis)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: 1
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(locStatis)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'exportAll':
+ layer.closeAll();
+ layer.load(1, {shade: [0.1,'#fff']});
+ location.href = baseUrl + "/stock/statis/export";
+ layer.closeAll('loading');
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(locStatis)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ top.matnrByLocStatis = data.matNo;
+ // right(data);
+ break;
+
+ }
+ });
+
+ // 搴撳瓨鍒嗗竷鏄庣粏灞曞紑鍥炶皟
+ window.onDemoDialog1Success = function () {
+ };
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+
+
+});
+
+
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
+}
+
+function detailScreen(index) {
+ var detail = layer.getChildFrame('#data-detail', index);
+ var height = detail.height()+60;
+ if (height > ($(window).height()*0.9)) {
+ height = ($(window).height()*0.8);
+ }
+ layer.style(index, {
+// top: (($(window).height()-height)/3)+"px",
+ height: height+'px'
+ });
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index f2840c3..4c34784 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -31,7 +31,8 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
+
+ updateLocDetlData(obj.data.locNo, obj.data.billNo,obj.data.matNo, obj.data.qty, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -40,7 +41,8 @@
switch (obj.event) {
case 'outbound':
if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅浜у搧');
+
+ // layer.msg('璇峰厛娣诲姞搴撲綅浜у搧');
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
@@ -49,8 +51,9 @@
}
var locDetls = [];
data.forEach(function(elem) {
+ console.log(elem)
// locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
+ locDetls.push({locNo: elem.locNo, matNo: elem.matNo});
});
let param = {
outSite: staNo,
@@ -139,7 +142,7 @@
})
}
})
-
+``
// 鎻愬彇浜у搧
var locDetlLayerIdx;
function getLocDetl() {
diff --git a/src/main/webapp/static/js/waitMatchk/waitMatchk.js b/src/main/webapp/static/js/waitMatchk/waitMatchk.js
new file mode 100644
index 0000000..7a8609f
--- /dev/null
+++ b/src/main/webapp/static/js/waitMatchk/waitMatchk.js
@@ -0,0 +1,627 @@
+var pageCurr;
+layui.use(['table','laydate', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#waitMatchk',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/waitMatchk/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
+ ,{field: 'billNo', align: 'center',title: '鍗曟嵁缂栧彿'}
+ ,{field: 'seqNo', align: 'center',title: '搴忓彿'}
+ ,{field: 'billType$', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�',event: 'locNo', style: 'cursor:pointer'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鍙�'}
+ ,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
+ ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
+ ,{field: 'stockQty', align: 'center',title: '搴撳瓨鏁伴噺'}
+ ,{field: 'checkQty', align: 'center',title: '鐩樼偣鏁伴噺'}
+ ,{field: 'linkErp$', align: 'center',title: 'ERP杩炵嚎', hide: true}
+ ,{field: 'ioStatus$', align: 'center',title: '瀹屾垚鐘舵��'}
+ ,{field: 'ioTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
+ ,{field: 'verifyStatus$', align: 'center',title: '瀹℃牳鐘舵��'}
+ ,{field: 'verifyUser$', align: 'center',title: '瀹℃牳浜哄憳',event: 'verifyUser', style: 'cursor:pointer', hide: true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'appeUser$', align: 'center',title: '寤烘。浜哄憳',event: 'appeUser', style: 'cursor:pointer', hide: true}
+ ,{field: 'appeTime$', align: 'center',title: '寤烘。鏃堕棿', hide: true}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ 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) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(locMast)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: 1
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(waitMatchk)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'addData':
+ layer.open({
+ type: 2,
+ title: '鏂板',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'waitMatchk_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ case 'deleteData':
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/waitMatchk/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {param: JSON.stringify(data)},
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'waitMatchk': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/waitMatchk/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender();
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/waitMatout/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/waitMatout/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(waitMatchk)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'waitMatchk_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'waitMatchk_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ top.convertDisabled(layer.getChildFrame('#billNo,#locNo,#matNo', index), true);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ case 'locNo':
+ var param = top.reObject(data).locNo;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '搴撲綅鍙疯鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../locMast/locMast_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: "baseUrl+/locMast/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+ case 'verifyUser':
+ var param = top.reObject(data).verifyUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '瀹℃牳浜哄憳璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: "baseUrl+/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+ case 'modiUser':
+ var param = top.reObject(data).modiUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '淇敼浜哄憳璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: "baseUrl+/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+ case 'appeUser':
+ var param = top.reObject(data).appeUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '寤烘。浜哄憳璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: "baseUrl+/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+
+ }
+ });
+
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ form.on('submit(save)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add");
+ });
+
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(edit)', function () {
+ method("update")
+ });
+
+ function method(name){
+ var index = layer.load(1, {
+ shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ });
+ var data = {
+// id: $('#id').val(),
+ billNo: $('#billNo').val(),
+ seqNo: $('#seqNo').val(),
+ billType: $('#billType').val(),
+ locNo: $('#locNo').val(),
+ zpallet: $('#zpallet').val(),
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
+ stockQty: $('#stockQty').val(),
+ checkQty: $('#checkQty').val(),
+ linkErp: $('#linkErp').val(),
+ ioStatus: $('#ioStatus').val(),
+ ioTime: top.strToDate($('#ioTime\\$').val()),
+ verifyStatus: $('#verifyStatus').val(),
+ verifyUser: $('#verifyUser').val(),
+ modiUser: $('#modiUser').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ appeUser: $('#appeUser').val(),
+ appeTime: top.strToDate($('#appeTime\\$').val()),
+
+ };
+ $.ajax({
+ url: baseUrl+"/waitMatchk/"+name+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(data),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.layer.closeAll();
+ parent.$(".layui-laypage-btn")[0].click();
+ $("#data-detail :input").each(function () {
+ $(this).val("");
+ });
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ layer.close(index);
+ }
+ })
+ }
+
+ // 澶嶉�夋浜嬩欢
+ form.on('checkbox(detailCheckbox)', function (data) {
+ var el = data.elem;
+ if (el.checked) {
+ $(el).val('Y');
+ } else {
+ $(el).val('N');
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#ioTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
+}
+
+function setFormVal(el, data, showImg) {
+ for (var val in data) {
+ var find = el.find(":input[id='" + val + "']");
+ if (find[0]!=null){
+ if (find[0].type === 'checkbox'){
+ if (data[val]==='Y'){
+ find.attr("checked","checked");
+ find.val('Y');
+ } else {
+ find.remove("checked");
+ find.val('N');
+ }
+ continue;
+ }
+ }
+ find.val(data[val]);
+ if (showImg){
+ var next = find.next();
+ if (next.get(0)){
+ if (next.get(0).localName === "img") {
+ find.hide();
+ next.attr("src", data[val]);
+ next.show();
+ }
+ }
+ }
+ }
+}
+
+function clearFormVal(el) {
+ $(':input', el)
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+}
+
+function detailScreen(index) {
+ var detail = layer.getChildFrame('#data-detail', index);
+ var height = detail.height()+60;
+ if (height > ($(window).height()*0.9)) {
+ height = ($(window).height()*0.8);
+ }
+ layer.style(index, {
+// top: (($(window).height()-height)/3)+"px",
+ height: height+'px'
+ });
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/src/main/webapp/views/locStatis/locStatis.html b/src/main/webapp/views/locStatis/locStatis.html
new file mode 100644
index 0000000..fee6ea8
--- /dev/null
+++ b/src/main/webapp/views/locStatis/locStatis.html
@@ -0,0 +1,72 @@
+<!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">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<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="mat_no" placeholder="浜у搧缂栫爜" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="mat_name" placeholder="浜у搧鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="condition" 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>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="locStatis" lay-filter="locStatis"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button>
+ </div>
+</script>
+<script type="text/html" id="operate">
+ <a lay-event="detail" ew-event="popupRight" data-type="1" data-window="top"
+ data-success="onDemoDialog1Success" data-url="locStatis/locChart.html"
+ style="font-family: 'Bahnschrift' !important;color: #1890ff;cursor: pointer">璐т綅搴撳瓨</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.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/locStatis/locStatis.js" charset="utf-8"></script>
+
+</body>
+<script type="text/template" id="locChartListTpl">
+ {{#each data}}
+ <tr>
+ <td align="center"><span class="layui-text">{{this.locNo}}</span></td>
+ <td align="center"><span style="font-weight: bold">{{this.anfme}}</span></td>
+ </tr>
+ {{/each}}
+</script>
+</html>
+
diff --git a/src/main/webapp/views/waitMatchk/waitMatchk.html b/src/main/webapp/views/waitMatchk/waitMatchk.html
new file mode 100644
index 0000000..3963446
--- /dev/null
+++ b/src/main/webapp/views/waitMatchk/waitMatchk.html
@@ -0,0 +1,90 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<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="bill_no" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="verifyUser" class="layui-input" name="verify_user" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="verifyUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="瀹℃牳浜哄憳" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByverifyUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByverifyUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" name="modi_user" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="淇敼浜哄憳" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="appeUser" class="layui-input" name="appe_user" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="寤烘。浜哄憳" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="waitMatchk" lay-filter="waitMatchk"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+</script>
+
+<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/waitMatchk/waitMatchk.js" charset="utf-8"></script>
+
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/waitMatchk/waitMatchk_detail.html b/src/main/webapp/views/waitMatchk/waitMatchk_detail.html
new file mode 100644
index 0000000..57a900b
--- /dev/null
+++ b/src/main/webapp/views/waitMatchk/waitMatchk_detail.html
@@ -0,0 +1,202 @@
+<!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/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+
+<!-- <div class="layui-inline" style="display: none">-->
+<!-- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="billNo" class="layui-input" type="text" placeholder="缂栧彿">-->
+<!-- </div>-->
+<!-- </div>-->
+
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>鍗曟嵁缂栧彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="billNo" class="layui-input" type="text" onkeyup="check(this.id, 'waitMatchk')" lay-verify="required" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>搴忋��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="seqNo" class="layui-input" type="text" lay-verify="required|number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label>
+ <div class="layui-input-inline">
+ <select id="billType">
+ <option value="" style="display: none"></option>
+ <option value="1">鎶界洏</option>
+ <option value="2">鏈堝害鐩樼偣</option>
+ <option value="3">瀛ｅ害鐩樼偣</option>
+ <option value="4">骞村害鐩樼偣</option>
+ <option value="5">鍏ㄧ洏</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>搴� 浣� 鍙凤細</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="locNo" class="layui-input" type="text" onkeyup="check(this.id, 'waitMatchk')" lay-verify="required" style="display: none">
+ <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鎵� 鐩� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="zpallet" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栫爜锛�</label>
+ <div class="layui-input-inline">
+ <input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'waitMatchk')" lay-verify="required" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>鐗╂枡鍚嶇О锛�</label>
+ <div class="layui-input-inline">
+ <input id="matName" class="layui-input" type="text" lay-verify="required" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">搴撳瓨鏁伴噺锛�</label>
+ <div class="layui-input-inline">
+ <input id="stockQty" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鐩樼偣鏁伴噺锛�</label>
+ <div class="layui-input-inline">
+ <input id="checkQty" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">ERP杩炵嚎锛�</label>
+ <div class="layui-input-inline">
+ <select id="linkErp">
+ <option value="" style="display: none"></option>
+ <option value="0">闈炶繛绾�</option>
+ <option value="1">ERP杩炵嚎</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">瀹屾垚鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select id="ioStatus">
+ <option value="" style="display: none"></option>
+ <option value="0">寰呭鐞�</option>
+ <option value="1">鐩樼偣涓�</option>
+ <option value="2">鐩樼偣瀹屾垚</option>
+ <option value="3">鍙栨秷鐩樼偣</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">瀹屾垚鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="ioTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">瀹℃牳鐘舵�侊細</label>
+ <div class="layui-input-inline">
+ <select id="verifyStatus">
+ <option value="" style="display: none"></option>
+ <option value="0">寰呭</option>
+ <option value="1">宸插</option>
+ <option value="2">鎷掔粷</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">瀹℃牳浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="verifyUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="verifyUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByverifyUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByverifyUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">淇敼鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寤烘。浜哄憳锛�</label>
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">
+ <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">寤烘。鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>
+<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/waitMatchk/waitMatchk.js" charset="utf-8"></script>
+</html>
+
--
Gitblit v1.9.1