From 15b67b954b9622dacb1cc9bf7d95bd066d108fe1 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 27 十二月 2021 19:25:48 +0800
Subject: [PATCH] #单据类型区分入库单和出库单
---
version/db/wms_saas20211222.bak | 0
src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java | 5 +++++
/dev/null | 0
src/main/java/zy/cloud/wms/manager/entity/DocType.java | 28 +++++++++++++++++++++++++++-
src/main/resources/mapper/DocTypeMapper.xml | 1 +
src/main/webapp/static/js/order/order.js | 5 ++++-
6 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java b/src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java
index 9f1bc71..f84a846 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java
@@ -39,6 +39,11 @@
@RequestParam Map<String, Object> param){
EntityWrapper<DocType> wrapper = new EntityWrapper<>();
excludeTrash(param);
+ if(param.containsKey("doc_class")){
+ Integer docClass = Integer.parseInt(param.get("doc_class").toString());
+ wrapper.eq("doc_class",param.get("doc_class"));
+ param.remove("doc_class");
+ }
convert(param, wrapper);
hostEq(wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/DocType.java b/src/main/java/zy/cloud/wms/manager/entity/DocType.java
index 22aeb34..e99b5b8 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/DocType.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/DocType.java
@@ -44,6 +44,13 @@
private String docName;
/**
+ * 鍗曟嵁绫诲埆 1: 鍏ュ簱鍗� 2: 鍑哄簱鍗�
+ */
+ @ApiModelProperty(value= "鍗曟嵁绫诲埆 1: 鍏ュ簱鍗� 2: 鍑哄簱鍗� ")
+ @TableField("doc_class")
+ private Integer docClass;
+
+ /**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
@@ -85,10 +92,11 @@
public DocType() {}
- public DocType(Long hostId, Long docId,String docName,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public DocType(Long hostId, Long docId,String docName,Integer docClass, Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.hostId = hostId;
this.docId = docId;
this.docName = docName;
+ this.docClass = docClass;
this.status = status;
this.createBy = createBy;
this.createTime = createTime;
@@ -142,6 +150,24 @@
this.docName = docName;
}
+ public Integer getDocClass() {
+ return docClass;
+ }
+ public String getDocClass$(){
+ if (null == this.docClass){ return null; }
+ switch (this.docClass){
+ case 1:
+ return "鍏ュ簱鍗�";
+ case 2:
+ return "鍑哄簱鍗�";
+ default:
+ return String.valueOf(this.docClass);
+ }
+ }
+ public void setDocClass(Integer docClass) {
+ this.docClass = docClass;
+ }
+
public Integer getStatus() {
return status;
}
diff --git a/src/main/resources/mapper/DocTypeMapper.xml b/src/main/resources/mapper/DocTypeMapper.xml
index d8fbc90..d77788a 100644
--- a/src/main/resources/mapper/DocTypeMapper.xml
+++ b/src/main/resources/mapper/DocTypeMapper.xml
@@ -7,6 +7,7 @@
<id column="doc_id" property="docId" />
<result column="host_id" property="hostId" />
<result column="doc_name" property="docName" />
+ <result column="doc_class" property="docClass" />
<result column="status" property="status" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f32d029..4868948 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -23,6 +23,9 @@
pageName: 'curr',
pageSize: 'limit'
},
+ where: {
+ doc_class: 2,//鍑哄簱鍗�
+ },
parseData: function (res) {
return {
'code': res.code,
@@ -51,7 +54,7 @@
/* 琛ㄦ牸鎼滅储 */
form.on('submit(docTypeTableSearch)', function (data) {
- insTb.reload({where: {doc_name: data.field.docName}});
+ insTb.reload({where: {doc_name: data.field.docName,doc_class:2}});
return false;
});
diff --git a/version/db/wms_saas20211222.bak b/version/db/wms_saas20211222.bak
new file mode 100644
index 0000000..477d9fe
--- /dev/null
+++ b/version/db/wms_saas20211222.bak
Binary files differ
diff --git a/version/v1.0.0/htwms.sql b/version/v1.0.0/htwms.sql
deleted file mode 100644
index 6126ef1..0000000
--- a/version/v1.0.0/htwms.sql
+++ /dev/null
Binary files differ
diff --git a/version/v1.0.1/pakin.sql b/version/v1.0.1/pakin.sql
deleted file mode 100644
index 6005bb4..0000000
--- a/version/v1.0.1/pakin.sql
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1