From a02fd7927b6e1406d05762dfcac74b06245cc839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com>
Date: Tue, 7 Sep 2021 14:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=BA=9F=E6=89=BE?=
=?UTF-8?q?=E4=B8=8D=E5=88=B0=E8=B4=A3=E4=BB=BB=E4=BA=BA/=E5=8D=95?=
=?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/SfcScrapController.java | 22 +-------
.../main/resources/mapper/SfcScrapMapper.xml | 55 +++++++++++++------
2 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java b/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java
index 4158f1a5..3442dcec 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/controller/SfcScrapController.java
@@ -17,8 +17,8 @@ import java.util.List;
/**
*
- * @author zjw
- * @since 2021-07-30
+ * @author Leon.L
+ * @since 2021-09-07
*/
@RestController
@RequestMapping("/Z-SFC-SCRAP")
@@ -30,8 +30,6 @@ public class SfcScrapController {
@Autowired
private AnomalyService anomalyService;
-
-
/**
* 根据id查询
*
@@ -83,6 +81,7 @@ public class SfcScrapController {
.or().like(SfcScrap::getReason, frontPage.getGlobalQuery())
.or().like(SfcScrap::getCreatedUser, frontPage.getGlobalQuery())
.or().like(SfcScrap::getModifiedUser, frontPage.getGlobalQuery())
+ .or().like(SfcScrap::getDutyUser, frontPage.getGlobalQuery())
);
}
result = sfcScrapService.page(frontPage.getPagePlus(), queryWrapper);
@@ -168,19 +167,4 @@ public class SfcScrapController {
sfcScrapService.generatorWord(shopOrder,sfc,response,request);
return R.ok();
}
-
-
-// @PostMapping("/import")
-// public String importFile(@PathParam("shopOrder") String shopOrder,@PathParam("sfc")String sfc, @RequestParam("file") MultipartFile multipartFile) {
-//
-// //-----------------------------------------------------------------------------------------------------------------------------------------
-// try {
-// String transInfo = masterDataImportService.importFile(multipartFile, importRequest);
-// return new APResult().getResult(0, transInfo, transInfo);
-// } catch (Exception e) {
-// e.printStackTrace();
-// return new APResult().getResult(9999, e.getMessage(), e.getMessage());
-// }
-// }
-
}
\ No newline at end of file
diff --git a/production/src/main/resources/mapper/SfcScrapMapper.xml b/production/src/main/resources/mapper/SfcScrapMapper.xml
index 2fe19166..e9f85cf5 100644
--- a/production/src/main/resources/mapper/SfcScrapMapper.xml
+++ b/production/src/main/resources/mapper/SfcScrapMapper.xml
@@ -16,11 +16,12 @@
+
- HANDLE, SITE, SFC, OPERATION, STEP_ID, QTY, TYPE, REASON, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME
+ HANDLE, SITE, SFC, OPERATION, STEP_ID, QTY, TYPE, REASON, CREATED_USER, CREATED_DATE_TIME, MODIFIED_USER, MODIFIED_DATE_TIME, DUTY_USER
@@ -66,6 +67,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
@@ -88,6 +90,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
${ew.sqlSegment}
@@ -118,6 +121,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
${ew.sqlSegment}
@@ -148,6 +152,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
${ew.sqlSegment}
@@ -178,6 +183,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
${ew.sqlSegment}
@@ -208,6 +214,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
${ew.sqlSegment}
@@ -238,6 +245,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
${ew.sqlSegment}
@@ -264,6 +272,7 @@
CREATED_DATE_TIME,
MODIFIED_USER,
MODIFIED_DATE_TIME,
+ DUTY_USER,
VALUES
#{handle},
@@ -278,6 +287,7 @@
#{createdDateTime},
#{modifiedUser},
#{modifiedDateTime},
+ #{dutyUser},
@@ -299,6 +309,7 @@
#{createdDateTime},
#{modifiedUser},
#{modifiedDateTime},
+ #{dutyUser},
@@ -316,6 +327,7 @@
CREATED_DATE_TIME=#{et.createdDateTime},
MODIFIED_USER=#{et.modifiedUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ DUTY_USER=#{et.dutyUser},
WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}
@@ -333,6 +345,7 @@
CREATED_DATE_TIME=#{et.createdDateTime},
MODIFIED_USER=#{et.modifiedUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ DUTY_USER=#{et.dutyUser},
WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}
@@ -350,6 +363,7 @@
CREATED_DATE_TIME=#{et.createdDateTime},
MODIFIED_USER=#{et.modifiedUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
+ DUTY_USER=#{et.dutyUser},
@@ -366,6 +380,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
${ew.sqlSegment}
@@ -413,6 +428,7 @@
AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}
AND MODIFIED_USER=#{ew.entity.modifiedUser}
AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}
+ AND DUTY_USER=#{ew.entity.dutyUser}
${ew.sqlSegment}
@@ -430,28 +446,31 @@
)
+
+
+