From db4391557295bd8fd9fff3d1e95fa0d69f780e38 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:58:13 +0800
Subject: [PATCH] 优化出入库信息2
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 63 +++++++++++++++----------------
1 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
index a2c0721..a73f04b 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
@@ -1,5 +1,6 @@
package com.ld.igds.inout.view;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -14,11 +15,15 @@
import com.ld.igds.inout.manager.InoutManager;
import com.ld.igds.inout.manager.InoutReportManager;
import com.ld.igds.inout.service.InoutService;
+import com.ld.igds.models.DicTrigger;
import com.ld.igds.util.ContextUtil;
+
import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
/**
* 鍑哄叆搴撹鍗曢〉闈㈢鐞�
@@ -31,12 +36,23 @@
@Component
public class InoutDataPR {
- @Autowired
+ @Resource
private InoutService inoutService;
- @Autowired
+ @Resource
private InoutReportManager inoutReportManager;
- @Autowired
+ @Resource
private InoutManager inoutManager;
+
+
+
+ // ${dorado.getDataProvider("inoutDataPR#triggerRecordStatus1").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerRecordStatus1() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutConstant.RECORD_STATUS_DEL, "浣滃簾鍗�"));
+ list.add(new DicTrigger(InoutConstant.RECORD_STATUS_NORMAL, "姝ｅ父鍗�"));
+ return list;
+ }
/**
* inoutDataPR#pageInoutData
@@ -46,8 +62,7 @@
* @throws Exception
*/
@DataProvider
- public void pageInoutData(Page<InoutData> page, InoutParam param)
- throws Exception {
+ public void pageInoutData(Page<InoutData> page, InoutParam param) throws Exception {
// 璋冪敤鏍稿績鍖呬腑鏂规硶锛岄渶瑕佸仛瀵硅薄杞崲
param.setPage(page.getPageNo());
param.setLimit(page.getPageSize());
@@ -65,19 +80,16 @@
*/
@DataResolver
public String saveInoutData(InoutData data) throws Exception {
- if (StringUtils.isEmpty(data.getId())) {
- return inoutManager.addInoutData(data);
- } else {
- return inoutManager.updateInoutData(data);
- }
- }
- /**
- * 鍒犻櫎鏁版嵁 inoutDataPR#delInoutData
- */
- @DataResolver
- public String delInoutData(InoutData data) throws Exception {
- return inoutManager.delInoutData(data, false);
+ //灏咲oradoEntity 杞崲涓烘櫘閫欵ntity
+ InoutData newData = new InoutData();
+ BeanUtils.copyProperties(data,newData);
+
+ if (StringUtils.isEmpty(newData.getId())) {
+ return inoutManager.addInoutData(newData);
+ } else {
+ return inoutManager.updateInoutData(newData);
+ }
}
/**
@@ -88,6 +100,7 @@
* @throws Exception
*/
@DataResolver
+ @Transactional
public String errorInoutData(InoutData data) throws Exception {
return inoutManager.errorInoutData(data);
}
@@ -119,9 +132,6 @@
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return "鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�";
}
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return "寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�";
- }
if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
return "鏈畬鎴愮殑鏁版嵁涓嶆敮鎸佹墦鍗帮紒";
}
@@ -145,9 +155,6 @@
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return null;
}
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return null;
- }
if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
return null;
}
@@ -167,9 +174,6 @@
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return "鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�";
}
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return "寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�";
- }
return inoutReportManager.inCheckBill(data);
}
@@ -181,7 +185,6 @@
@Expose
public InoutData initAddData(String type) {
IUser user = ContextUtil.getLoginUser();
-
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
@@ -203,15 +206,11 @@
*/
@DataProvider
public InoutData initDataByHand(String type) {
-
IUser user = ContextUtil.getLoginUser();
-
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
- data.setCompleteTime(new Date());
data.setType(type);
- data.setIntelCard("0000");
data.setRegisterUser(user.getCname());
data.setDeptId(ContextUtil.subDeptId(user));
data.setCheckUser(user.getCname());
--
Gitblit v1.9.3