From ebf0db91e09be33fcbfe97ed5b91965dc2e61dfd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 八月 2024 10:54:26 +0800
Subject: [PATCH] 1. 托盘管理 2. 入库通知档导入功能 3. 工作档明细 新增来源单据类型及单据编号 4. 库存明细统计表 增加一栏ERP数量（需跟ERP确认接口实现方式）。 5. 存货档案、单据管理、库存管理可以支持模糊搜索（各个单据界面）。
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java | 15
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasZpalletMapper.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java | 56 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasZpalletController.java | 138 +++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java | 2
zy-asrs-wms/src/main/resources/application.yml | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java | 6
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasZpallet.java | 88 ++++
zy-asrs-wms/src/main/webapp/static/js/basZpallet/basZpallet.js | 304 ++++++++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 22
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/WaitPakingExcelListener.java | 126 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java | 48 ++
zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js | 65 +++
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java | 33 +
zy-asrs-wms/src/main/webapp/static/js/common.js | 38 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasZpalletService.java | 8
zy-asrs-wms/src/main/webapp/views/basZpallet/basZpallet.html | 122 ++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasZpalletServiceImpl.java | 12
zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 1
zy-asrs-wms/src/main/webapp/static/js/wrkDetl/wrkDetl.js | 2
zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html | 19 +
zy-asrs-wms/src/main/webapp/views/wrkMast/wrkDetl.html | 2
zy-asrs-common/src/main/resources/mapper/wms/BasZpalletMapper.xml | 5
24 files changed, 1,114 insertions(+), 17 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java
new file mode 100644
index 0000000..605e7f0
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java
@@ -0,0 +1,33 @@
+package com.zy.asrs.common.domain.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.zy.asrs.common.wms.entity.Mat;
+import com.zy.asrs.common.wms.entity.WaitPakin;
+import lombok.Data;
+
+/**
+ * 0.A 1.B 2.C 3.D 4.E 5.F 6.G 7.H 8.I
+ * 9.J 10.K 11.L 12.M 13.N 14.O 15.P 16.Q 17.R 18.S
+ * 19.T 20.U 21.V 22.W 23.X 24.Y 25.Z
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class WaitPakinExcel extends WaitPakin {
+
+ @ExcelProperty(index = 0, value = "鎵樼洏鏉＄爜")
+ private String zpallet;
+
+ @ExcelProperty(index = 1, value = "鏁伴噺")
+ private Double anfme;
+
+ @ExcelProperty(index = 2, value = "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ @ExcelProperty(index = 3, value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ @ExcelProperty(index = 4, value = "鎵瑰彿")
+ private String batch;
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/WaitPakingExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/WaitPakingExcelListener.java
new file mode 100644
index 0000000..cd3e383
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/WaitPakingExcelListener.java
@@ -0,0 +1,126 @@
+package com.zy.asrs.common.utils;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.domain.entity.MatExcel;
+import com.zy.asrs.common.domain.entity.WaitPakinExcel;
+import com.zy.asrs.common.wms.entity.Mat;
+import com.zy.asrs.common.wms.entity.Tag;
+import com.zy.asrs.common.wms.entity.WaitPakin;
+import com.zy.asrs.common.wms.mapper.TagMapper;
+import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.service.TagService;
+import com.zy.asrs.common.wms.service.WaitPakinService;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.framework.exception.CoolException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by vincent on 2019-11-25
+ */
+@Slf4j
+public class WaitPakingExcelListener extends AnalysisEventListener<WaitPakinExcel> {
+
+ private int total = 0;
+ private Long userId;
+ private Long hostId;
+
+ public WaitPakingExcelListener() {
+ }
+
+ public WaitPakingExcelListener(Long userId, Long hostId) {
+ this.userId = userId;
+ this.hostId = hostId;
+ }
+
+ /**
+ * 姣忛殧5鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互3000鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
+ */
+ private static final int BATCH_COUNT = 50;
+
+ private final List<MatExcel> list = new ArrayList<>();
+
+ /**
+ * 杩欓噷浼氫竴琛岃鐨勮繑鍥炲ご
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ }
+
+ /**
+ * 杩欎釜姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
+ */
+ @Override
+ public void invoke(WaitPakinExcel excel, AnalysisContext ctx) {
+ if(Cools.isEmpty(excel.getMatnr()) || Cools.isEmpty(excel.getAnfme()) || Cools.isEmpty(excel.getZpallet())){
+ throw new CoolException("缂哄皯鐗╂枡缂栫爜銆佹暟閲忋�佷粨搴撱�佹墭鐩樼爜鍙傛暟锛屾棤娉曠粍鎵�");
+ }
+
+ MatService matService = SpringUtils.getBean(MatService.class);
+ WaitPakinService waitPakinService = SpringUtils.getBean(WaitPakinService.class);
+
+ LambdaQueryWrapper<WaitPakin> wrapper = new LambdaQueryWrapper<WaitPakin>()
+ .eq(WaitPakin::getMatnr, excel.getMatnr())
+ .eq(WaitPakin::getHostId, hostId)
+ .eq(WaitPakin::getZpallet, excel.getZpallet());
+
+ if(Cools.isEmpty(excel.getBatch())){
+ wrapper.isNull(WaitPakin::getBatch);
+ }else {
+ wrapper.eq(WaitPakin::getBatch, excel.getBatch());
+ }
+
+ WaitPakin waitPakinOld = waitPakinService.getOne(wrapper);
+
+ if(Cools.isEmpty(waitPakinOld)){
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, excel.getMatnr()).eq(Mat::getHostId, hostId));
+ WaitPakin waitPakin = new WaitPakin();
+ BeanUtils.copyProperties(mat,waitPakin);
+ waitPakin.setAnfme(excel.getAnfme());
+ waitPakin.setBatch(excel.getBatch());
+ waitPakin.setZpallet(excel.getZpallet());
+ waitPakin.setHostId(excel.getHostId());
+ waitPakin.setAppeTime(new Date());
+ waitPakin.setAppeUser(userId);
+ waitPakin.setModiTime(new Date());
+ waitPakin.setAppeUser(userId);
+ waitPakin.setHostId(hostId);
+
+ waitPakinService.save(waitPakin);
+ total ++;
+
+ }else {
+ waitPakinOld.setAnfme(waitPakinOld.getAnfme() + excel.getAnfme());
+ waitPakinOld.setModiTime(new Date());
+ waitPakinOld.setModiUser(userId);
+
+ waitPakinService.updateById(waitPakinOld);
+ total ++;
+ }
+
+
+
+
+ }
+
+ /**
+ * 鎵�鏈夋暟鎹В鏋愬畬鎴愪簡璋冪敤
+ * 閫傚悎浜嬪姟
+ */
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext ctx) {
+ log.info("鏂板{}鏉＄墿鏂欎俊鎭紒", total);
+ }
+
+ public int getTotal() {
+ return total;
+ }
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasZpalletController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasZpalletController.java
new file mode 100644
index 0000000..756ad88
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasZpalletController.java
@@ -0,0 +1,138 @@
+package com.zy.asrs.common.wms.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.BasZpallet;
+import com.zy.asrs.common.wms.entity.LocMast;
+import com.zy.asrs.common.wms.service.BasZpalletService;
+import com.zy.asrs.framework.annotations.ManagerAuth;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.domain.KeyValueVo;
+import com.zy.asrs.framework.common.DateUtils;
+import com.zy.asrs.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasZpalletController extends BaseController {
+
+ @Value("${wcs.url}")
+ private String WCS_URL;
+
+ @Autowired
+ private BasZpalletService basZpalletService;
+
+ @RequestMapping(value = "/basZpallet/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basZpalletService.getById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basZpallet/page/auth")
+ @ManagerAuth
+ public R page(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String condition,
+ @RequestParam(required = false) String timeRange,
+ @RequestParam Map<String, Object> param) {
+ LambdaQueryWrapper<BasZpallet> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(BasZpallet::getId, condition);
+ }
+ if (!Cools.isEmpty(timeRange)) {
+ String[] range = timeRange.split(RANGE_TIME_LINK);
+ wrapper.ge(BasZpallet::getCreateTime, DateUtils.convert(range[0]));
+ wrapper.le(BasZpallet::getCreateTime, DateUtils.convert(range[1]));
+ }
+ return R.ok(basZpalletService.page(new Page<>(curr, limit), wrapper));
+ }
+
+
+ @RequestMapping(value = "/basZpallet/add/auth")
+ @ManagerAuth
+ public R add(BasZpallet basZpallet) {
+ basZpalletService.save(basZpallet);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basZpallet/update/auth")
+ @ManagerAuth
+ public R update(BasZpallet basZpallet){
+ if (Cools.isEmpty(basZpallet) || null==basZpallet.getId()){
+ return R.error();
+ }
+ basZpalletService.updateById(basZpallet);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basZpallet/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basZpalletService.removeById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basZpalletQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ LambdaQueryWrapper<BasZpallet> wrapper = new LambdaQueryWrapper<>();
+ wrapper.like(BasZpallet::getId, condition);
+ Page<BasZpallet> page = basZpalletService.page(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasZpallet basZpallet : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basZpallet.getId());
+ map.put("value", basZpallet.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping("/basZpallet/all/get/kv")
+ @ManagerAuth
+ public R getDataKV(@RequestParam(required = false) String condition) {
+ List<KeyValueVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<BasZpallet> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(BasZpallet::getId, condition);
+ }
+ basZpalletService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+ return R.ok().add(vos);
+ }
+
+ @GetMapping("/zpallet/picUrl")
+ @ManagerAuth
+ public R getPicUrl(@RequestParam String zpallet) {
+ BasZpallet basZpallet = basZpalletService.getOne(new LambdaQueryWrapper<BasZpallet>()
+ .eq(BasZpallet::getZpallet, zpallet)
+ .eq(BasZpallet::getHostId, getHostId()));
+ if (basZpallet == null) {
+ return R.error();
+ }
+
+ ArrayList<String> list = new ArrayList<>();
+ String picStr = basZpallet.getPicture();
+ if (Cools.isEmpty(picStr)) {
+ return R.ok().add(list);
+ }
+ List<String> pics = JSON.parseArray(picStr, String.class);
+ for (String pic : pics) {
+ List<String> picsOneTime = JSON.parseArray(pic, String.class);
+ for (String picture : picsOneTime){
+ list.add("http://" + WCS_URL + "/image/" + pic + "-1.jpg");
+ list.add("http://" + WCS_URL + "/image/" + pic + "-2.jpg");
+ }
+ }
+ return R.ok().add(list);
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasZpallet.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasZpallet.java
new file mode 100644
index 0000000..c17c7c7
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasZpallet.java
@@ -0,0 +1,88 @@
+package com.zy.asrs.common.wms.entity;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.common.sys.entity.User;
+import com.zy.asrs.common.sys.entity.Host;
+import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.common.sys.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wms_bas_zpallet")
+public class BasZpallet implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.INPUT)
+ private Long id;
+
+ @ApiModelProperty(value= "")
+ private String zpallet;
+
+ @ApiModelProperty(value= "")
+ private String picture;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value= "")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date modifyTime;
+
+ @ApiModelProperty(value= "")
+ private Long hostId;
+
+ public BasZpallet() {}
+
+ public BasZpallet(Long id,String zpallet,String picture,Date createTime,Date modifyTime,Long hostId) {
+ this.id = id;
+ this.zpallet = zpallet;
+ this.picture = picture;
+ this.createTime = createTime;
+ this.modifyTime = modifyTime;
+ this.hostId = hostId;
+ }
+
+// BasZpallet basZpallet = new BasZpallet(
+// null, // [闈炵┖]
+// null, //
+// null, //
+// null, //
+// null, //
+// null //
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getModifyTime$(){
+ if (Cools.isEmpty(this.modifyTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modifyTime);
+ }
+
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
index 75dc80c..e1ea2c5 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
@@ -4,6 +4,7 @@
import java.util.Date;
import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.common.wms.service.OrderService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -475,6 +476,20 @@
return null;
}
+ public String getOrderType(){
+ if(Cools.isEmpty(orderNo)){
+ return "";
+ }
+
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ Order order = orderService.selectByNo(orderNo, hostId);
+ if(!Cools.isEmpty(order)){
+ return order.getDocType$();
+ }
+
+ return "";
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasZpalletMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasZpalletMapper.java
new file mode 100644
index 0000000..49accfe
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasZpalletMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.common.wms.mapper;
+
+import com.zy.asrs.common.wms.entity.BasZpallet;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasZpalletMapper extends BaseMapper<BasZpallet> {
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasZpalletService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasZpalletService.java
new file mode 100644
index 0000000..695952d
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasZpalletService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.common.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.common.wms.entity.BasZpallet;
+
+public interface BasZpalletService extends IService<BasZpallet> {
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
index 7a69542..6ceab94 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
@@ -321,7 +321,10 @@
LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocSts, "O")
.eq(LocMast::getHostId, hostId)
- .in(LocMast::getRow1, curRow)
+ .eq(LocMast::getLocType1, locTypeDto.getLocType1())
+ .le(LocMast::getRow1, eRow)
+ .ge(LocMast::getRow1, sRow)
+// .in(LocMast::getRow1, curRow)
.orderByAsc(LocMast::getLev1)
.orderByAsc(LocMast::getBay1);
@@ -340,18 +343,21 @@
for (LocMast mast : locMasts) {
LocMast innerLoc = null;
for (String loc : Utils.getGroupLoc(mast.getLocNo(), hostId)) {
+ //1 2
LocMast one = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, loc).eq(LocMast::getHostId, hostId));
if (!one.getLocSts().equals("O")) {
- innerLoc = null;
+// innerLoc = null;
continue;
}
- if (innerLoc == null) {
- List<Integer> innerDeepRow = locDirectionService.getInnerDeepRow(hostId);
- if (innerDeepRow.contains(one.getRow1())) {
- innerLoc = one;
- }
- }
+ innerLoc = one;
+
+// if (innerLoc == null) {
+// List<Integer> innerDeepRow = locDirectionService.getInnerDeepRow(hostId);
+//// if (innerDeepRow.contains(one.getRow1())) {
+// innerLoc = one;
+//// }
+// }
}
if(innerLoc == null) {
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasZpalletServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasZpalletServiceImpl.java
new file mode 100644
index 0000000..bef845c
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasZpalletServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.common.wms.service.impl;
+
+import com.zy.asrs.common.wms.mapper.BasZpalletMapper;
+import com.zy.asrs.common.wms.entity.BasZpallet;
+import com.zy.asrs.common.wms.service.BasZpalletService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basZpalletService")
+public class BasZpalletServiceImpl extends ServiceImpl<BasZpalletMapper, BasZpallet> implements BasZpalletService {
+
+}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasZpalletMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasZpalletMapper.xml
new file mode 100644
index 0000000..0542842
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/wms/BasZpalletMapper.xml
@@ -0,0 +1,5 @@
+<?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.asrs.common.wms.mapper.BasZpalletMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index 4dc57fa..24df00e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -113,7 +113,9 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param) throws UnsupportedEncodingException {
- condition = condition.trim();
+ if(!Cools.isEmpty(condition)){
+ condition = condition.trim();
+ }
QueryWrapper<Order> wrapper = new QueryWrapper<>();
excludeTrash(param);
wrapper.eq("status", 1);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
index 9e112f6..cd49b75 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
@@ -1,10 +1,16 @@
package com.zy.asrs.wms.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.domain.entity.MatExcel;
+import com.zy.asrs.common.domain.entity.WaitPakinExcel;
+import com.zy.asrs.common.utils.MatExcelListener;
+import com.zy.asrs.common.utils.WaitPakingExcelListener;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.WaitPakin;
import com.zy.asrs.common.wms.entity.WrkMast;
@@ -20,7 +26,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -171,4 +181,42 @@
return R.ok().add(vos);
}
+ /*************************************** 鏁版嵁鐩稿叧 ***********************************************/
+
+ /**
+ * excel瀵煎叆妯℃澘涓嬭浇
+ */
+ @RequestMapping(value = "/waitPakin/excel/import/mould")
+ public void matExcelImportMould(HttpServletResponse response) throws IOException {
+ List<WaitPakinExcel> excels = new ArrayList<>();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("鍏ュ簱閫氱煡妗xcel瀵煎叆妯℃澘", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), WaitPakinExcel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("sheet1")
+ .doWrite(excels);
+ }
+
+// // excel瀵煎叆-------鍒ゆ柇鏄惁鏈夐噸澶嶇墿鏂�
+// @PostMapping(value = "/mat/excel/import/check/auth")
+// @ManagerAuth(memo = "鍟嗗搧妗ｆ鏁版嵁瀵煎叆")
+// @Transactional
+// public R matExcelImportCheck(MultipartFile file) throws IOException {
+// MatExcelListener listener = new MatExcelListener(getUserId(), getHostId());
+// EasyExcel.read(file.getInputStream(), MatExcel.class, listener).sheet().doRead();
+// return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+// }
+
+ // excel瀵煎叆
+ @PostMapping(value = "/waitPakin/excel/import/auth")
+ @ManagerAuth(memo = "鍏ュ簱閫氱煡妗ｆ。妗堟暟鎹鍏�")
+ @Transactional
+ public R matExcelImport(MultipartFile file) throws IOException {
+ WaitPakingExcelListener listener = new WaitPakingExcelListener(getUserId(), getHostId());
+ EasyExcel.read(file.getInputStream(), WaitPakinExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ }
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
index 09244f4..4232215 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
@@ -173,7 +173,7 @@
} catch (Exception e) {
e.printStackTrace();
//寮傚父涓婃姤澶辫触
- exceptionHandle("涓婃姤ERP寮傚父澶辫触[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("涓婃姤ERP寮傚父澶辫触[workNo={0}]澶辫触", wrkMast.getWrkNo());
} finally {
//璁板綍涓婃姤鏁版嵁
OperateLog operateLog = new OperateLog();
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
index 0e871d1..35e5835 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
@@ -1,5 +1,6 @@
package com.zy.asrs.wms.task.handler;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
@@ -12,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -35,6 +37,8 @@
private WaitPakinService waitPakinService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private BasZpalletService basZpalletService;
public ReturnT<String> start(WrkMast wrkMast) {
// 99.鍏ュ簱瀹屾垚
@@ -387,6 +391,7 @@
// 淇敼宸ヤ綔涓绘。鐘舵��
wrkMast.setWrkSts(200L);//200.搴撳瓨鏇存柊瀹屾垚
wrkMast.setModiTime(now);
+ savePicInZpallet(wrkMast.getBarcode(),wrkMast.getPic(),wrkMast.getHostId());
if (!wrkMastService.updateById(wrkMast)) {
exceptionHandle("鏇存柊鍑哄簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
}
@@ -399,4 +404,55 @@
return SUCCESS;
}
+ /*
+ 淇濆瓨鍥剧墖鍒版墭鐩樼鐞嗛〉闈�
+ */
+ private void savePicInZpallet(String barcode, String pic, Long hostId){
+
+ if(Cools.isEmpty(pic)){
+ return;
+ }
+
+ BasZpallet basZpallet = basZpalletService.getOne(new LambdaQueryWrapper<BasZpallet>().eq(BasZpallet::getZpallet, barcode));
+ List<String> list = null;
+ if(Cools.isEmpty(basZpallet)){
+ basZpallet = new BasZpallet();
+ basZpallet.setHostId(hostId);
+ basZpallet.setCreateTime(new Date());
+ basZpallet.setModifyTime(new Date());
+
+ list = new ArrayList<>();
+ list.add(pic);
+ basZpallet.setPicture(JSON.toJSONString(list));
+
+ basZpalletService.save(basZpallet);
+
+ }else {
+ basZpallet.setHostId(hostId);
+ basZpallet.setModifyTime(new Date());
+
+ String picture = basZpallet.getPicture();
+ list = JSON.parseArray(picture, String.class);
+ if(list.size() >= 5){
+ list.remove(0);
+ }
+ list.add(pic);
+
+ basZpallet.setPicture(JSON.toJSONString(list));
+
+ basZpalletService.updateById(basZpallet);
+ }
+
+ }
+
+ public static void main(String[] args) {
+ String str = "['abc','bcd','cdg']";
+ List<String> list = JSON.parseArray(str, String.class);
+ System.out.println(list);
+ list.remove(0);
+ System.out.println(list);
+ list.add("aaa");
+ System.out.println(list);
+ }
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
index 5ea369e..c430f8f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -24,10 +24,10 @@
generator.url="127.0.0.1:1433;databasename=ncasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="sys_permission";
+ generator.table="wms_bas_zpallet";
generator.packagePath="com.zy.asrs.common.wms";
- generator.js = false;
- generator.html = false;
+ generator.js = true;
+ generator.html = true;
generator.sql = false;
// generator.controller = false;
generator.build();
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index 336f6de..cb3a039 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -10,10 +10,11 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ncasrs
# url: jdbc:sqlserver://localhost:1433;databasename=jmasrs
# username: sa
# password: sa@123
- url: jdbc:sqlserver://192.168.4.61:1433;databasename=ncasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=ncasrs
username: sa
password: sa@123
mvc:
diff --git a/zy-asrs-wms/src/main/webapp/static/js/basZpallet/basZpallet.js b/zy-asrs-wms/src/main/webapp/static/js/basZpallet/basZpallet.js
new file mode 100644
index 0000000..5097e5e
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/static/js/basZpallet/basZpallet.js
@@ -0,0 +1,304 @@
+var pageCurr;
+var pageCount = 0;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin', 'xmSelect'], 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 xmSelect = layui.xmSelect;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basZpallet',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basZpallet/page/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'id', hide:true}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鐮�'}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ ,{field: 'modifyTime$', align: 'center',title: '淇敼鏃堕棿'}
+ // ,{field: 'hostId', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
+ ]],
+ 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;pageCount=count;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basZpallet)', 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}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basZpallet)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.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 = {
+ 'basZpallet': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basZpallet/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, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basZpallet)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ // 鏌ョ湅鍥剧墖
+ case 'showPic':
+ let imgHtml = '<div style="height:100%;display: flex;justify-content: space-around;align-items: center;flex-wrap: wrap;">';
+ $.ajax({
+ url: baseUrl+"/zpallet/picUrl",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ locNo: data.locNo
+ },
+ method: 'GET',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ res.data.forEach((item) => {
+ let tmp = '<img width="600" src="' + item + '" />';
+ imgHtml += tmp;
+ })
+ imgHtml += "</div>";
+
+ layer.open({
+ type: 1,
+ title: '鏌ョ湅鍥剧墖',
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: imgHtml,
+ success: function(layero, index){
+ }
+ });
+
+ } 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) {
+ form.val('detail', mData);
+ layDateRender(mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basZpallet/"+(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+"/basZpallet/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});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(true);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(true);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime$']:null
+ });
+ layDate.render({
+ elem: '#modifyTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['modifyTime$']:null
+ });
+
+ }, 100);
+ }
+ layDateRender();
+
+
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(search) {
+ if (pageCount === 0 || search) {
+ let searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index 79c9a9c..a19a452 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -261,6 +261,44 @@
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
]
+var detlColsWrkDetl = [
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
+ ,{field: 'orderType', align: 'center',title: '鍗曟嵁绫诲瀷', hide: false}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'owner', align: 'center',title: '璐т富'}
+ ,{field: 'fullPlt$', align: 'center',title: '鏄惁婊℃澘'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: false}
+ ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: false}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+ ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+]
+
function getQueryVariable(variable)
{
var query = window.location.search.substring(1);
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index fd1da33..ab83aed 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -2,6 +2,7 @@
function getCol() {
var cols = [
{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'anfmeErp', align: 'center',title: 'Erp鏁伴噺', style: 'font-weight: bold'}
];
arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
diff --git a/zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js b/zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js
index bf0e555..13409da 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -1,4 +1,5 @@
var pageCurr;
+var admin;
function getCol() {
var cols = [ {type: 'checkbox'} ];
cols.push.apply(cols, detlCols);
@@ -21,12 +22,15 @@
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'tableMerge'], function(){
+}).extend({
+ dropdown: 'dropdown/dropdown',
+}).use(['table','laydate', 'form', 'tableMerge', 'dropdown', 'admin'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ admin = layui.admin;
var tableMerge = layui.tableMerge;
// 鏁版嵁娓叉煋
@@ -486,6 +490,65 @@
}
}
+// excel瀵煎叆妯℃澘涓嬭浇
+function excelMouldDownload(){
+ layer.load(1, {shade: [0.1,'#fff']});
+ location.href = baseUrl + "/waitPakin/excel/import/mould";
+ layer.closeAll('loading');
+}
+
+// excel瀵煎叆
+function importExcel() {
+ $("#importExcel").trigger("click");
+}
+function upload(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/waitPakin/excel/import/auth";
+ var form = new FormData();
+ form.append("file", file);
+ xhr = new XMLHttpRequest();
+ xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete; //璇锋眰瀹屾垚
+ xhr.onerror = uploadFailed; //璇锋眰澶辫触
+ xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
+ layer.closeAll('loading');
+ $("#importExcel").val("");
+ };
+ // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
+ xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
+ ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
+ oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
+ };
+ xhr.send(form);
+ }, function(index){
+ $("#importExcel").val("");
+ });
+}
+function uploadComplete(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ loadTree("");
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ var res = JSON.parse(evt.target.responseText);
+ layer.msg(res.msg, {icon: 2});
+}
+
+// excel瀵煎嚭
+function exportExcel() {
+
+}
+
function clearFormVal(el) {
$(':input', el)
.val('')
diff --git a/zy-asrs-wms/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/zy-asrs-wms/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index cf4ad27..7c1d4ee 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -4,7 +4,7 @@
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width: 160}
];
- cols.push.apply(cols, detlCols);
+ cols.push.apply(cols, detlColsWrkDetl);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
return cols;
diff --git a/zy-asrs-wms/src/main/webapp/views/basZpallet/basZpallet.html b/zy-asrs-wms/src/main/webapp/views/basZpallet/basZpallet.html
new file mode 100644
index 0000000..2753680
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/views/basZpallet/basZpallet.html
@@ -0,0 +1,122 @@
+<!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">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" 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="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basZpallet" lay-filter="basZpallet"></table>
+ </div>
+ </div>
+</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 layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<!--<script type="text/html" id="operate">-->
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
+<!--</script>-->
+
+<script type="text/html" id="operate">
+<!-- <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetl">鏌ョ湅鏄庣粏</a>-->
+ <a class="layui-btn layui-btn-xs loc-detl" lay-event="showPic">鏌ョ湅鍥剧墖</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/basZpallet/basZpallet.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <div id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="id" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="zpallet" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="picture" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="modifyTime" id="modifyTime$" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="hostId" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </div>
+</script>
+</html>
+
diff --git a/zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html b/zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html
index f634c37..8944d0a 100644
--- a/zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/zy-asrs-wms/src/main/webapp/views/waitPakin/waitPakin.html
@@ -48,6 +48,25 @@
<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" style="">瀵煎嚭</button>
+
+ <!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
+ <div class="dropdown-menu" style="float: right">
+ <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i
+ class="layui-icon layui-icon-drop"></i></button>
+ <ul class="dropdown-menu-nav dark">
+ <div class="dropdown-anchor"></div>
+ <li class="title">1st menu</li>
+ <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i
+ class="layui-icon layui-icon-template-1"></i>妯℃澘涓嬭浇</a></li>
+ <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>瀵煎叆
+ Excel</a></li>
+ <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)"></li>
+ <hr>
+ <li class="title">2nd menu</li>
+ <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>瀵煎嚭
+ Excel</a></li>
+ </ul>
+ </div>
</div>
</script>
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkDetl.html b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkDetl.html
index 1199857..1bfa297 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkMast/wrkDetl.html
@@ -33,7 +33,7 @@
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
];
- cols.push.apply(cols, detlCols);
+ cols.push.apply(cols, detlColsWrkDetl);
return cols;
}
layui.use(['table','laydate', 'form'], function() {
--
Gitblit v1.9.1