From 8d32ee30615197f446b30c9cda73d6a90fab87e8 Mon Sep 17 00:00:00 2001
From: weihongyang <1075331873@qq.com>
Date: Tue, 18 Aug 2020 10:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/encodings.xml | 1 +
.idea/workspace.xml | 42 ++++++++-----------
wms-parent.iml | 4 +-
.../dao/MtAloneByOrderInfoMapper.java | 5 +++
.../dao/MtAloneByProductInfoMapper.java | 5 +++
.../dao/MtAloneByWeavClothMapper.java | 5 +++
.../mapper/MtAloneByOrderInfoMapper.xml | 4 ++
.../mapper/MtAloneByProductInfoMapper.xml | 5 +++
.../mapper/MtAloneByWeavClothMapper.xml | 5 +++
.../web/MtAloneByOrderInfoController.java | 2 +-
.../web/MtAloneByProductInfoController.java | 2 +-
.../web/MtAloneByWeavClothController.java | 2 +-
.../src/test/java/BillCodeGenerator.java | 2 +-
13 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index db78f10..bce623d 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -4,5 +4,6 @@
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index be5c7d6..ad5265b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,29 +3,22 @@
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -302,9 +295,9 @@
@@ -556,9 +549,10 @@
-
-
+
+
+
diff --git a/wms-parent.iml b/wms-parent.iml
index ba87e1a..717ec9a 100644
--- a/wms-parent.iml
+++ b/wms-parent.iml
@@ -95,7 +95,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java
index cb7826d..0a755f4 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java
@@ -1,6 +1,11 @@
package com.deer.wms.produce.clothflow.dao;
import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfo;
+import com.deer.wms.produce.clothflow.model.MtAloneByOrderInfoParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
public interface MtAloneByOrderInfoMapper extends Mapper {
+ List findList(MtAloneByOrderInfoParams params);
}
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java
index 01d9c27..6d74b4b 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java
@@ -1,6 +1,11 @@
package com.deer.wms.produce.clothflow.dao;
import com.deer.wms.produce.clothflow.model.MtAloneByProductInfo;
+import com.deer.wms.produce.clothflow.model.MtAloneByProductInfoParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
public interface MtAloneByProductInfoMapper extends Mapper {
+ List findList(MtAloneByProductInfoParams params);
}
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java
index b1ca346..c537097 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java
@@ -1,6 +1,11 @@
package com.deer.wms.produce.clothflow.dao;
import com.deer.wms.produce.clothflow.model.MtAloneByWeavCloth;
+import com.deer.wms.produce.clothflow.model.MtAloneByWeavClothParams;
+import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
public interface MtAloneByWeavClothMapper extends Mapper {
+ List findList(MtAloneByWeavClothParams params);
}
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByOrderInfoMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByOrderInfoMapper.xml
index 0dfed04..fa187b4 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByOrderInfoMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByOrderInfoMapper.xml
@@ -28,4 +28,8 @@
+
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml
index a05b2d8..8ebf70f 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml
@@ -34,4 +34,9 @@
+
+
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByWeavClothMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByWeavClothMapper.xml
index c851096..b0285ba 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByWeavClothMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByWeavClothMapper.xml
@@ -28,4 +28,9 @@
+
+
\ No newline at end of file
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java
index 019b00c..44372e9 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java
@@ -53,7 +53,7 @@ public class MtAloneByOrderInfoController {
@ApiOperation(value = "删除xxx", notes = "删除xxx")
@DeleteMapping("/delete/{id}")
public Result delete(@PathVariable Integer Id) {
- mtAloneByOrderInfoService.deleteById(mtAloneByOrderInfoId);
+ mtAloneByOrderInfoService.deleteById(Id);
return ResultGenerator.genSuccessResult();
}
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java
index 139b42e..334a876 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java
@@ -53,7 +53,7 @@ public class MtAloneByProductInfoController {
@ApiOperation(value = "删除xxx", notes = "删除xxx")
@DeleteMapping("/delete/{id}")
public Result delete(@PathVariable Integer Id) {
- mtAloneByProductInfoService.deleteById(mtAloneByProductInfoId);
+ mtAloneByProductInfoService.deleteById(Id);
return ResultGenerator.genSuccessResult();
}
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java
index 9bbb986..0b80032 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java
@@ -53,7 +53,7 @@ public class MtAloneByWeavClothController {
@ApiOperation(value = "删除xxx", notes = "删除xxx")
@DeleteMapping("/delete/{id}")
public Result delete(@PathVariable Integer Id) {
- mtAloneByWeavClothService.deleteById(mtAloneByWeavClothId);
+ mtAloneByWeavClothService.deleteById(Id);
return ResultGenerator.genSuccessResult();
}
diff --git a/wms-produce-manage/src/test/java/BillCodeGenerator.java b/wms-produce-manage/src/test/java/BillCodeGenerator.java
index e37f60c..99414fc 100644
--- a/wms-produce-manage/src/test/java/BillCodeGenerator.java
+++ b/wms-produce-manage/src/test/java/BillCodeGenerator.java
@@ -22,7 +22,7 @@ public class BillCodeGenerator {
configurer.setModuleName("/wms-ware-task");
//设置需要生成的表
- configurer.getTables().add(new Table("mt_alone_product_batch_detect",null,"id","Integer"));
+ configurer.getTables().add(new Table("mt_alone_product_batch_detect",null,"id","Integer"));
//生成代码
Generator.genCode(configurer);