From d26dbc9cb768a03008f4f3ed04be7b7b6750aa29 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 22 六月 2021 13:25:16 +0800
Subject: [PATCH] 1.平仓日入库功能改造
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 5
src/main/java/com/zy/asrs/service/LocNormalLogService.java | 12 +
src/main/java/com/zy/asrs/service/impl/LocNormalLogServiceImpl.java | 39 ++++
src/main/java/com/zy/asrs/mapper/LocNormalLogMapper.java | 17 ++
/dev/null | 68 --------
src/main/java/com/zy/asrs/entity/LocNormalLog.java | 105 +++++++++++++
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 132 ++++++++++++++--
src/main/java/com/zy/asrs/controller/LocNormalController.java | 36 +++-
src/main/webapp/static/js/locNormal/locNormal.js | 2
version/v1.0.1/tableChange | 2
src/main/webapp/views/locNormal/normalReport.html | 4
src/main/java/com/zy/asrs/controller/OutStockController.java | 19 ++
src/main/resources/mapper/LocNormalLogMapper.xml | 24 +++
src/main/webapp/static/js/locNormal/normalReport.js | 9
14 files changed, 370 insertions(+), 104 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocNormalController.java b/src/main/java/com/zy/asrs/controller/LocNormalController.java
index 58da3c8..914cb9b 100644
--- a/src/main/java/com/zy/asrs/controller/LocNormalController.java
+++ b/src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -12,10 +13,13 @@
import com.core.common.R;
import com.sun.org.apache.bcel.internal.generic.NEW;
import com.zy.asrs.entity.LocNormal;
+import com.zy.asrs.entity.LocNormalLog;
import com.zy.asrs.entity.LocNormalReport;
import com.zy.asrs.entity.param.LocNormalParam;
+import com.zy.asrs.service.LocNormalLogService;
import com.zy.asrs.service.LocNormalReportService;
import com.zy.asrs.service.LocNormalService;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.common.utils.excel.locNomal.LocNormalExcel;
@@ -23,6 +27,7 @@
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
@@ -42,6 +47,7 @@
import static jdk.nashorn.api.scripting.ScriptUtils.convert;
+@Slf4j
@RestController
public class LocNormalController extends BaseController {
@Autowired
@@ -50,6 +56,8 @@
private LocNormalReportService locNormalReportService;
@Autowired
private ErpSqlServer erpSqlServer;
+ @Autowired
+ private LocNormalLogService locNormalLogService;
@RequestMapping(value = "/locNomal/list/auth")
@ManagerAuth
@@ -127,6 +135,17 @@
ErpSql = MessageFormat.format(ErpSql, param.getMatnr(), erpCount);
erpSqlServer.update(ErpSql);
locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId());
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, param);
+ locLog.setAnfme(erpCount.doubleValue());
+ locLog.setIoType(3); // 淇敼
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(modiUser);
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨淇敼搴撳瓨璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
}
@RequestMapping(value = "/locNormal/outLoc/auth")
@@ -257,15 +276,11 @@
@RequestParam(required = false) String condition,
@RequestParam Map<String, Object> param) {
excludeTrash(param);
- EntityWrapper<LocNormalReport> wrapper = new EntityWrapper<>();
- List<String> orderList = new ArrayList<>();
- orderList.add("time");
- wrapper.eq("state", param.get("state").toString()).orderDesc(orderList);
- String timeRange = "";
+ EntityWrapper<LocNormalLog> wrapper = new EntityWrapper<>();
String time1 = "";
String time2 = "";
if (!Cools.isEmpty(param.get("query_date"))) {
- timeRange = param.get("query_date").toString();
+ String timeRange = param.get("query_date").toString();
time1 = timeRange.substring(0, 19);
time2 = timeRange.substring(21, timeRange.length());
}
@@ -281,9 +296,12 @@
} catch (Exception e) {
e.printStackTrace();
}
- wrapper.ge("time", dateTime1).and().le("time", dateTime2);
+ wrapper.ge("create_time", dateTime1).and().le("create_time", dateTime2);
}
- allLike(LocNormalReport.class, param.keySet(), wrapper, condition);
- return R.ok(locNormalReportService.selectPage(new Page<>(curr, limit), wrapper));
+ List<String> oderCol = new ArrayList<>();
+ oderCol.add("create_time");
+ wrapper.orderDesc(oderCol);
+ allLike(LocNormalLog.class, param.keySet(), wrapper, condition);
+ return R.ok(locNormalLogService.selectPage(new Page<>(curr, limit), wrapper));
}
}
diff --git a/src/main/java/com/zy/asrs/controller/OutStockController.java b/src/main/java/com/zy/asrs/controller/OutStockController.java
index ab30dd6..d0b688f 100644
--- a/src/main/java/com/zy/asrs/controller/OutStockController.java
+++ b/src/main/java/com/zy/asrs/controller/OutStockController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
@@ -8,11 +9,14 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocNormal;
+import com.zy.asrs.entity.LocNormalLog;
import com.zy.asrs.entity.param.LocNormalStockOutParam;
import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.service.LocNormalLogService;
import com.zy.asrs.service.LocNormalService;
import com.zy.asrs.service.OutStockService;
import com.zy.asrs.service.WorkService;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.OutStockBillEntry;
import com.zy.common.web.BaseController;
@@ -41,6 +45,8 @@
private LocNormalService locNormalService;
@Autowired
private ErpService erpService;
+ @Autowired
+ private LocNormalLogService locNormalLogService;
/**
*
@@ -124,9 +130,20 @@
logLocNormal.setMemo(locNormal.getMemo());
logLocNormal.setState("2");
// 鐢熸垚鍑哄簱璁板綍
- locNormalService.insert(logLocNormal);
+// locNormalService.insert(logLocNormal);
// 鏇存柊鍘熷厛骞充粨璁板綍
locNormalService.updateLocNormal(locNormal.getMatnr(), locNormal.getAnfme().subtract(locNormals.getAnfme()), modiUser, modiTime, locNormal.getId());
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, locNormals);
+ locLog.setAnfme(locNormals.getAnfme().doubleValue());
+ locLog.setIoType(2);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(modiUser);
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍑哄簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
} else {
// 鎶婂搴旂墿鏂欏钩浠撳簱瀛樺嚭搴�
locNormalService.outLocNormal(locNormals.getMatnr(), modiUser, modiTime, locNormals.getId());
diff --git a/src/main/java/com/zy/asrs/entity/LocNoramlLog.java b/src/main/java/com/zy/asrs/entity/LocNoramlLog.java
deleted file mode 100644
index 82a6ae9..0000000
--- a/src/main/java/com/zy/asrs/entity/LocNoramlLog.java
+++ /dev/null
@@ -1,68 +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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * Created by vincent on 2021/6/21
- */
-@Data
-@TableName("asr_loc_normal_log")
-public class LocNoramlLog {
- @ApiModelProperty(value= "鐗╂枡")
- private String matnr;
-
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
-
- @ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
-
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
- private String type;
-
- @ApiModelProperty(value= "鐢熶骇鍗曞彿")
- private String mnemonic;
-
- @ApiModelProperty(value= "閫氱煡鍗曞彿")
- private String supplier;
-
- @ApiModelProperty(value= "浠撳簱")
- private String warehouse;
-
- @TableField(exist = false)
- private String warehouseName;
-
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("create_time")
- private Date createTime;
-
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- private Date update_time;
-
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("create_user")
- private Long createUser;
-
- @ApiModelProperty(value= "淇敼鑰�")
- @TableField("update_user")
- private Long updateUser;
-
- @ApiModelProperty(value= "鍑哄叆搴撶被鍨�(1鍏ュ簱,2鍑哄簱, 3鍒犻櫎, 4鏇存柊)")
- @TableField("io_type")
- private Integer ioType;
-}
diff --git a/src/main/java/com/zy/asrs/entity/LocNormalLog.java b/src/main/java/com/zy/asrs/entity/LocNormalLog.java
new file mode 100644
index 0000000..acea73a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/LocNormalLog.java
@@ -0,0 +1,105 @@
+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 lombok.Data;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Created by vincent on 2021/6/21
+ */
+@Data
+@TableName("asr_loc_normal_log")
+public class LocNormalLog {
+ @ApiModelProperty(value= "鐗╂枡")
+ private String matnr;
+
+ @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ private String maktx;
+
+ @ApiModelProperty(value= "瑙勬牸")
+ private String lgnum;
+
+ @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ private String type;
+
+ @ApiModelProperty(value= "鐢熶骇鍗曞彿")
+ private String mnemonic;
+
+ @ApiModelProperty(value= "閫氱煡鍗曞彿")
+ private String supplier;
+
+ @ApiModelProperty(value= "浠撳簱")
+ private String warehouse;
+
+ @TableField(exist = false)
+ private String warehouseName;
+
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @TableField("create_time")
+ private Date createTime;
+
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ private Date updateTime;
+
+ @ApiModelProperty(value= "鍒涘缓鑰�")
+ @TableField("create_user")
+ private Long createUser;
+
+ @ApiModelProperty(value= "淇敼鑰�")
+ @TableField("update_user")
+ private Long updateUser;
+
+ @ApiModelProperty(value= "鍑哄叆搴撶被鍨�(1鍏ュ簱,2鍑哄簱, 3鍒犻櫎, 4鏇存柊)")
+ @TableField("io_type")
+ private Integer ioType;
+
+ public String getCreateUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocNormalLogMapper.java b/src/main/java/com/zy/asrs/mapper/LocNormalLogMapper.java
new file mode 100644
index 0000000..d910772
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/LocNormalLogMapper.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.LocNormalLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Mapper
+@Repository
+public interface LocNormalLogMapper extends BaseMapper<LocNormalLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/LocNormalLogService.java b/src/main/java/com/zy/asrs/service/LocNormalLogService.java
new file mode 100644
index 0000000..c1bd353
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/LocNormalLogService.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.LocNormalLog;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+public interface LocNormalLogService extends IService<LocNormalLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalLogServiceImpl.java
new file mode 100644
index 0000000..dc74f6c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalLogServiceImpl.java
@@ -0,0 +1,39 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocNormal;
+import com.zy.asrs.entity.LocNormalLog;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WaitPakinLog;
+import com.zy.asrs.entity.param.ERPselectParam;
+import com.zy.asrs.mapper.LocNormalLogMapper;
+import com.zy.asrs.mapper.LocNormalMapper;
+import com.zy.asrs.mapper.OutStockMapper;
+import com.zy.asrs.service.LocNormalLogService;
+import com.zy.asrs.service.LocNormalService;
+import com.zy.asrs.service.WaitPakinLogService;
+import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.service.erp.ErpService;
+import com.zy.common.service.erp.ErpSqlServer;
+import com.zy.common.service.erp.entity.CPICMO;
+import com.zy.common.service.erp.entity.OutStockBillEntry;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Service("locNormalLogService")
+public class LocNormalLogServiceImpl extends ServiceImpl<LocNormalLogMapper, LocNormalLog> implements LocNormalLogService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 14e93b5..96febeb 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -1,18 +1,19 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocNoramlLog;
+import com.zy.asrs.entity.LocNormalLog;
import com.zy.asrs.entity.LocNormal;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WaitPakinLog;
import com.zy.asrs.entity.param.ERPselectParam;
import com.zy.asrs.mapper.LocNormalMapper;
import com.zy.asrs.mapper.OutStockMapper;
+import com.zy.asrs.service.LocNormalLogService;
import com.zy.asrs.service.LocNormalService;
import com.zy.asrs.service.WaitPakinLogService;
import com.zy.asrs.service.WaitPakinService;
@@ -46,6 +47,8 @@
WaitPakinLogService waitPakinLogService;
@Autowired
ErpService erpService;
+ @Autowired
+ LocNormalLogService locNormalLogService;
@Override
public List<LocNormal> getLocNormalData() {
@@ -60,11 +63,35 @@
@Override
public void outLocNormal(String matnr, Long modiUser, Date modiTime, Integer id) {
baseMapper.outLocNormal(matnr, modiUser, modiTime, id);
+ LocNormal data = locNormalService.selectOne(new EntityWrapper<LocNormal>().eq("id", id));
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, data);
+ locLog.setAnfme(data.getAnfme().doubleValue());
+ locLog.setIoType(2);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(modiUser);
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍑哄簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
}
@Override
public void removeLocNormal(String matnr, Long modiUser, Date modiTime, Integer id) {
baseMapper.removeLocNormal(matnr, modiUser, modiTime, id);
+ LocNormal data = locNormalService.selectOne(new EntityWrapper<LocNormal>().eq("id", id));
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, data);
+ locLog.setAnfme(data.getAnfme().doubleValue());
+ locLog.setIoType(4); // 鍒犻櫎
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(modiUser);
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨搴撳瓨鍒犻櫎璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
}
@Override
@@ -88,6 +115,17 @@
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
custWaitPakinToLog(list.get(i), updateAnfme);
}
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme(updateAnfme);
+ locLog.setIoType(1);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍏ュ簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
} else {
// erp鏇存柊
updateCPICMO(list.get(i));
@@ -96,6 +134,17 @@
if (baseMapper.pdaLocNormalIn(addList) > 0) {
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue());
+ }
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme(list.get(i).getAnfme().doubleValue());
+ locLog.setIoType(1);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍏ュ簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
}
}
} else {
@@ -112,13 +161,24 @@
ErpSql = MessageFormat.format(ErpSql, maxKey + 1, list.get(i).getAnfme(), list.get(i).getAnfme(), list.get(i).getAnfme(), list.get(i).getMatnr(), list.get(i).getAnfme(), list.get(i).getMnemonic());
erpSqlServer.update(ErpSql);
}
-// Double updateAnfme = new Double(list.get(i).getAnfme().doubleValue());
+ Double updateAnfme = new Double(list.get(i).getAnfme().doubleValue());
// 骞充粨鍏ュ簱锛堟洿鏂帮級閫昏緫
list.get(i).setAnfme(oldLocList.getAnfme().add(list.get(i).getAnfme()));
updateList.add(list.get(i));
if (baseMapper.withoutSupplierLocNormalUpdate(updateList) > 0) {
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
// custWaitPakinToLog(list.get(i), updateAnfme);
+ }
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme(updateAnfme);
+ locLog.setIoType(1);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍏ュ簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
}
} else {
// erp鏇存柊
@@ -135,6 +195,17 @@
if (baseMapper.pdaLocNormalIn(addList) > 0) {
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
// custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue());
+ }
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme(list.get(i).getAnfme().doubleValue());
+ locLog.setIoType(1);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍏ュ簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
}
}
}
@@ -248,12 +319,16 @@
custWaitPakinToLog(list.get(i), updateAnfme);
}
// 鐢熸垚骞充粨鍑哄叆搴撹褰�
- LocNoramlLog log = new LocNoramlLog();
- VersionUtils.setLocNormalLog(log, list.get(i));
- log.setAnfme(updateAnfme);
- log.setIoType(1);
- log.setCreateTime(new Date());
- log.setCreateUser(list.get(i).getAppeUser());
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme(updateAnfme);
+ locLog.setIoType(1);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍏ュ簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
} else {
// erp鏇存柊
@@ -265,13 +340,16 @@
custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue());
}
// 鐢熸垚骞充粨鍑哄叆搴撹褰�
- LocNoramlLog log = new LocNoramlLog();
- VersionUtils.setLocNormalLog(log, list.get(i));
- log.setAnfme(list.get(i).getAnfme().doubleValue());
- log.setIoType(1);
- log.setCreateTime(new Date());
- log.setCreateUser(list.get(i).getAppeUser());
-
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme(list.get(i).getAnfme().doubleValue());
+ locLog.setIoType(1);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍏ュ簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
}
} else {
throw new CoolException("閫氱煡鍗曞彿涓嶅彲涓虹┖");
@@ -366,10 +444,32 @@
for (Integer i = 0; i < list.size(); i++) {
if (list.get(i).getAnfme().equals(list.get(i).getAnfmeOut())) {
baseMapper.pdaLocNormalOut1(list.get(i).getId(), list.get(i).getMatnr(), list.get(i).getModiUser(), list.get(i).getModiTime(), list.get(i).getWarehouse());
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme(list.get(i).getAnfmeOut().doubleValue());
+ locLog.setIoType(2);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍑哄簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
}
if (list.get(i).getAnfmeOut().compareTo(list.get(i).getAnfme()) == -1) {
BigDecimal diff = (list.get(i).getAnfme()).subtract(list.get(i).getAnfmeOut());
baseMapper.pdaLocNormalOut2(list.get(i).getId(), list.get(i).getMatnr(), diff, list.get(i).getModiUser(), list.get(i).getModiTime(), list.get(i).getWarehouse());
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme((list.get(i).getAnfmeOut()).doubleValue());
+ locLog.setIoType(2);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鍑哄簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
}
}
}
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index ee52b90..c2a5ae5 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -6,8 +6,6 @@
import com.zy.common.service.erp.entity.M_item;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
-import java.util.List;
-
/**
* Created by vincent on 2020/7/14
*/
@@ -85,7 +83,8 @@
matCode.setStr2(item.getMtypename()); // 瑙勬牸鍨嬪彿
}
- public static void setLocNormalLog(LocNoramlLog log, LocNormal item) {
+ // 骞充粨鏃ュ織
+ public static void setLocNormalLog(LocNormalLog log, LocNormal item) {
log.setMatnr(item.getMatnr());
log.setMaktx(item.getMaktx());
log.setLgnum(item.getLgnum());
diff --git a/src/main/resources/mapper/LocNormalLogMapper.xml b/src/main/resources/mapper/LocNormalLogMapper.xml
new file mode 100644
index 0000000..5ffa7d2
--- /dev/null
+++ b/src/main/resources/mapper/LocNormalLogMapper.xml
@@ -0,0 +1,24 @@
+<?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.LocNormalLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocNormalLog">
+ <result column="matnr" property="matnr"/>
+ <result column="maktx" property="maktx"/>
+ <result column="lgnum" property="lgnum"/>
+ <result column="type" property="type"/>
+ <result column="mnemonic" property="mnemonic"/>
+ <result column="supplier" property="supplier"/>
+ <result column="warehouse" property="warehouse"/>
+ <result column="warehouseName" property="warehouseName"/>
+ <result column="anfme" property="anfme"/>
+ <result column="memo" property="memo"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="create_user" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="io_type" property="ioType"/>
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/locNormal/locNormal.js b/src/main/webapp/static/js/locNormal/locNormal.js
index b018ea7..9a18ffb 100644
--- a/src/main/webapp/static/js/locNormal/locNormal.js
+++ b/src/main/webapp/static/js/locNormal/locNormal.js
@@ -237,7 +237,7 @@
data: top.reObject(param),
method: 'POST',
success: function (res) {
- layer.msg("")
+ layer.msg("淇敼鎴愬姛");
},
});
}, function () {
diff --git a/src/main/webapp/static/js/locNormal/normalReport.js b/src/main/webapp/static/js/locNormal/normalReport.js
index 480a261..fd92248 100644
--- a/src/main/webapp/static/js/locNormal/normalReport.js
+++ b/src/main/webapp/static/js/locNormal/normalReport.js
@@ -5,7 +5,8 @@
function getCol() {
var cols = [];
cols.push(
- {field: 'appeTime$', align: 'center', title: '鍑哄叆搴撴椂闂�', width: 180}
+ {field: 'createTime$', align: 'center', title: '鍑哄叆搴撴椂闂�', width: 180}
+ , {field: 'updateTime$', align: 'center', title: '淇敼鏃堕棿', width: 180, hide: true}
, {field: 'warehouse', align: 'center', title: '搴撳尯', width: 100}
, {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜', width: 140}
, {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О', width: 400}
@@ -14,8 +15,8 @@
, {field: 'type', align: 'center', title: '鐗╂枡绫诲埆', width: 120}
, {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿', width: 140}
, {field: 'supplier', align: 'center', title: '閫氱煡鍗曞彿', width: 140}
- , {field: 'altme', align: 'center', title: '鍗曚綅', hide: true}
, {field: 'memo', align: 'center', title: '澶囨敞'}
+
)
return cols;
}
@@ -70,7 +71,7 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl + '/locNomal/getInListByDay',
where: {
- state: '1',
+ io_type: '1',
},
page: true,
limit: 16,
@@ -118,7 +119,7 @@
form.on('submit(reset)', function (data) {
pageCurr = 1;
clearFormVal($('#search-box'));
- $("#state").val("1");
+ $("#io_type").val("1");
form.render();
tableReload(false);
});
diff --git a/src/main/webapp/views/locNormal/normalReport.html b/src/main/webapp/views/locNormal/normalReport.html
index b2279e0..241bb6e 100644
--- a/src/main/webapp/views/locNormal/normalReport.html
+++ b/src/main/webapp/views/locNormal/normalReport.html
@@ -112,9 +112,11 @@
</div>
<div class="layui-inline" style="width: 150px; margin-top: 4px">
- <select id="state" name="state">
+ <select id="io_type" name="io_type">
<option value="1">鍏ュ簱</option>
<option value="2">鍑哄簱</option>
+ <option value="3">淇敼</option>
+ <option value="4">鍒犻櫎</option>
</select>
</div>
diff --git a/version/v1.0.1/tableChange b/version/v1.0.1/tableChange
index db70369..aec8fec 100644
--- a/version/v1.0.1/tableChange
+++ b/version/v1.0.1/tableChange
@@ -33,7 +33,7 @@
SET ANSI_PADDING OFF
GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鍑哄叆搴撶被鍨�(1鍏ュ簱,2鍑哄簱, 3鍒犻櫎)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_loc_normal_log', @level2type=N'COLUMN',@level2name=N'io_type'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鍑哄叆搴撶被鍨�(1鍏ュ簱,2鍑哄簱,3淇敼,4鍒犻櫎)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_loc_normal_log', @level2type=N'COLUMN',@level2name=N'io_type'
GO
--
Gitblit v1.9.1