From 7077d2aca171525b6f021cd3307788ac7c55dd14 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 21 六月 2021 17:19:27 +0800
Subject: [PATCH] 平仓日志功能(未完成)
---
src/main/java/com/zy/asrs/entity/LocNoramlLog.java | 68 ++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 18 ++++++
src/main/java/com/zy/asrs/utils/VersionUtils.java | 13 ++++
version/v1.0.1/tableChange | 39 +++++++++++++
4 files changed, 138 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocNoramlLog.java b/src/main/java/com/zy/asrs/entity/LocNoramlLog.java
new file mode 100644
index 0000000..82a6ae9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/LocNoramlLog.java
@@ -0,0 +1,68 @@
+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/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 2d4a9dd..14e93b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -6,6 +6,7 @@
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.LocNormal;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WaitPakinLog;
@@ -15,6 +16,7 @@
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;
@@ -245,6 +247,14 @@
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
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());
+
} else {
// erp鏇存柊
updateCPICMO(list.get(i));
@@ -254,6 +264,14 @@
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
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());
+
}
} else {
throw new CoolException("閫氱煡鍗曞彿涓嶅彲涓虹┖");
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index dadccf3..ee52b90 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -6,6 +6,8 @@
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
*/
@@ -83,6 +85,17 @@
matCode.setStr2(item.getMtypename()); // 瑙勬牸鍨嬪彿
}
+ public static void setLocNormalLog(LocNoramlLog log, LocNormal item) {
+ log.setMatnr(item.getMatnr());
+ log.setMaktx(item.getMaktx());
+ log.setLgnum(item.getLgnum());
+ log.setType(item.getType());
+ log.setMnemonic(item.getMnemonic());
+ log.setSupplier(item.getSupplier());
+ log.setWarehouse(item.getWarehouse());
+ log.setMemo(item.getMemo());
+ }
+
// excel ----------------------------------------------------------------------
public static MatCodeExcel getExcel(MatCode matCode) {
diff --git a/version/v1.0.1/tableChange b/version/v1.0.1/tableChange
new file mode 100644
index 0000000..db70369
--- /dev/null
+++ b/version/v1.0.1/tableChange
@@ -0,0 +1,39 @@
+USE [xtyasrs]
+GO
+
+/****** Object: Table [dbo].[asr_loc_normal_log] Script Date: 2021/6/21 16:27:31 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+SET ANSI_PADDING ON
+GO
+
+CREATE TABLE [dbo].[asr_loc_normal_log](
+ [create_time] [datetime] NULL,
+ [update_time] [datetime] NULL,
+ [create_user] [bigint] NULL,
+ [update_user] [bigint] NULL,
+ [warehouse] [varchar](255) NULL,
+ [matnr] [varchar](50) NULL,
+ [maktx] [varchar](max) NULL,
+ [anfme] [decimal](24, 9) NULL,
+ [lgnum] [varchar](255) NULL,
+ [type] [varchar](50) NULL,
+ [mnemonic] [varchar](255) NULL,
+ [supplier] [varchar](255) NULL,
+ [memo] [varchar](600) NULL,
+ [io_type] [int] NULL
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+GO
+
+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'
+GO
+
+
--
Gitblit v1.9.1