From 1b13c69e4e2bb00bea4e90232a78715d49f1e24f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 13:38:14 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlLogMapper.xml | 2
src/main/java/com/zy/asrs/utils/VersionUtils.java | 76 -------
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/resources/mapper/WrkDetlMapper.xml | 2
src/main/java/com/zy/common/utils/Synchro.java | 7
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 7
src/main/resources/mapper/MatMapper.xml | 2
src/main/java/com/zy/asrs/entity/Mat.java | 14
src/main/java/com/zy/asrs/entity/WrkDetl.java | 10
src/main/java/com/zy/asrs/controller/MatController.java | 2
src/main/webapp/static/js/pakStore/pakStore.js | 2
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 10
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 2
src/main/java/com/zy/asrs/entity/OrderDetl.java | 14
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 1
src/main/resources/mapper/WaitPakinMapper.xml | 2
src/main/resources/mapper/WaitPakinLogMapper.xml | 2
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 3
src/main/java/com/zy/common/web/FileController.java | 53 ----
src/main/webapp/views/pakStore/matQuery.html | 8
src/main/resources/mapper/OrderDetlMapper.xml | 2
/dev/null | 288 ----------------------------
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 10
src/main/java/com/zy/asrs/entity/WaitPakin.java | 10
src/main/java/com/zy/asrs/entity/LocDetl.java | 10
src/main/java/com/zy/asrs/entity/AdjDetl.java | 10
26 files changed, 72 insertions(+), 479 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
deleted file mode 100644
index 956e0fe..0000000
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package com.zy.asrs.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.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.MatCodePrint;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.MatCodeService;
-import com.zy.asrs.utils.VersionUtils;
-import com.zy.common.CodeRes;
-import com.zy.common.config.AdminInterceptor;
-import com.zy.common.model.KeyValueVo;
-import com.zy.common.utils.BarcodeUtils;
-import com.zy.common.utils.QrCode;
-import com.zy.common.utils.excel.matcode.MatCodeExcel;
-import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
-import com.zy.common.web.BaseController;
-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.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.*;
-
-@RestController
-public class MatCodeController extends BaseController {
-
- @Autowired
- private MatCodeService matCodeService;
-
- /*************************************** xm-select ***********************************************/
-
- // xm-select 鎼滅储鍟嗗搧鍒楄〃
- @RequestMapping("/mat/all/get/kv")
- @ManagerAuth
- public R getMatDataKV(@RequestParam(required = false) String condition) {
- Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>()
- .andNew().like("mat_no", condition).or().like("mat_name", condition)
- .orderBy("appe_time", false);
- List<MatCode> mats = matCodeService.selectPage(new Page<>(1, 30), wrapper).getRecords();
- List<KeyValueVo> valueVos = new ArrayList<>();
- for (MatCode mat : mats) {
- KeyValueVo vo = new KeyValueVo();
- vo.setName(mat.getMatNo() + " - " + mat.getMatName());
- vo.setValue(mat.getMatNo());
- valueVos.add(vo);
- }
- return R.ok().add(valueVos);
- }
-
- @RequestMapping(value = "/matCode/covert/{id}/auth")
- @ManagerAuth
- public R covert(@PathVariable("id") String id) {
- MatCode matCode = matCodeService.selectById(String.valueOf(id));
- if (matCode == null) {
- return R.ok();
- }
- OrderDetl orderDetl = new OrderDetl();
-// VersionUtils.setOrderDetl(orderDetl, matCode);
- orderDetl.setAnfme(0.0D);
- return R.ok().add(orderDetl);
- }
-
-
- @RequestMapping(value = "/matCode/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(matCodeService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/matCode/auth")
- @ManagerAuth
- public R find(@RequestParam("id") String id) {
- return R.ok(matCodeService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/matCode/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(required = false)String condition,
- @RequestParam Map<String, Object> param){
- excludeTrash(param);
- EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
- allLike(MatCode.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
- wrapper.orderBy("modi_time", false);
- }
- return R.ok(matCodeService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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 = "/matCode/add/auth")
- @ManagerAuth
- public R add(MatCode matCode) {
- matCode.setModiUser(getUserId());
- matCode.setModiTime(new Date());
- matCode.setAppeUser(getUserId());
- matCode.setAppeTime(new Date());
- matCodeService.insert(matCode);
- return R.ok();
- }
-
- @RequestMapping(value = "/matCode/update/auth")
- @ManagerAuth
- public R update(MatCode matCode){
- if (Cools.isEmpty(matCode) || null==matCode.getMatNo()){
- return R.error();
- }
- matCode.setModiUser(getUserId());
- matCode.setModiTime(new Date());
- matCodeService.updateById(matCode);
- return R.ok();
- }
-
- @RequestMapping(value = "/matCode/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam String param){
- List<MatCode> list = JSONArray.parseArray(param, MatCode.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (MatCode entity : list){
- matCodeService.delete(new EntityWrapper<>(entity));
- }
- return R.ok();
- }
-
- // 瀵煎嚭
- @RequestMapping(value = "/matCode/export/auth")
- @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鍟嗗搧缂栧彿鏁版嵁瀵煎嚭")
- public void export(@RequestParam(required = false) String fileName,
- @RequestParam(required = false) Integer rowCount,
- HttpServletResponse response) throws Exception {
- List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
- List<MatCodeExcel> excels = new ArrayList<>();
- for (MatCode matCode : list) {
- MatCodeExcel excel = VersionUtils.getExcel(matCode);
- excels.add(excel);
- if (rowCount != null && excels.size() >= rowCount){
- break;
- }
- }
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("utf-8");
- fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鍟嗗搧缂栧彿":fileName, "UTF-8");
- response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), MatCodeExcel.class)
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .sheet("琛�1")
- .doWrite(excels);
- }
-
- // 瀵煎叆
- @RequestMapping(value = "/matCode/import/auth")
- @ManagerAuth(memo = "鍟嗗搧缂栧彿鏁版嵁瀵煎叆")
- @Transactional
- public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
- MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
- EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
- }
-
- // 鎵撳嵃
- @RequestMapping(value = "/matCode/print/auth")
- @ManagerAuth(memo = "鍟嗗搧缂栧彿鎵撳嵃")
- public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
- if(Cools.isEmpty(param)) {
- return R.parse(CodeRes.EMPTY);
- }
- List<MatCodePrint> res = new ArrayList<>();
- for (String matNo : param){
- MatCode matCode = matCodeService.selectById(matNo);
- // 鎵撳嵃鏁版嵁娉ㄥ叆
- MatCodePrint print = new MatCodePrint();
- print.setMatNo(matCode.getMatNo());
- print.setBarcode(matCode.getBarcode());
- print.setMatName(matCode.getMatName());
- print.setStr1(matCode.getStr1());
- print.setStr2(matCode.getStr2());
- res.add(print);
- }
- return R.ok().add(res);
- }
-
- @RequestMapping(value = "/macCode/code/auth")
-// @ManagerAuth(memo = "鍟嗗搧缂栧彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
- public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
- , @RequestParam String param
- , HttpServletResponse response) throws Exception {
- AdminInterceptor.cors(response);
- if (Cools.isEmpty(param)){
- return R.parse(BaseRes.EMPTY);
- }
- BufferedImage img;
- if (type == 1) {
- img = BarcodeUtils.encode(param);
- } else {
- img = QrCode.createImg(param);
- }
- if (!ImageIO.write(img, "jpg", response.getOutputStream())) {
- throw new IOException("Could not write an image of format jpg");
- }
- response.getOutputStream().flush();
- response.getOutputStream().close();
- return R.ok();
- }
-
- @RequestMapping(value = "/matCodeQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
- wrapper.like("mat_no", condition);
- Page<MatCode> page = matCodeService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (MatCode matCode : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", matCode.getMatNo());
- map.put("value", matCode.getMatNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/matCode/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<MatCode> wrapper = new EntityWrapper<MatCode>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != matCodeService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(MatCode.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 8616858..b842a73 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -288,7 +288,7 @@
/*************************************** xm-select ***********************************************/
// xm-select 鎼滅储鍟嗗搧鍒楄〃
- @RequestMapping("/mat/all/get/kv0") // todo:luxiaotao
+ @RequestMapping("/mat/all/get/kv")
@ManagerAuth
public R getMatDataKV(@RequestParam(required = false) String condition) {
Wrapper<Mat> wrapper = new EntityWrapper<Mat>()
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index bc45c3e..faca7f8 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -7,7 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.service.MatService;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
import io.swagger.annotations.ApiModelProperty;
@@ -183,10 +183,10 @@
}
public String getMatNo$(){
- MatCodeService service = SpringUtils.getBean(MatCodeService.class);
- MatCode matCode = service.selectById(this.matNo);
- if (!Cools.isEmpty(matCode)){
- return String.valueOf(matCode.getMatNo());
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.selectByMatnr(this.matNo);
+ if (!Cools.isEmpty(mat)){
+ return String.valueOf(mat.getMatnr());
}
return null;
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 50f5573..33fa2c6 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -136,7 +136,7 @@
private Integer source;
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
@@ -195,15 +195,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 8a14362..0a02150 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -255,7 +255,7 @@
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
@@ -308,7 +308,7 @@
public Mat() {}
- public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer check,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -338,7 +338,7 @@
this.deadTime = deadTime;
this.deadWarn = deadWarn;
this.source = source;
- this.check = check;
+ this.inspect = inspect;
this.danger = danger;
this.status = status;
this.createBy = createBy;
@@ -423,15 +423,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
deleted file mode 100644
index e6f8431..0000000
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ /dev/null
@@ -1,593 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@TableName("bas_mat_code")
-public class MatCode implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @TableId(value = "mat_no", type = IdType.INPUT)
- @TableField("mat_no")
- private String matNo;
-
- /**
- * 鏉＄爜
- */
- @ApiModelProperty(value= "鏉″舰鐮�")
- private String barcode;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @TableField("mat_name")
- private String matName;
-
- /**
- * 鐗╂枡鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- private String str1;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String str2;
-
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String str3;
-
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String str4;
-
- @ApiModelProperty(value= "鍨嬪彿")
- private String str5;
-
- @ApiModelProperty(value= "鎵瑰彿")
- private String str6;
-
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String str7;
-
- @ApiModelProperty(value= "")
- private String str8;
-
- @ApiModelProperty(value= "")
- private String str9;
-
- @ApiModelProperty(value= "")
- private String str10;
-
- @ApiModelProperty(value= "")
- private String str11;
-
- @ApiModelProperty(value= "")
- private String str12;
-
- @ApiModelProperty(value= "")
- private String str13;
-
- @ApiModelProperty(value= "")
- private String str14;
-
- @ApiModelProperty(value= "")
- private String str15;
-
- @ApiModelProperty(value= "")
- private String str16;
-
- @ApiModelProperty(value= "")
- private String str17;
-
- @ApiModelProperty(value= "")
- private String str18;
-
- @ApiModelProperty(value= "")
- private String str19;
-
- @ApiModelProperty(value= "")
- private String str20;
-
- @ApiModelProperty(value= "")
- private String str21;
-
- @ApiModelProperty(value= "")
- private String str22;
-
- @ApiModelProperty(value= "")
- private String str23;
-
- @ApiModelProperty(value= "閲嶉噺")
- private Double num1;
-
- @ApiModelProperty(value= "")
- private Double num2;
-
- @ApiModelProperty(value= "")
- private Double num3;
-
- @ApiModelProperty(value= "")
- private Double num4;
-
- @ApiModelProperty(value= "")
- private Double num5;
-
- @ApiModelProperty(value= "")
- private Double num6;
-
- @ApiModelProperty(value= "")
- private Date date1;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- @ApiModelProperty(value= "")
- private Short status;
-
- public MatCode() {}
-
- public MatCode(String barcode,String matName,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,String str11,String str12,String str13,String str14,String str15,String str16,String str17,String str18,String str19,String str20,String str21,String str22,String str23,Double num1,Double num2,Double num3,Double num4,Double num5,Double num6,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
- this.barcode = barcode;
- this.matName = matName;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- this.str4 = str4;
- this.str5 = str5;
- this.str6 = str6;
- this.str7 = str7;
- this.str8 = str8;
- this.str9 = str9;
- this.str10 = str10;
- this.str11 = str11;
- this.str12 = str12;
- this.str13 = str13;
- this.str14 = str14;
- this.str15 = str15;
- this.str16 = str16;
- this.str17 = str17;
- this.str18 = str18;
- this.str19 = str19;
- this.str20 = str20;
- this.str21 = str21;
- this.str22 = str22;
- this.str23 = str23;
- this.num1 = num1;
- this.num2 = num2;
- this.num3 = num3;
- this.num4 = num4;
- this.num5 = num5;
- this.num6 = num6;
- this.date1 = date1;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.status = status;
- }
-
-// MatCode matCode = new MatCode(
-// null, // 鏉＄爜
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鐗╂枡鍗曚綅
-// null, // 瑙勬牸
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null //
-// );
-
- public String getMatNo() {
- return matNo;
- }
-
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public String getMatName() {
- return matName;
- }
-
- public void setMatName(String matName) {
- this.matName = matName;
- }
-
- public String getStr1() {
- return str1;
- }
-
- public void setStr1(String str1) {
- this.str1 = str1;
- }
-
- public String getStr2() {
- return str2;
- }
-
- public void setStr2(String str2) {
- this.str2 = str2;
- }
-
- public String getStr3() {
- return str3;
- }
-
- public void setStr3(String str3) {
- this.str3 = str3;
- }
-
- public String getStr4() {
- return str4;
- }
-
- public void setStr4(String str4) {
- this.str4 = str4;
- }
-
- public String getStr5() {
- return str5;
- }
-
- public void setStr5(String str5) {
- this.str5 = str5;
- }
-
- public String getStr6() {
- return str6;
- }
-
- public void setStr6(String str6) {
- this.str6 = str6;
- }
-
- public String getStr7() {
- return str7;
- }
-
- public void setStr7(String str7) {
- this.str7 = str7;
- }
-
- public String getStr8() {
- return str8;
- }
-
- public void setStr8(String str8) {
- this.str8 = str8;
- }
-
- public String getStr9() {
- return str9;
- }
-
- public void setStr9(String str9) {
- this.str9 = str9;
- }
-
- public String getStr10() {
- return str10;
- }
-
- public void setStr10(String str10) {
- this.str10 = str10;
- }
-
- public String getStr11() {
- return str11;
- }
-
- public void setStr11(String str11) {
- this.str11 = str11;
- }
-
- public String getStr12() {
- return str12;
- }
-
- public void setStr12(String str12) {
- this.str12 = str12;
- }
-
- public String getStr13() {
- return str13;
- }
-
- public void setStr13(String str13) {
- this.str13 = str13;
- }
-
- public String getStr14() {
- return str14;
- }
-
- public void setStr14(String str14) {
- this.str14 = str14;
- }
-
- public String getStr15() {
- return str15;
- }
-
- public void setStr15(String str15) {
- this.str15 = str15;
- }
-
- public String getStr16() {
- return str16;
- }
-
- public void setStr16(String str16) {
- this.str16 = str16;
- }
-
- public String getStr17() {
- return str17;
- }
-
- public void setStr17(String str17) {
- this.str17 = str17;
- }
-
- public String getStr18() {
- return str18;
- }
-
- public void setStr18(String str18) {
- this.str18 = str18;
- }
-
- public String getStr19() {
- return str19;
- }
-
- public void setStr19(String str19) {
- this.str19 = str19;
- }
-
- public String getStr20() {
- return str20;
- }
-
- public void setStr20(String str20) {
- this.str20 = str20;
- }
-
- public String getStr21() {
- return str21;
- }
-
- public void setStr21(String str21) {
- this.str21 = str21;
- }
-
- public String getStr22() {
- return str22;
- }
-
- public void setStr22(String str22) {
- this.str22 = str22;
- }
-
- public String getStr23() {
- return str23;
- }
-
- public void setStr23(String str23) {
- this.str23 = str23;
- }
-
- public Double getNum1() {
- return num1;
- }
-
- public void setNum1(Double num1) {
- this.num1 = num1;
- }
-
- public Double getNum2() {
- return num2;
- }
-
- public void setNum2(Double num2) {
- this.num2 = num2;
- }
-
- public Double getNum3() {
- return num3;
- }
-
- public void setNum3(Double num3) {
- this.num3 = num3;
- }
-
- public Double getNum4() {
- return num4;
- }
-
- public void setNum4(Double num4) {
- this.num4 = num4;
- }
-
- public Double getNum5() {
- return num5;
- }
-
- public void setNum5(Double num5) {
- this.num5 = num5;
- }
-
- public Double getNum6() {
- return num6;
- }
-
- public void setNum6(Double num6) {
- this.num6 = num6;
- }
-
- public Date getDate1() {
- return date1;
- }
-
- public String getDate1$(){
- if (Cools.isEmpty(this.date1)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.date1);
- }
-
- public void setDate1(Date date1) {
- this.date1 = date1;
- }
-
- 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;
- }
-
- 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 Short getStatus() {
- return status;
- }
-
- public void setStatus(Short status) {
- this.status = status;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index ad19b6d..2ab47e1 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -238,7 +238,7 @@
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
@@ -290,7 +290,7 @@
public OrderDetl() {}
- public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer check, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -322,7 +322,7 @@
this.deadTime = deadTime;
this.deadWarn = deadWarn;
this.source = source;
- this.check = check;
+ this.inspect = inspect;
this.danger = danger;
this.status = status;
this.createBy = createBy;
@@ -367,15 +367,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 22fcbdb..168eba7 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -124,7 +124,7 @@
private Integer source;
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
@@ -181,15 +181,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 79e4cbd..2d0e335 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -120,7 +120,7 @@
private Integer source;
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
@@ -177,15 +177,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index bd1f873..ba91046 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -230,7 +230,7 @@
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
@@ -305,15 +305,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index fe18307..0383b98 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -226,7 +226,7 @@
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
@@ -301,15 +301,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 3df87a9..28474fa 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -23,7 +23,7 @@
public static class MatCodeStore {
// 鐗╂枡缂栧彿
- private String matNo;
+ private String matnr;
// 鎵瑰彿
private String batch;
diff --git a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java b/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
deleted file mode 100644
index d83016c..0000000
--- a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.MatCode;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface MatCodeMapper extends BaseMapper<MatCode> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/MatCodeService.java b/src/main/java/com/zy/asrs/service/MatCodeService.java
deleted file mode 100644
index 77b9506..0000000
--- a/src/main/java/com/zy/asrs/service/MatCodeService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.MatCode;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface MatCodeService extends IService<MatCode> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
deleted file mode 100644
index c5f33c4..0000000
--- a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.MatCodeMapper;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.service.MatCodeService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("matCodeService")
-public class MatCodeServiceImpl extends ServiceImpl<MatCodeMapper, MatCode> implements MatCodeService {
-
-}
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 9886899..d257470 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -13,7 +13,6 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.*;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
@@ -79,8 +78,8 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
// 妫�绱㈠簱浣�
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos, locTypeDto, 0);
+ List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
+ StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
@@ -111,7 +110,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<DetlDto> detlDtos = new ArrayList<>();
param.getList().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatNo(), elem.getBatch(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert detlDto1 != null;
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 81d90f1..1c21b16 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -9,7 +9,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.service.ErpService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,8 +34,6 @@
private WaitPakinService waitPakinService;
@Autowired
private WaitPakinLogService waitPakinLogService;
- @Autowired
- private ErpService erpService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index daba910..0016f8a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -7,7 +7,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.VersionUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 4913503..346299c 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,9 +1,7 @@
package com.zy.asrs.utils;
import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.MatCode;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.utils.excel.matcode.MatCodeExcel;
/**
* Created by vincent on 2020/7/14
@@ -113,80 +111,6 @@
// wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
-
- // excel ----------------------------------------------------------------------
-
- public static MatCodeExcel getExcel(MatCode matCode) {
- return new MatCodeExcel(
- matCode.getMatNo(),
- matCode.getBarcode(),
- matCode.getMatName(),
- matCode.getStr1(),
- matCode.getStr2(),
- matCode.getStr3(),
- matCode.getStr4(),
- matCode.getStr5(),
- matCode.getStr6(),
- matCode.getStr7(),
- matCode.getStr8(),
- matCode.getStr9(),
- matCode.getStr10(),
- matCode.getStr11(),
- matCode.getStr12(),
- matCode.getStr13(),
- matCode.getStr14(),
- matCode.getStr15(),
- matCode.getStr16(),
- matCode.getStr17(),
- matCode.getStr18(),
- matCode.getStr19(),
- matCode.getStr20(),
- matCode.getStr21(),
- matCode.getStr22(),
- matCode.getStr23(),
- matCode.getNum1(),
- matCode.getNum2(),
- matCode.getNum3(),
- matCode.getNum4(),
- matCode.getNum5(),
- matCode.getNum6()
- );
- }
-
- public static void setMatCode(MatCode matCode, MatCodeExcel excel) {
- matCode.setMatNo(excel.getMatNo());
- matCode.setMatName(excel.getMatName());
- matCode.setBarcode(excel.getBarcode());
- matCode.setStr1(excel.getStr1());
- matCode.setStr2(excel.getStr2());
- matCode.setStr3(excel.getStr3());
- matCode.setStr4(excel.getStr4());
- matCode.setStr5(excel.getStr5());
- matCode.setStr6(excel.getStr6());
- matCode.setStr7(excel.getStr7());
- matCode.setStr8(excel.getStr8());
- matCode.setStr9(excel.getStr9());
- matCode.setStr10(excel.getStr10());
- matCode.setStr11(excel.getStr11());
- matCode.setStr12(excel.getStr12());
- matCode.setStr13(excel.getStr13());
- matCode.setStr14(excel.getStr14());
- matCode.setStr15(excel.getStr15());
- matCode.setStr16(excel.getStr16());
- matCode.setStr17(excel.getStr17());
- matCode.setStr18(excel.getStr18());
- matCode.setStr19(excel.getStr19());
- matCode.setStr20(excel.getStr20());
- matCode.setStr21(excel.getStr21());
- matCode.setStr22(excel.getStr22());
- matCode.setStr23(excel.getStr23());
- matCode.setNum1(excel.getNum1());
- matCode.setNum2(excel.getNum2());
- matCode.setNum3(excel.getNum3());
- matCode.setNum4(excel.getNum4());
- matCode.setNum5(excel.getNum5());
- matCode.setNum6(excel.getNum6());
- }
/**
* 搴撲綅绉昏浆鏃剁被鍨嬫娴�
diff --git a/src/main/java/com/zy/common/service/ErpService.java b/src/main/java/com/zy/common/service/ErpService.java
deleted file mode 100644
index 55f0995..0000000
--- a/src/main/java/com/zy/common/service/ErpService.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.zy.common.service;
-
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.DocLog;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.RequestLog;
-import com.zy.asrs.service.DocLogService;
-import com.zy.asrs.service.MatCodeService;
-import com.zy.asrs.service.RequestLogService;
-import com.zy.common.model.BillDto;
-import com.zy.common.model.UploadBill;
-import com.zy.common.model.UploadBillDetail;
-import com.zy.common.utils.HttpHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by vincent on 2021/3/23
- */
-@Slf4j
-@Service("erpService")
-public class ErpService {
-
- @Value("${erp.url}")
- private String url;
-
- public static final String UPLOAD_BILL = "cM/basis/uploadBill";
-
- @Autowired
- private MatCodeService matCodeService;
- @Autowired
- private RequestLogService requestLogService;
- @Autowired
- private DocLogService docLogService;
-
- /**
- * 鍗曟嵁涓婃姤
- */
- public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
- try {
- Date now = new Date();
- if (Cools.isEmpty(dtos)) {
- return false;
- }
-
- // 鏃ュ織
- List<DocLog> docLogs = new ArrayList<>();
-
- UploadBill uploadBill = new UploadBill();
- uploadBill.setNumber(docNumber);
- uploadBill.setBillDate(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
- uploadBill.setBTypeID("SHHT");
- uploadBill.setKTypeID("瀹忔尯浠撳簱");
- uploadBill.setVchType(docId);
- if (docId == 9) {
- uploadBill.setDifAtype(22);
- } else if (docId == 14) {
- uploadBill.setDifAtype(23);
- }
- uploadBill.setSummary("閲囪喘鍗� - " + DateUtils.convert(new Date(), "yyyy-MM-dd HH:mm"));
- List<UploadBillDetail> detail = new ArrayList<>();
- uploadBill.setDetail(detail);
- for (BillDto dto : dtos) {
- MatCode mat = matCodeService.selectById(dto.getMatnr());
- UploadBillDetail detl = new UploadBillDetail();
- detl.setUserCode(dto.getMatnr());
- detl.setQty(dto.getQty());
- detl.setPrice(0);
- detl.setUnit(mat==null?"鏆傛棤":"绠�");
- detail.add(detl);
-
-
- // 鏃ュ織
- docLogs.add(new DocLog(
- docNumber, // 鍗曟嵁缂栧彿
- docId.longValue(), // 鍗曟嵁绫诲瀷
- null, // 鍗曟嵁鍚嶇О
- dto.getMatnr(), // 鍟嗗搧缂栧彿
- dto.getQty(), // 涓婃姤鏁伴噺
- 1, // 缁撴灉
- now, // 涓婃姤鏃堕棿
- null // 澶囨敞
- ));
- }
- log.warn(JSON.toJSONString(uploadBill));
- String response = new HttpHandler.Builder()
- .setUri(url)
- .setPath(UPLOAD_BILL)
- .setJson(JSON.toJSONString(uploadBill))
- .build()
- .doPost();
- try {
-
- for (DocLog docLog : docLogs) {
- docLogService.insert(docLog);
- }
-
- // 鏃ュ織璁板綍
- RequestLog logInfo = new RequestLog();
- logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + docId);
- logInfo.setRequest(JSON.toJSONString(uploadBill)); // 鍏ュ弬
- logInfo.setResponse(response); // 鍑哄弬
- logInfo.setCreateTime(new Date());
- requestLogService.insert(logInfo);
- } catch (Exception e) {
- log.error(e.getMessage());
- }
-
- if (!Cools.isEmpty(response)) {
- log.warn(response);
- Result result = JSON.parseObject(response, Result.class);
- if (result.getCode() != 1) {
- return false;
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- return Boolean.TRUE;
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/utils/Synchro.java b/src/main/java/com/zy/common/utils/Synchro.java
new file mode 100644
index 0000000..cf98918
--- /dev/null
+++ b/src/main/java/com/zy/common/utils/Synchro.java
@@ -0,0 +1,7 @@
+package com.zy.common.utils;
+
+public interface Synchro {
+
+ void sync(String matnr,String maktx,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer check,Integer danger);
+
+}
diff --git a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
deleted file mode 100644
index 561cb39..0000000
--- a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.zy.common.utils.excel;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.read.builder.ExcelReaderBuilder;
-import com.zy.common.utils.excel.matcode.MatCodeExcel;
-import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2019-11-24
- */
-public class ExcelUtils {
-
- public static void main(String[] args) {
- new ExcelUtils().simpleWrite();
- }
-
- public void simpleRead(){
- ExcelReaderBuilder read = EasyExcel.read("/Users/vincent/Desktop/3869.xls", MatCodeExcel.class, new MatCodeExcelListener());
- read.sheet().doRead();
- }
-
- public void simpleWrite(){
- EasyExcel.write("/Users/vincent/Desktop/writeDemo.xls", MatCodeExcel.class).sheet("lxt").doWrite(data());
- }
-
- public static List<MatCodeExcel> data(){
- List<MatCodeExcel> list = new ArrayList<>();
- for (int i = 0; i<1000; i++) {
- MatCodeExcel data = new MatCodeExcel();
- data.setMatNo("1902997-5/6");
- data.setBarcode("80001854");
- data.setMatName("閾濆甫|1100-O|0.33*475|");
- data.setStr1("701010015907");
- list.add(data);
- }
- return list;
- }
-
-
-}
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
deleted file mode 100644
index 5d138c8..0000000
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.zy.common.utils.excel.matcode;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-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 MatCodeExcel {
-
- @ExcelProperty(index = 1)
- private String matNo;
-
- @ExcelProperty(index = 9)
- private String barcode;
-
- @ExcelProperty(index = 2)
- private String matName;
-
- @ExcelProperty(index = 6)
- private String str1;
-
- @ExcelProperty(index = 3)
- private String str2;
-
-// @ExcelProperty(value= "棰滆壊鍚嶇О", index = 28)
- private String str3;
-
-// @ExcelProperty(value= "搴撲綅鍚嶇О", index = 14)
- private String str4;
-
- @ExcelProperty(index = 4)
- private String str5;
-
- // @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
- private String str6;
-
- // @ExcelProperty(value= "榛樿浠撳簱", index = 13)
- private String str7;
-
- // @ExcelProperty(value= "鍝佺墝", index = 9)
- private String str8;
-
- // @ExcelProperty(value= "閲囪喘鍛�", index = 11)
- private String str9;
-
- // @ExcelProperty(value= "浜у湴", index = 12)
- private String str10;
-
- // @ExcelProperty(value= "搴忓垪鍙风鐞�")
- private String str11;
-
- // @ExcelProperty(value= "鎵规绠＄悊")
- private String str12;
-
- // @ExcelProperty(value= "淇濊川鏈熷崟浣�")
- private String str13;
-
- // @ExcelProperty(value= "淇濊川鏈熺鐞�")
- private String str14;
-
- // @ExcelProperty(value= "淇濊川鏈�")
- private String str15;
-
- // @ExcelProperty(value= "鍙攢鍞�", index = 20)
- private String str16;
-
- // @ExcelProperty(value= "鍙噰璐�", index = 21)
- private String str17;
-
- // @ExcelProperty(value= "鍙负瀛愪欢", index = 22)
- private String str18;
-
- // @ExcelProperty(value= "鍙负缁勪欢", index = 23)
- private String str19;
-
- // @ExcelProperty(value= "杈呭姪灞炴�х鐞�")
- private String str20;
-
- // @ExcelProperty(value= "鎴愭湰璁＄畻鏂规硶", index = 29)
- private String str21;
-
- // @ExcelProperty(value= "閲囪喘鍗曚綅", index = 30)
- private String str22;
-
- // @ExcelProperty(value= "閿�鍞崟浣�", index = 31)
- private String str23;
-
- // @ExcelProperty(value= "閲嶉噺", index = 7)
- private Double num1;
-
- // @ExcelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
- private Double num2;
-
- // @ExcelProperty(value= "鏈�楂樺簱瀛樻暟閲�")
- private Double num3;
-
- // @ExcelProperty(value= "瀹夊叏搴撳瓨")
- private Double num4;
-
- // @ExcelProperty(value= "绋庣巼")
- private Double num5;
-
- private Double num6;
-
- public MatCodeExcel() {
- }
-
- public MatCodeExcel(String matNo, String barcode, String matName, String str1, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9, String str10, String str11, String str12, String str13, String str14, String str15, String str16, String str17, String str18, String str19, String str20, String str21, String str22, String str23, Double num1, Double num2, Double num3, Double num4, Double num5, Double num6) {
- this.matNo = matNo;
- this.barcode = barcode;
- this.matName = matName;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- this.str4 = str4;
- this.str5 = str5;
- this.str6 = str6;
- this.str7 = str7;
- this.str8 = str8;
- this.str9 = str9;
- this.str10 = str10;
- this.str11 = str11;
- this.str12 = str12;
- this.str13 = str13;
- this.str14 = str14;
- this.str15 = str15;
- this.str16 = str16;
- this.str17 = str17;
- this.str18 = str18;
- this.str19 = str19;
- this.str20 = str20;
- this.str21 = str21;
- this.str22 = str22;
- this.str23 = str23;
- this.num1 = num1;
- this.num2 = num2;
- this.num3 = num3;
- this.num4 = num4;
- this.num5 = num5;
- this.num6 = num6;
- }
-
-}
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
deleted file mode 100644
index db95aff..0000000
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.zy.common.utils.excel.matcode;
-
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.service.MatCodeService;
-import com.zy.asrs.utils.VersionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by vincent on 2019-11-25
- */
-public class MatCodeExcelListener extends AnalysisEventListener<MatCodeExcel> {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(MatCodeExcelListener.class);
-
- private int total = 0;
- private Long userId;
-
- public MatCodeExcelListener() {
- }
-
- public MatCodeExcelListener(Long userId) {
- this.userId = userId;
- }
-
- /**
- * 姣忛殧5鏉″瓨鍌ㄦ暟鎹簱锛屽疄闄呬娇鐢ㄤ腑鍙互3000鏉★紝鐒跺悗娓呯悊list 锛屾柟渚垮唴瀛樺洖鏀�
- */
- private static final int BATCH_COUNT = 50;
-
- private final List<MatCode> list = new ArrayList<>();
-
- /**
- * 杩欓噷浼氫竴琛岃鐨勮繑鍥炲ご
- */
- @Override
- public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
- }
-
- /**
- * 杩欎釜姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
- */
- @Override
- public void invoke(MatCodeExcel data, AnalysisContext ctx) {
- MatCodeService matCodeService = SpringUtils.getBean(MatCodeService.class);
- if (matCodeService.selectById(data.getMatNo()) == null) {
- MatCode matCode = new MatCode();
- VersionUtils.setMatCode(matCode, data);
- matCode.setModiTime(new Date());
- matCode.setModiUser(this.userId);
- matCode.setAppeTime(new Date());
- matCode.setAppeUser(this.userId);
- if (!matCodeService.insert(matCode)) {
- throw new CoolException("瀵煎叆鏁版嵁寮傚父");
- } else {
- System.out.println("===>> "+total);
- }
- total ++;
- }
- // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
-// if (list.size() >= BATCH_COUNT) {
-//
-// // 瀛樺偍瀹屾垚娓呯悊 list
-// list.clear();
-// }
- }
-
- /**
- * 鎵�鏈夋暟鎹В鏋愬畬鎴愪簡璋冪敤
- * 閫傚悎浜嬪姟
- */
- @Override
- public void doAfterAllAnalysed(AnalysisContext ctx) {
- LOGGER.info("鏂板{}鏉＄墿鏂欎俊鎭紒", total);
- }
-
- public int getTotal() {
- return total;
- }
-}
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index 934b131..cff077b 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -1,28 +1,19 @@
package com.zy.common.web;
-import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.service.MatCodeService;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
-import com.zy.common.utils.excel.matcode.MatCodeExcel;
-import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
/**
* todo
@@ -32,43 +23,7 @@
@RequestMapping("file/")
public class FileController {
- @Autowired
- private MatCodeService matCodeService;
- /**
- * 鏂囦欢涓婁紶
- */
- @PostMapping("upload")
- @ResponseBody
- public R upload(MultipartFile file) throws IOException {
- EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
- return R.ok();
- }
-
- /**
- * 鏂囦欢涓嬭浇锛堝け璐ヤ簡浼氳繑鍥炰竴涓湁閮ㄥ垎鏁版嵁鐨凟xcel锛�
- */
- @GetMapping("download")
- public void download(HttpServletResponse response) throws IOException {
- List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
-
- List<MatCodeExcel> excels = new ArrayList<>();
- for (MatCode matCode : list) {
- MatCodeExcel excel = new MatCodeExcel();
- excel.setMatNo(matCode.getMatNo());
- excel.setBarcode(matCode.getBarcode());
- excel.setMatName(matCode.getMatName());
- excel.setStr1(matCode.getStr1());
- excels.add(excel);
- }
- // 杩欓噷娉ㄦ剰 鏈夊悓瀛﹀弽搴斾娇鐢╯wagger 浼氬鑷村悇绉嶉棶棰橈紝璇风洿鎺ョ敤娴忚鍣ㄦ垨鑰呯敤postman
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("utf-8");
- // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
- String fileName = URLEncoder.encode("娴嬭瘯", "UTF-8");
- response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("妯℃澘").doWrite(excels);
- }
-
+
@RequestMapping(value = "/barcode/qrcode/auth")
// @ManagerAuth(memo = "鍟嗗搧缂栧彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 8a2ebea..2ef13d2 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -36,7 +36,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="modi_user" property="modiUser" />
diff --git a/src/main/resources/mapper/MatCodeMapper.xml b/src/main/resources/mapper/MatCodeMapper.xml
deleted file mode 100644
index 8e78b20..0000000
--- a/src/main/resources/mapper/MatCodeMapper.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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.mapper.MatCodeMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.MatCode">
- <result column="mat_no" property="matNo" />
- <result column="barcode" property="barcode" />
- <result column="mat_name" property="matName" />
- <result column="str1" property="str1" />
- <result column="str2" property="str2" />
- <result column="str3" property="str3" />
- <result column="str4" property="str4" />
- <result column="str5" property="str5" />
- <result column="str6" property="str6" />
- <result column="str7" property="str7" />
- <result column="str8" property="str8" />
- <result column="str9" property="str9" />
- <result column="str10" property="str10" />
- <result column="str11" property="str11" />
- <result column="str12" property="str12" />
- <result column="str13" property="str13" />
- <result column="str14" property="str14" />
- <result column="str15" property="str15" />
- <result column="str16" property="str16" />
- <result column="str17" property="str17" />
- <result column="str18" property="str18" />
- <result column="str19" property="str19" />
- <result column="str20" property="str20" />
- <result column="str21" property="str21" />
- <result column="str22" property="str22" />
- <result column="str23" property="str23" />
- <result column="num1" property="num1" />
- <result column="num2" property="num2" />
- <result column="num3" property="num3" />
- <result column="num4" property="num4" />
- <result column="num5" property="num5" />
- <result column="num6" property="num6" />
- <result column="date1" property="date1" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="status" property="status" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 3a5c151..f878349 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -34,7 +34,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 26707d9..ba6f8f9 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -37,7 +37,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="status" property="status" />
diff --git a/src/main/resources/mapper/WaitPakinLogMapper.xml b/src/main/resources/mapper/WaitPakinLogMapper.xml
index feda05e..543ead5 100644
--- a/src/main/resources/mapper/WaitPakinLogMapper.xml
+++ b/src/main/resources/mapper/WaitPakinLogMapper.xml
@@ -36,7 +36,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="status" property="status" />
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index fd4c6ce..e4227b7 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -36,7 +36,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="status" property="status" />
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index f177631..a4a997e 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -37,7 +37,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="modi_user" property="modiUser" />
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 8e0e171..f369802 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -37,7 +37,7 @@
<result column="dead_time" property="deadTime" />
<result column="dead_warn" property="deadWarn" />
<result column="source" property="source" />
- <result column="check" property="check" />
+ <result column="inspect" property="inspect" />
<result column="danger" property="danger" />
<result column="modi_user" property="modiUser" />
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
deleted file mode 100644
index dfe5d51..0000000
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ /dev/null
@@ -1,533 +0,0 @@
-var pageCurr;
-var printMatCodeNos = [];
-function getCol() {
- var cols = [
- {type: 'checkbox'}
- ];
- cols.push.apply(cols, matCols);
- cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
- return cols;
-}
-layui.use(['table','laydate', 'form','upload'], function(){
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
- var upload = layui.upload;
- var form = layui.form;
-
- // 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#matCode',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/matCode/list/auth',
- page: true,
- limit: 16,
- limits: [16, 50, 100, 200, 500],
- even: true,
- toolbar: '#toolbar',
- cellMinWidth: 50,
- cols: [getCol()],
- 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(matCode)', 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],
- shadeClose: false,
- content: 'matCode_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+"/matCode/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();
- $(".layui-laypage-btn")[0].click();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
- });
- }
- break;
- // 瀵煎嚭
- case 'exportData':
- layer.open({
- type: 1,
- title: '鏁版嵁瀵煎嚭',
- shadeClose: true,
- content: $('#exportDataDiv'),
- success: function(layero, index){
-
- },
- end: function () {
- $("#exportFileName").val("");
- $("#exportRowCount").val("");
- }
- })
- break;
- // 瀵煎叆
- case 'intoData':
- layer.open({
- type: 1,
- title: '鏁版嵁瀵煎叆',
- shadeClose: true,
- content: $('#importDataDiv'),
- success: function(layero, index){
- uploader.reload();
- },
- end: function () {
- $('#uploadDesc').show();
- $('#uploadDemoView').hide();
- $('#fileMame').html("");
- }
- });
- break;
- // 鎵归噺鎵撳嵃
- case "btnPrintBatch":
- printMatCodeNos = [];
- var data = checkStatus.data;
- if (data.length === 0){
- layer.msg('璇烽�夋嫨鎵撳嵃鏁版嵁');
- } else {
- layer.open({
- type: 1,
- title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
- area: ['500px'],
- shadeClose: true,
- content: $('#printDataDiv'),
- success: function(layero, index){
- for (var i = 0; i<data.length;i++) {
- printMatCodeNos.push(data[i].matNo);
- }
- },
- end: function () {
- }
- });
- }
- break;
- }
- });
-
- // 瀵煎嚭excel
- form.on('submit(exportDo)', function(data) {
- layer.closeAll();
- layer.load(1, {shade: [0.1,'#fff']});
- location.href = baseUrl + "/matCode/export/auth?fileName="+$("#exportFileName").val()+"&rowCount="+$("#exportRowCount").val();
- layer.closeAll('loading');
- return false;
- });
-
- // 瀵煎叆excel
- var uploader = upload.render({
- elem: '#uploadEx'
- , url: baseUrl + '/matCode/import/auth'
- , headers: {token: localStorage.getItem('token')}
- , accept: 'file'
- , exts: 'xls|excel|xlsx'
- , auto: false
- , bindAction: '#uploadDo'
- , before: function(obj){
- layer.closeAll();
- layer.load(1, {shade: [0.1,'#fff']});
- }
- , choose: function(obj){
- $('#uploadDesc').hide();
- $('#uploadDemoView').show();
- obj.preview(function(index, file, result){
- $('#fileMame').html(file.name);
- });
- }
- , done: function (res) {
- limit();
- $('#uploadDesc').show();
- $('#uploadDemoView').hide();
- $('#fileMame').html("");
- layer.closeAll('loading');
- layer.msg(res.msg);
- tableReload(false);
- }
- , error: function(index, upload){
- layer.closeAll('loading');
- }
- })
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(matCode)', 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: 'matCode_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 "btnPrint":
- printMatCodeNos = [];
- layer.open({
- type: 1,
- title: data.matNo + ' [鏁伴噺锛�1]',
- area: ['500px'],
- shadeClose: true,
- content: $('#printDataDiv'),
- success: function(layero, index){
- layer.iframeAuto(index);
- printMatCodeNos.push(data.matNo);
- },
- end: function () {
- }
- });
- break;
- }
- });
-
- // 妯℃澘閫夋嫨
- form.on('radio(selectTemplateRadio)', function (data) {
- $('.template-preview').hide();
- $('#template-preview-'+data.value).show();
- });
-
- // 寮�濮嬫墦鍗�
- form.on('submit(doPrint)', function (data) {
- var templateNo = data.field.selectTemplate;
- $.ajax({
- url: baseUrl+"/matCode/print/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {param: printMatCodeNos},
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200){
- layer.closeAll();
- for (let i=0;i<res.data.length;i++){
- var templateDom = $("#templatePreview"+templateNo);
- var className = templateDom.attr("class");
- if (className === 'template-barcode') {
- res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1¶m="+res.data[i].matNo;
- } else {
- res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=2¶m="+res.data[i].matNo;
- }
- }
- var tpl = templateDom.html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- let box = $("#box");
- box.html(html);box.show();
- box.print({mediaPrint:true});
- box.hide();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg)
- }
- }
- })
- })
-
- // 鏁版嵁淇濆瓨鍔ㄤ綔
- 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']
- });
- var data = {
- matNo: $('#matNo').val(),
- barcode: $('#barcode').val(),
- matName: $('#matName').val(),
- str1: $('#str1').val(),
- str2: $('#str2').val(),
- str3: $('#str3').val(),
- str4: $('#str4').val(),
- str5: $('#str5').val(),
- str6: $('#str6').val(),
- str7: $('#str7').val(),
- str8: $('#str8').val(),
- str9: $('#str9').val(),
- str10: $('#str10').val(),
- str11: $('#str11').val(),
- str12: $('#str12').val(),
- str13: $('#str13').val(),
- str14: $('#str14').val(),
- str15: $('#str15').val(),
- str16: $('#str16').val(),
- str17: $('#str17').val(),
- str18: $('#str18').val(),
- str19: $('#str19').val(),
- str20: $('#str20').val(),
- str21: $('#str21').val(),
- str22: $('#str22').val(),
- str23: $('#str23').val(),
- num1: $('#num1').val(),
- num2: $('#num2').val(),
- num3: $('#num3').val(),
- num4: $('#num4').val(),
- num5: $('#num5').val(),
- num6: $('#num6').val(),
- date1: top.strToDate($('#date1\\$').val()),
- appeUser: $('#appeUser').val(),
- appeTime: top.strToDate($('#appeTime\\$').val()),
- modiUser: $('#modiUser').val(),
- modiTime: top.strToDate($('#modiTime\\$').val()),
- status: $('#status').val(),
-
- };
- $.ajax({
- url: baseUrl+"/matCode/"+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: '#date1\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#appeTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#modiTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
- });
-
-
-});
-
-// 鍏抽棴鍔ㄤ綔
-$(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/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 7339689..e782a84 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -173,7 +173,7 @@
return
}
$.ajax({
- url: baseUrl + "/matCode/" + el.value + "/auth",
+ url: baseUrl + "/mat/" + el.value + "/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
deleted file mode 100644
index 87666d6..0000000
--- a/src/main/webapp/views/matCode/matCode.html
+++ /dev/null
@@ -1,320 +0,0 @@
-<!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">
- <link rel="stylesheet" href="../../static/css/print.css" media="all">
- <style>
- #search-box {
- padding: 30px 30px 10px 30px;
- }
- #search-box .layui-inline {
- margin-right: 5px;
- }
- #data-search-btn {
- margin-top: 10px;
- }
- #data-search-btn.layui-btn-container .layui-btn {
- margin-right: 20px;
- }
-
- .btn-print {
- display: none;
- }
- #btn-print-batch {
- display: none;
- }
- .layui-btn-danger {
- background-color: lightsalmon;
- color: #333;
- }
-
- /* ------------------------- 鎵撳嵃琛ㄦ牸 ----------------------- */
- .template-preview {
- height: 200px;
- display: inline-block;
- }
- .contain {
- }
- .contain td {
- border: 1px solid #000;
- /*line-height: 46px;*/
- }
- </style>
-</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" style="width: 300px">
- <div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="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="matCode" lay-filter="matCode"></table>
-</div>
-<script type="text/html" id="toolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-export" lay-event="exportData" style="float: inherit">瀵煎嚭</button>
- <button class="layui-btn layui-btn-sm" id="btn-into" lay-event="intoData">瀵煎叆</button>
- <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
- <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>
- </div>
-</script>
-
-<script type="text/html" id="operate">
-<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
- <button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
-</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/jquery/jQuery.print.js"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></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/matCode/matCode.js" charset="utf-8"></script>
-
-<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
-
-<!-- 瀵煎嚭鎿嶄綔寮圭獥 -->
-<div id="exportDataDiv" style="display: none;padding: 20px">
- <div class="layui-form">
- <div class="layui-form-item">
- <label class="layui-form-label" style="padding: 9px 0">璁剧疆鏂囦欢鍚�</label>
- <div class="layui-input-block" style="margin-left: 90px;">
- <input type="text" id="exportFileName" placeholder="閫夊～" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label" style="padding: 9px 0">瀵煎嚭琛屾暟</label>
- <div class="layui-input-block" style="margin-left: 90px;">
- <input type="text" id="exportRowCount" placeholder="閫夊～锛堥粯璁ゅ叏閮級" autocomplete="off" class="layui-input" lay-verify="number" lay-reqtext="璇疯緭鍏ユ暟瀛�">
- </div>
- </div>
- <div style="text-align: center; margin-top: 20px">
- <button class="layui-btn layui-btn-radius layui-btn-normal" id="exportDo" lay-submit lay-filter="exportDo">寮�濮嬪鍑�</button>
- </div>
- </div>
-</div>
-
-
-<!-- 瀵煎叆鎿嶄綔寮圭獥 -->
-<div id="importDataDiv" style="display: none;padding: 20px 40px">
- <div class="layui-upload-drag" id="uploadEx" style="width: 200px; font-size: x-small; padding: 10px; text-align: center; box-sizing: border-box">
- <div id="uploadDesc" style="display: inline-block; ">
- <i class="layui-icon">顧�</i>
- <p>鐐瑰嚮娣诲姞锛屾垨灏嗘枃浠舵嫋鎷藉埌姝ゅ</p>
- </div>
- <div id="uploadDemoView" style="display: none">
- <img src="../../static/image/Excel.png" alt="涓婁紶鎴愬姛鍚庢覆鏌�" style="max-width: 196px; padding: 20px 0 10px 0">
- <span id="fileMame" style="display: block; font-size: small; color: #333"></span>
- </div>
- </div>
- <div style="text-align: center; margin-top: 20px">
- <button class="layui-btn layui-btn-radius" id="uploadDo">寮�濮嬪鍏�</button>
- </div>
-</div>
-
-<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
-<div id="printDataDiv" style="display: none;padding: 20px">
- <div class="layui-form" style="text-align: center">
- <hr>
- <!--鍗曢�夋-->
- <div class="layui-form-item" style="display: inline-block; margin-bottom: 10px">
- <input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="">
- <input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">
- <input type="radio" name="selectTemplate" value="3" title="妯℃澘涓�" lay-filter="selectTemplateRadio">
- </div>
- <fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
- <legend>鎵撳嵃棰勮</legend>
- <div id="template-container" style="margin: 20px;text-align: center">
-
- <!-- 棰勮鍥� 1 -->
- <div id="template-preview-1" class="template-preview" style="display: inline-block">
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px">
- <td colspan="3" align="center" scope="col">鍟嗗搧缂栧彿</td>
- <td class="barcode" colspan="9" align="center" scope="col">
- <img class="template-code template-barcode" src="" width="90%;">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
- <span>xxxxxx</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧鍚嶇О</td>
- <td align="center" colspan="5">xxxxxx-xx/xx</td>
- <td align="center" colspan="2">鍗曚綅</td>
- <td align="center" colspan="2">xx</td>
- </tr>
- </table>
- </div>
-
- <!-- 棰勮鍥� 2 -->
- <div id="template-preview-2" class="template-preview" style="display: none">
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 30px">
- <td align="center" width="20%">鍟嗗搧鍚嶇О</td>
- <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
- </tr>
- <tr style="height: 30px">
- <td align="center" width="20%">鐗╂枡鍗曚綅</td>
- <td align="center" width="80%">xxxxxxxx</td>
- </tr>
- <tr style="height: 75px;">
- <td align="center" colspan="2" width="100%" style="border: none">
- <img class="template-code template-barcode" src="" width="80%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
- <span>xxxxxx</span>
- </div>
- </td>
- </tr>
- </table>
- </div>
-
- <!-- 棰勮鍥� 3 -->
- <div id="template-preview-3" class="template-preview" style="display: none">
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px">
- <td align="center" scope="col" colspan="1">鍟嗗搧鍚嶇О</td>
- <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
- <td align="center" scope="col" colspan="2" rowspan="2">
- <img class="template-code template-qrcode" src="" width="80%">
- <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
- <span>xxxxxx</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="1">鐗╂枡鍗曚綅</td>
- <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
- </tr>
- </table>
- </div>
- </div>
- </fieldset>
-
- <button class="layui-btn layui-btn-danger" id="doPrint" lay-submit lay-filter="doPrint" style="margin-top: 20px">纭畾</button>
- </div>
-</div>
-
-<div id="box" style="display: block"></div>
-
-<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
-<script type="text/javascript">
- $('.template-barcode').attr("src", baseUrl+"/macCode/code/auth?type=1¶m=123");
- $('.template-qrcode').attr("src", baseUrl+"/macCode/code/auth?type=2¶m=123");
-</script>
-
-<!-- 妯℃澘寮曟搸 -->
-<!-- 妯℃澘1 -->
-<script type="text/template" id="templatePreview1" class="template-barcode">
- {{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
- <tr style="height: 74px">
- <td align="center" colspan="3" scope="col">鍟嗗搧缂栧彿</td>
- <td align="center" class="barcode" colspan="9" scope="col">
- <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
- <span>{{this.matNo}}</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧鍚嶇О</td>
- <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.matName}}</td>
- <td align="center" colspan="2">鍗曚綅</td>
- <td align="center" colspan="2">{{this.str1}}</td>
- </tr>
- </table>
- {{/each}}
-</script>
-<!-- 妯℃澘2 -->
-<script type="text/template" id="templatePreview2" class="template-barcode">
- {{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 35px">
- <td align="center" width="20%">鍟嗗搧鍚嶇О</td>
- <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matName}}</td>
- </tr>
- <tr style="height: 35px">
- <td align="center" width="20%">鐗╂枡鍗曚綅</td>
- <td align="center" width="80%">{{this.str1}}</td>
- </tr>
- <tr style="height: 79px;">
- <td align="center" colspan="2" width="100%" style="border: none">
- <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
- <span>{{this.matNo}}</span>
- </div>
- </td>
- </tr>
- </table>
- {{/each}}
-</script>
-<!-- 妯℃澘3 -->
-<script type="text/template" id="templatePreview3" class="template-qrcode">
- {{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 74px" >
- <td align="center" scope="col" colspan="1">鍟嗗搧鍚嶇О</td>
- <td align="center" scope="col" colspan="1" style="
- display: inline-block;
- line-height: 20px;
- vertical-align: middle;
- border: none;
- border-top: 1px solid #000;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 3;
- -webkit-box-orient: vertical;
- ">
- {{this.matName}}
- </td>
- <td align="center" scope="col" colspan="2" rowspan="2">
- <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
- <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
- <span>{{this.matNo}}</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="1">鐗╂枡鍗曚綅</td>
- <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.str1}}</td>
- </tr>
- </table>
- {{/each}}
-</script>
-
-</body>
-</html>
-
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
deleted file mode 100644
index 7335ee0..0000000
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ /dev/null
@@ -1,288 +0,0 @@
-<!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="id" 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="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" 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="matName" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鏉＄爜锛�</label>
- <div class="layui-input-inline">
- <input id="barcode" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input id="str1" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">瑙勬牸锛�</label>
- <div class="layui-input-inline">
- <input id="str2" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">鍝侀」鏁帮細</label>
- <div class="layui-input-inline">
- <input id="str3" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">瀹㈡埛鍚嶇О锛�</label>
- <div class="layui-input-inline">
- <input id="str4" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍨嬪彿锛�</label>
- <div class="layui-input-inline">
- <input id="str5" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">鎵瑰彿锛�</label>
- <div class="layui-input-inline">
- <input id="str6" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
- <div class="layui-input-inline">
- <input id="str7" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str8" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str9" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str10" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str11" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str12" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str13" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str14" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str15" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str16" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str17" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str18" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str19" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str20" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str21" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str22" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="str23" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="num1" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="num2" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="num3" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="num4" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="num5" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="num6" class="layui-input" type="text" lay-verify="number" >
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="date1$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <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%;display: none">
- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <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%;display: none">
- <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%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="status" class="layui-input" type="text" lay-verify="number" >
- </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/matCode/matCode.js" charset="utf-8"></script>
-</html>
-
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 299d087..44ae6f8 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -52,7 +52,7 @@
</fieldset>
<div class="layui-form">
- <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
+ <table class="layui-hide" id="mat" lay-filter="mat"></table>
</div>
</div>
@@ -94,9 +94,9 @@
// 鐗╂枡鏌ヨ鏁版嵁琛�
matQueryTable = table.render({
- elem: '#matCode',
+ elem: '#mat',
headers: {token: localStorage.getItem('token')},
- url: baseUrl + '/matCode/list/auth',
+ url: baseUrl + '/mat/list/auth',
page: true,
limit: 7,
limits: [7, 10, 30,50,100],
@@ -127,7 +127,7 @@
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(matCode)', function (obj) {
+ table.on('toolbar(mat)', function (obj) {
let checkStatus = table.checkStatus(obj.config.id);
let data = checkStatus.data;
switch(obj.event) {
--
Gitblit v1.9.1