From 5ee50ab49acbafef81759528eb12f05c76725339 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 08 八月 2021 15:30:05 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/DocLogMapper.xml | 19 +++
src/main/java/com/zy/asrs/entity/DocLog.java | 193 ++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/common/service/ErpService.java | 24 ++++
src/main/java/com/zy/asrs/service/impl/DocLogServiceImpl.java | 12 ++
src/main/java/com/zy/asrs/service/DocLogService.java | 8 +
src/main/java/com/zy/asrs/mapper/DocLogMapper.java | 12 ++
6 files changed, 268 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/DocLog.java b/src/main/java/com/zy/asrs/entity/DocLog.java
new file mode 100644
index 0000000..88c959a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/DocLog.java
@@ -0,0 +1,193 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("erp_doc_log")
+public class DocLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("doc_num")
+ private String docNum;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @TableField("doc_id")
+ private Long docId;
+
+ /**
+ * 鍗曟嵁鍚嶇О
+ */
+ @ApiModelProperty(value= "鍗曟嵁鍚嶇О")
+ @TableField("doc_name")
+ private String docName;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 涓婃姤鏁伴噺
+ */
+ @ApiModelProperty(value= "涓婃姤鏁伴噺")
+ private Double qua;
+
+ /**
+ * 缁撴灉 1: 鎴愬姛 0: 澶辫触
+ */
+ @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
+ private Integer success;
+
+ /**
+ * 涓婃姤鏃堕棿
+ */
+ @ApiModelProperty(value= "涓婃姤鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public DocLog() {}
+
+ public DocLog(String docNum, Long docId, String docName, String matnr, Double qua, Integer success, Date sendTime, String memo) {
+ this.docNum = docNum;
+ this.docId = docId;
+ this.docName = docName;
+ this.matnr = matnr;
+ this.qua = qua;
+ this.success = success;
+ this.sendTime = sendTime;
+ this.memo = memo;
+ }
+
+// DocLog docLog = new DocLog(
+// null, // 鍗曟嵁缂栧彿
+// null, // 鍗曟嵁绫诲瀷
+// null, // 鍗曟嵁鍚嶇О
+// null, // 鍟嗗搧缂栧彿
+// null, // 涓婃姤鏁伴噺
+// null, // 缁撴灉
+// null, // 涓婃姤鏃堕棿
+// null // 澶囨敞
+// );
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDocNum() {
+ return docNum;
+ }
+
+ public void setDocNum(String docNum) {
+ this.docNum = docNum;
+ }
+
+ public Long getDocId() {
+ return docId;
+ }
+
+ public void setDocId(Long docId) {
+ this.docId = docId;
+ }
+
+ public String getDocName() {
+ return docName;
+ }
+
+ public void setDocName(String docName) {
+ this.docName = docName;
+ }
+
+ public String getMatnr() {
+ return matnr;
+ }
+
+ public void setMatnr(String matnr) {
+ this.matnr = matnr;
+ }
+
+ public Double getQua() {
+ return qua;
+ }
+
+ public void setQua(Double qua) {
+ this.qua = qua;
+ }
+
+ public Integer getSuccess() {
+ return success;
+ }
+
+ public String getSuccess$(){
+ if (null == this.success){ return null; }
+ switch (this.success){
+ case 1:
+ return "鎴愬姛";
+ case 0:
+ return "澶辫触";
+ default:
+ return String.valueOf(this.success);
+ }
+ }
+
+ public void setSuccess(Integer success) {
+ this.success = success;
+ }
+
+ public Date getSendTime() {
+ return sendTime;
+ }
+
+ public String getSendTime$(){
+ if (Cools.isEmpty(this.sendTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public void setSendTime(Date sendTime) {
+ this.sendTime = sendTime;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/DocLogMapper.java b/src/main/java/com/zy/asrs/mapper/DocLogMapper.java
new file mode 100644
index 0000000..38dd718
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/DocLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DocLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DocLogMapper extends BaseMapper<DocLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/DocLogService.java b/src/main/java/com/zy/asrs/service/DocLogService.java
new file mode 100644
index 0000000..602187a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/DocLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.DocLog;
+
+public interface DocLogService extends IService<DocLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/DocLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DocLogServiceImpl.java
new file mode 100644
index 0000000..9b2be3f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/DocLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.DocLog;
+import com.zy.asrs.mapper.DocLogMapper;
+import com.zy.asrs.service.DocLogService;
+import org.springframework.stereotype.Service;
+
+@Service("docLogService")
+public class DocLogServiceImpl extends ServiceImpl<DocLogMapper, DocLog> implements DocLogService {
+
+}
diff --git a/src/main/java/com/zy/common/service/ErpService.java b/src/main/java/com/zy/common/service/ErpService.java
index e9e63e1..08f0a1b 100644
--- a/src/main/java/com/zy/common/service/ErpService.java
+++ b/src/main/java/com/zy/common/service/ErpService.java
@@ -3,8 +3,10 @@
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;
@@ -36,15 +38,21 @@
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);
@@ -68,6 +76,19 @@
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()
@@ -77,6 +98,9 @@
.build()
.doPost();
try {
+
+ docLogService.insertBatch(docLogs);
+
// 鏃ュ織璁板綍
RequestLog logInfo = new RequestLog();
logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + docId);
diff --git a/src/main/resources/mapper/DocLogMapper.xml b/src/main/resources/mapper/DocLogMapper.xml
new file mode 100644
index 0000000..61a4865
--- /dev/null
+++ b/src/main/resources/mapper/DocLogMapper.xml
@@ -0,0 +1,19 @@
+<?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="zy.cloud.wms.manager.mapper.DocLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DocLog">
+ <id column="id" property="id" />
+ <result column="doc_num" property="docNum" />
+ <result column="doc_id" property="docId" />
+ <result column="doc_name" property="docName" />
+ <result column="matnr" property="matnr" />
+ <result column="qua" property="qua" />
+ <result column="success" property="success" />
+ <result column="send_time" property="sendTime" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.1