From 2495e9ab75e6c45af1d6e14414711d8cc79fe2ca Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 30 五月 2023 16:13:13 +0800
Subject: [PATCH] 出入库优化-登记2
---
igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java | 3
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 132 +-
igds-web/src/main/resources/static/admin/inout/in-register20220529.js | 359 +++++++
igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java | 13
igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java | 3
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java | 22
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 1770 +++++++++++++++++++------------------
igds-inout/src/main/java/com/ld/igds/m/service/HInoutConfService.java | 48
igds-web/src/main/resources/templates/admin/inout/in-register.html | 2
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 82 -
igds-web/src/main/resources/static/admin/inout/inout-common.js | 44
igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java | 22
igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutRecordMapper.java | 30
igds-core/src/main/java/com/ld/igds/models/InoutSysConf.java | 14
igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConfPR.java | 32
igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java | 10
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 38
igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConf.view.xml | 44
igds-web/src/main/resources/static/admin/inout/in-register.js | 91 -
19 files changed, 1,568 insertions(+), 1,191 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java b/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
index 939311a..cb4a302 100644
--- a/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/file/impl/CoreFileServiceImpl.java
@@ -77,8 +77,7 @@
public void saveInoutFiles(List<FileData> files, String companyId,
String bizId, String bizTag) throws Exception, SQLException {
- if (files.size() == 0)
- return;
+ if (null == files || files.size() == 0) return;
for (FileData data : files) {
// 濡傛灉娌℃湁闄勪欢鍚嶇О锛屽垯涓嶄繚瀛橀檮浠朵俊鎭�
diff --git a/igds-core/src/main/java/com/ld/igds/models/InoutSysConf.java b/igds-core/src/main/java/com/ld/igds/models/InoutSysConf.java
index 8948fb1..f699791 100644
--- a/igds-core/src/main/java/com/ld/igds/models/InoutSysConf.java
+++ b/igds-core/src/main/java/com/ld/igds/models/InoutSysConf.java
@@ -44,13 +44,13 @@
@PropertyDef(label = "鍑哄簱娴佺▼閰嶇疆", description = "浣跨敤-绾块殧寮�鐨勬祦绋嬮厤缃�")
private String progressOut;
- @Column(name = "NOTICE_TAG_IN_", length = 1)
- @PropertyDef(label = "鍏ュ簱閫氱煡鍗曟爣璁�")
- private String noticeTagIn = Constant.YN_Y;
-
- @Column(name = "NOTICE_TAG_OUT_", length = 1)
- @PropertyDef(label = "鍑哄簱閫氱煡鍗曟爣璁�")
- private String noticeTagOut = Constant.YN_Y;
+// @Column(name = "NOTICE_TAG_IN_", length = 1)
+// @PropertyDef(label = "鍏ュ簱閫氱煡鍗曟爣璁�")
+// private String noticeTagIn = Constant.YN_Y;
+//
+// @Column(name = "NOTICE_TAG_OUT_", length = 1)
+// @PropertyDef(label = "鍑哄簱閫氱煡鍗曟爣璁�")
+// private String noticeTagOut = Constant.YN_Y;
@Column(name = "NOTICE_WX_", length = 1)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java
index 7dccbeb..3dac3a1 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java
@@ -3,9 +3,7 @@
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.data.PageResponse;
import com.ld.igds.inout.manager.CheckManager;
-import com.ld.igds.io.dto.CheckResultParam;
import com.ld.igds.io.sample.data.SampleDto;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,7 +19,6 @@
* @data:2020骞�3鏈�22鏃�
*
*/
-@Slf4j
@RestController
@RequestMapping("api/check")
public class CheckController {
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
index 47c8dc7..f63d726 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
@@ -36,15 +36,13 @@
@ResponseBody
@RequestMapping("/get-plateNum")
public PageResponse<ApiInoutData> getPlateNum(@RequestBody ApiInoutData param) {
-
- if (StringUtils.isEmpty(param.getProtocol())) {
- param.setErrorMsg("褰撳墠杞︾墝璇嗗埆鏈厤缃�氳鍗忚锛屾棤娉曟墽琛�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+
+ if (null == param.getIp()) {
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆濡傚叆鐧昏鐨勮溅鐗岃瘑鍒�");
}
- if (null == param.getIp()) {
- param.setErrorMsg("鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆濡傚叆鐧昏鐨勮溅鐗岃瘑鍒�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+ if (StringUtils.isEmpty(param.getProtocol())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "褰撳墠杞︾墝璇嗗埆鏈厤缃�氳鍗忚锛屾棤娉曟墽琛�");
}
param = inoutDeviceManager.getPlateNum(param);
@@ -57,9 +55,9 @@
}
/**
- * 鑾峰彇杞︾墝璇嗗埆淇℃伅
+ * 鑾峰彇鏅烘収鍗′俊鎭�
*
- * @param param 杞︾墝璇嗗埆鏁版嵁淇℃伅
+ * @param param 鑾峰彇鏅烘収鍗′俊鎭�
* @return
*/
@ResponseBody
@@ -67,13 +65,11 @@
public PageResponse<ApiInoutData> getIcCardNum(@RequestBody ApiInoutData param) {
if (StringUtils.isEmpty(param.getProtocol())) {
- param.setErrorMsg("褰撳墠鏅烘収鍗℃湭閰嶇疆閫氳鍗忚锛屾棤娉曟墽琛�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "褰撳墠鏅烘収鍗℃湭閰嶇疆閫氳鍗忚锛屾棤娉曟墽琛�");
}
if (null == param.getIp()) {
- param.setErrorMsg("鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆鏅烘収鍗′俊鎭�");
- return new PageResponse<>(RespCodeEnum.CODE_1007, param);
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆鏅烘収鍗′俊鎭�");
}
param = inoutDeviceManager.getIcCardNum(param);
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index 8a56e13..06ab024 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -227,13 +227,13 @@
InoutConstant.PROGRESS_WEIGHT_TAG, 3);
view.addObject("snapDto3", conf);
- conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_70,
+ conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_70,
InoutConstant.PROGRESS_WEIGHT_TAG, 1);
view.addObject("gateDto", conf);
// 鏅烘収鍗�
conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_80, InoutConstant.PROGRESS_WEIGHT_TAG, 1);
- if(null != conf) conf.setSort(sort);
+ if (null != conf) conf.setSort(sort);
view.addObject("cardDto", conf);
@@ -556,6 +556,14 @@
@Transactional
public PageResponse<InoutData> inoutNextStep(@RequestBody InoutData data) {
try {
+ IUser user = ContextUtil.getLoginUser();
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(user.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(user));
+ }
+
if (InoutConstant.TYPE_IN.equals(data.getType())) {
return inoutManager.inNextStep(data);
} else {
@@ -570,6 +578,31 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鍚庡彴寮傚父锛�" + e.getMessage());
}
+ }
+
+ /**
+ * 鍑哄叆搴撴暟鎹繚瀛橈紝鐧昏鎻愪氦
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-register")
+ @Transactional
+ public PageResponse<InoutData> submitRegister(@RequestBody InoutData data) throws Exception {
+ IUser user = ContextUtil.getLoginUser();
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(user.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(user));
+ }
+
+ //濡傛灉娉ㄥ唽鏃跺�欐病鏈変娇鐢ㄦ櫤鎱у崱锛岄粯璁や娇鐢ㄨ韩浠借瘉鍙蜂綔涓烘櫤鎱у崱鍙�
+ if (StringUtils.isEmpty(data.getIntelCard())) {
+ data.setIntelCard(data.getUserId());
+ }
+
+ return inoutManager.submitRegisterInout(data);
}
/**
@@ -658,6 +691,7 @@
return null;
}
+
/**
* 鏇存柊鐢ㄦ埛閫夋嫨鍦扮锛屾牴鎹敤鎴稩P淇濆瓨鏈熼�夋嫨
*
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 30f41d0..7d28481 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -44,100 +44,100 @@
@Component
public class InoutManager {
- @Autowired
- private InoutService inoutService;
- @Autowired
- private CoreFileService fileService;
- @Autowired
- private CoreCommonService commonService;
- @Autowired
- private InoutCommonService inoutManagerService;
- @Autowired
- private CheckStandardManager checkStandardManager;
- @Resource
- private InoutDeviceManager inoutDeviceManager;
+ @Autowired
+ private InoutService inoutService;
+ @Autowired
+ private CoreFileService fileService;
+ @Autowired
+ private CoreCommonService commonService;
+ @Autowired
+ private InoutCommonService inoutManagerService;
+ @Autowired
+ private CheckStandardManager checkStandardManager;
+ @Resource
+ private InoutDeviceManager inoutDeviceManager;
- /**
- * 褰撳墠鍏堜粠褰撴棩缂撳瓨涓幏鍙栨暟鎹紝濡傛灉缂撳瓨涓病鏈夊啀浠庢暟鎹簱鑾峰彇
- *
- * @param param
- * @return
- */
- public PageResponse<InoutData> inoutQuery(InoutParam param) {
- if (StringUtils.isEmpty(param.getPlateNum())
- && StringUtils.isEmpty(param.getIntelCard())
- && StringUtils.isEmpty(param.getUserId())) {
+ /**
+ * 褰撳墠鍏堜粠褰撴棩缂撳瓨涓幏鍙栨暟鎹紝濡傛灉缂撳瓨涓病鏈夊啀浠庢暟鎹簱鑾峰彇
+ *
+ * @param param
+ * @return
+ */
+ public PageResponse<InoutData> inoutQuery(InoutParam param) {
+ if (StringUtils.isEmpty(param.getPlateNum())
+ && StringUtils.isEmpty(param.getIntelCard())
+ && StringUtils.isEmpty(param.getUserId())) {
- return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(),
- "鍙傛暟涓嶅畬鏁达紝鏃犳硶鑾峰彇淇℃伅锛�");
- }
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(),
+ "鍙傛暟涓嶅畬鏁达紝鏃犳硶鑾峰彇淇℃伅锛�");
+ }
- if (StringUtils.isEmpty(param.getCompanyId())) {
- param.setCompanyId(ContextUtil.getCompanyId());
- }
+ if (StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
- InoutData result;
- String progress = param.getProgress();
- try {
- param.setProgress(null);
+ InoutData result;
+ String progress = param.getProgress();
+ try {
+ param.setProgress(null);
- result = inoutService.inoutProgressQuery(param);
- if (null == result) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "鏈壘鍒版祦绋嬩腑鐨勮溅杈嗭紒", null);
- }
+ result = inoutService.inoutProgressQuery(param);
+ if (null == result) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "鏈壘鍒版祦绋嬩腑鐨勮溅杈嗭紒", null);
+ }
- // 濡傛灉娌℃湁娴佺▼鏉′欢璇存槑涓嶉渶瑕佸仛鍒ゆ柇锛岀洿鎺ヨ繑鍥�
- if (StringUtils.isEmpty(progress)) {
- return new PageResponse<>(RespCodeEnum.CODE_0000, result);
- }
+ // 濡傛灉娌℃湁娴佺▼鏉′欢璇存槑涓嶉渶瑕佸仛鍒ゆ柇锛岀洿鎺ヨ繑鍥�
+ if (StringUtils.isEmpty(progress)) {
+ return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+ }
- if (!result.getType().equals(param.getType())) {
- if (InoutConstant.TYPE_IN.equals(result.getType())) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "绯荤粺锛氬綋鍓嶈溅杈嗕笟鍔′负銆愬叆搴撱��", result);
- } else {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "绯荤粺锛氬綋鍓嶈溅杈嗕笟鍔′负銆愬嚭搴撱��", result);
- }
- }
+ if (!result.getType().equals(param.getType())) {
+ if (InoutConstant.TYPE_IN.equals(result.getType())) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "绯荤粺锛氬綋鍓嶈溅杈嗕笟鍔′负銆愬叆搴撱��", result);
+ } else {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "绯荤粺锛氬綋鍓嶈溅杈嗕笟鍔′负銆愬嚭搴撱��", result);
+ }
+ }
- // 褰撳墠鏍囩鏍囩ず鏃㈠彲浠ユ槸绌鸿溅绉伴噸涔熷彲浠ユ槸婊¤溅
- if (progress.equals(InoutConstant.PROGRESS_WEIGHT_TAG)) {
- if (result.getProgress().equals(
- InoutConstant.PROGRESS_WEIGHT_EMPTY)
- || result.getProgress().equals(
- InoutConstant.PROGRESS_WEIGHT_FULL)) {
- // 琛ㄧず褰撳墠娴佺▼姝ｅ父
- } else {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "闈炲綋鍓嶆祦绋嬶紝璇峰埌"
- + InoutConstant.getProcessName(
- param.getType(),
- result.getProgress()), result);
- }
- } else {
- if (!result.getProgress().equals(progress)) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "闈炲綋鍓嶆祦绋嬶紝璇峰埌"
- + InoutConstant.getProcessName(
- param.getType(),
- result.getProgress()), result);
- }
- }
+ // 褰撳墠鏍囩鏍囩ず鏃㈠彲浠ユ槸绌鸿溅绉伴噸涔熷彲浠ユ槸婊¤溅
+ if (progress.equals(InoutConstant.PROGRESS_WEIGHT_TAG)) {
+ if (result.getProgress().equals(
+ InoutConstant.PROGRESS_WEIGHT_EMPTY)
+ || result.getProgress().equals(
+ InoutConstant.PROGRESS_WEIGHT_FULL)) {
+ // 琛ㄧず褰撳墠娴佺▼姝ｅ父
+ } else {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "闈炲綋鍓嶆祦绋嬶紝璇峰埌"
+ + InoutConstant.getProcessName(
+ param.getType(),
+ result.getProgress()), result);
+ }
+ } else {
+ if (!result.getProgress().equals(progress)) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "闈炲綋鍓嶆祦绋嬶紝璇峰埌"
+ + InoutConstant.getProcessName(
+ param.getType(),
+ result.getProgress()), result);
+ }
+ }
- // 鏍规嵁褰撳墠鏁版嵁鍒ゆ柇鏄惁鎺ㄩ��
- inoutService.notifyWeb(result);
+ // 鏍规嵁褰撳墠鏁版嵁鍒ゆ柇鏄惁鎺ㄩ��
+ inoutService.notifyWeb(result);
- //涓哄綋鍓嶆暟鎹坊鍔犲寲楠岄」鐩拰姘村垎鍜屾潅璐ㄧ殑鍖栭獙缁撴灉,鐢ㄤ簬鍑哄叆搴撳鎵ｉ噸璁＄畻
- if (InoutConstant.TYPE_IN.equals(result.getType())) {
- List<CheckItemData> checkItemDataList = inoutService.getCheckCache(result.getCompanyId(), result.getCheckId());
- result.setCheckItems(checkItemDataList);
- if (null != checkItemDataList && checkItemDataList.size() > 0) {
- for (CheckItemData checkItem : checkItemDataList) {
- if (StringUtils.isEmpty(checkItem.getValue())) {
- continue;
- }
+ //涓哄綋鍓嶆暟鎹坊鍔犲寲楠岄」鐩拰姘村垎鍜屾潅璐ㄧ殑鍖栭獙缁撴灉,鐢ㄤ簬鍑哄叆搴撳鎵ｉ噸璁＄畻
+ if (InoutConstant.TYPE_IN.equals(result.getType())) {
+ List<CheckItemData> checkItemDataList = inoutService.getCheckCache(result.getCompanyId(), result.getCheckId());
+ result.setCheckItems(checkItemDataList);
+ if (null != checkItemDataList && checkItemDataList.size() > 0) {
+ for (CheckItemData checkItem : checkItemDataList) {
+ if (StringUtils.isEmpty(checkItem.getValue())) {
+ continue;
+ }
// if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
// result.setWet(Double.valueOf(checkItem.getValue()));
@@ -145,252 +145,245 @@
// if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
// result.setImpurity(Double.valueOf(checkItem.getValue()));
// }
- }
- }
- }
+ }
+ }
+ }
- return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+ return new PageResponse<>(RespCodeEnum.CODE_0000, result);
- } catch (Exception e) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- e.getMessage());
- }
- }
+ } catch (Exception e) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ e.getMessage());
+ }
+ }
- public PageResponse<InoutData> outNextStep(InoutData data) throws Exception {
- String msg;
- IUser user = ContextUtil.getLoginUser();
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(user.getCompanyId());
- }
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setDeptId(ContextUtil.subDeptId(user));
- }
- if (StringUtils.isEmpty(data.getIntelCard())) {
- data.setIntelCard(data.getUserId());
- }
-
- String curProgress = data.getProgress();
- List<FileData> files = data.getFiles();
-
- // 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(
- data.getCompanyId(), data.getDeptId());
- if (null == inoutSysConf
- || StringUtils.isEmpty(inoutSysConf.getProgressIn())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠搴撳尯鏈厤缃嚭搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳閰嶇疆銆�", data);
- }
- data = updateOutBasicInfo(data, inoutSysConf);
-
- // 濡傛灉褰撳墠鑺傜偣鏄敞鍐岋紝鍒欓渶瑕侀獙璇佷笅锛屾槸鍚︽湁涓哄畬鎴愮殑娴佺▼鍦ㄦ墽琛屼腑
- if (InoutConstant.PROGRESS_REGISTER.equals(curProgress)) {
- InoutData progressData = this.inoutProgressQuery(data);
- if (null != progressData) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠鍗＄墖/杞︾墝鍙锋湁娴佺▼鏈粨鏉熴��", progressData);
- }
- }
-
- if(null != data.getPrice() && null != data.getRecordWeight()){
- data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice()*data.getRecordWeight(),2));
+ public PageResponse<InoutData> outNextStep(InoutData data) throws Exception {
+ String msg;
+ IUser user = ContextUtil.getLoginUser();
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(user.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(user));
+ }
+ if (StringUtils.isEmpty(data.getIntelCard())) {
+ data.setIntelCard(data.getUserId());
}
- // 娴佺▼瀹屾垚锛岀洿鎺ヨ皟鐢ㄦ祦绋嬪畬鎴愭帴鍙�
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- inoutService.updateData(data);
- // 鎵ц闄勪欢淇℃伅
- if (null != files) {
- fileService.saveInoutFiles(files, data.getCompanyId(),
- data.getId(), curProgress);
- }
+ String curProgress = data.getProgress();
+ List<FileData> files = data.getFiles();
- // 閫氱煡绉伴噸涓绘帶娴佺▼缁撴潫
- inoutDeviceManager.noticeProgressComplete(data);
+ // 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
+ InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(
+ data.getCompanyId(), data.getDeptId());
+ if (null == inoutSysConf
+ || StringUtils.isEmpty(inoutSysConf.getProgressIn())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠搴撳尯鏈厤缃嚭搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳閰嶇疆銆�", data);
+ }
+ data = updateOutBasicInfo(data, inoutSysConf);
- return inoutComplete(data);
- }
-
- // 璋冪敤淇濆瓨鏂规硶鎵ц
- if (StringUtils.isEmpty(data.getId())) {
- msg = inoutService.insertData(data);
- } else {
- msg = inoutService.updateData(data);
- }
-
- // 鎵ц闄勪欢淇℃伅
- if (null != files) {
- fileService.saveInoutFiles(files, data.getCompanyId(),
- data.getId(), curProgress);
- }
-
- if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg,
- data);
- }
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛",
- data);
- }
-
- public PageResponse<InoutData> inNextStep(InoutData data) throws Exception {
- String msg;
- IUser user = ContextUtil.getLoginUser();
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(user.getCompanyId());
- }
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setDeptId(ContextUtil.subDeptId(user));
- }
- String curProgress = data.getProgress();
- List<FileData> files = data.getFiles();
-
- if (StringUtils.isEmpty(data.getIntelCard())) {
- data.setIntelCard(data.getUserId());
- }
-
- // 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
-
- if (null == inoutSysConf
- || StringUtils.isEmpty(inoutSysConf.getProgressIn())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠搴撳尯鏈厤缃叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳閰嶇疆銆�", data);
- }
-
- data = updateInBasicInfo(data, inoutSysConf);
-
- // 濡傛灉褰撳墠鑺傜偣鏄敞鍐岋紝鍒欓渶瑕侀獙璇佷笅锛屾槸鍚︽湁涓哄畬鎴愮殑娴佺▼鍦ㄦ墽琛屼腑
- if (InoutConstant.PROGRESS_REGISTER.equals(curProgress)) {
- InoutData progressData = this.inoutProgressQuery(data);
- if (null != progressData) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠鍗＄墖/杞︾墝鍙锋湁娴佺▼鏈粨鏉熴��", progressData);
- }
- }
-
- if(null != data.getPrice() && null != data.getRecordWeight()){
- data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice()*data.getRecordWeight(),2));
+ // 濡傛灉褰撳墠鑺傜偣鏄敞鍐岋紝鍒欓渶瑕侀獙璇佷笅锛屾槸鍚︽湁涓哄畬鎴愮殑娴佺▼鍦ㄦ墽琛屼腑
+ if (InoutConstant.PROGRESS_REGISTER.equals(curProgress)) {
+ InoutData progressData = this.inoutProgressQuery(data);
+ if (null != progressData) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠鍗＄墖/杞︾墝鍙锋湁娴佺▼鏈粨鏉熴��", progressData);
+ }
}
- // 娴佺▼瀹屾垚锛岀洿鎺ヨ皟鐢ㄦ祦绋嬪畬鎴愭帴鍙�
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
+ if (null != data.getPrice() && null != data.getRecordWeight()) {
+ data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2));
+ }
- inoutService.updateData(data);
- // 鎵ц闄勪欢淇℃伅
- if (null != files) {
- fileService.saveInoutFiles(files, data.getCompanyId(),
- data.getId(), curProgress);
- }
+ // 娴佺▼瀹屾垚锛岀洿鎺ヨ皟鐢ㄦ祦绋嬪畬鎴愭帴鍙�
+ if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+ inoutService.updateData(data);
+ // 鎵ц闄勪欢淇℃伅
+ if (null != files) {
+ fileService.saveInoutFiles(files, data.getCompanyId(),
+ data.getId(), curProgress);
+ }
- // 閫氱煡绉伴噸涓绘帶娴佺▼缁撴潫
- inoutDeviceManager.noticeProgressComplete(data);
+ // 閫氱煡绉伴噸涓绘帶娴佺▼缁撴潫
+ inoutDeviceManager.noticeProgressComplete(data);
- return inoutComplete(data);
- }
+ return inoutComplete(data);
+ }
- // 璋冪敤淇濆瓨鏂规硶鎵ц
- if (StringUtils.isEmpty(data.getId())) {
- msg = inoutService.insertData(data);
- } else {
- msg = inoutService.updateData(data);
- }
+ // 璋冪敤淇濆瓨鏂规硶鎵ц
+ if (StringUtils.isEmpty(data.getId())) {
+ msg = inoutService.insertData(data);
+ } else {
+ msg = inoutService.updateData(data);
+ }
- // 鎵ц闄勪欢淇℃伅
- if (null != files) {
- fileService.saveInoutFiles(files, data.getCompanyId(),
- data.getId(), curProgress);
- }
+ // 鎵ц闄勪欢淇℃伅
+ if (null != files) {
+ fileService.saveInoutFiles(files, data.getCompanyId(),
+ data.getId(), curProgress);
+ }
- if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
- }
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg,
+ data);
+ }
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛",
+ data);
+ }
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛",
- data);
- }
+ public PageResponse<InoutData> inNextStep(InoutData data) throws Exception {
+ String msg;
- public InoutData inoutProgressQuery(InoutData data) throws Exception {
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setPlateNum(data.getPlateNum());
- param.setIntelCard(data.getIntelCard());
- param.setType(data.getType());
+ String curProgress = data.getProgress();
+ List<FileData> files = data.getFiles();
+ if (StringUtils.isEmpty(data.getIntelCard())) {
+ data.setIntelCard(data.getUserId());
+ }
- return inoutService.inoutProgressQuery(param);
- }
+ // 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
+ InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
- @Transactional(rollbackFor = Exception.class)
- public PageResponse<InoutData> updateCheck(InoutData data) throws Exception {
+ if (null == inoutSysConf
+ || StringUtils.isEmpty(inoutSysConf.getProgressIn())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠搴撳尯鏈厤缃叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳閰嶇疆銆�", data);
+ }
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼", data);
- }
+ data = updateInBasicInfo(data, inoutSysConf);
- CheckUpdateResult checkResult = this.updateCheckItems(data);
- String tag = checkResult.getMsg();
+ // 濡傛灉褰撳墠鑺傜偣鏄敞鍐岋紝鍒欓渶瑕侀獙璇佷笅锛屾槸鍚︽湁涓哄畬鎴愮殑娴佺▼鍦ㄦ墽琛屼腑
+ if (InoutConstant.PROGRESS_REGISTER.equals(curProgress)) {
+ InoutData progressData = this.inoutProgressQuery(data);
+ if (null != progressData) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠鍗＄墖/杞︾墝鍙锋湁娴佺▼鏈粨鏉熴��", progressData);
+ }
+ }
- if (null != tag) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庡彴鎵ц寮傚父锛�" + tag, data);
- }
+ if (null != data.getPrice() && null != data.getRecordWeight()) {
+ data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2));
+ }
- // 鑾峰彇涓氬姟鏁版嵁淇℃伅
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- InoutData progressData = inoutService.inoutProgressQuery(param);
- if (null == progressData) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "娌℃湁鑾峰彇鍒板嚭鍏ュ簱涓氬姟鏁版嵁淇℃伅锛屾洿鏂板け璐�", data);
- }
- if (InoutConstant.PROGRESS_RECORD.equals(progressData.getProgress())) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
- }
- progressData.setCheckStatus(data.getCheckStatus());
+ // 娴佺▼瀹屾垚锛岀洿鎺ヨ皟鐢ㄦ祦绋嬪畬鎴愭帴鍙�
+ if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
- // 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
- if (InoutConstant.PROGRESS_CHECK.equals(progressData.getProgress())) {
- progressData = updateInBasicInfo(progressData, null);
- // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
- if (InoutConstant.STATUS_UNPASS.equals(progressData
- .getCheckStatus())) {
- progressData = checkNoPass(progressData);
- }
- }
- progressData.setCheckUser(ContextUtil.getLoginUserCName());
+ inoutService.updateData(data);
+ // 鎵ц闄勪欢淇℃伅
+ if (null != files) {
+ fileService.saveInoutFiles(files, data.getCompanyId(),
+ data.getId(), curProgress);
+ }
+
+ // 閫氱煡绉伴噸涓绘帶娴佺▼缁撴潫
+ inoutDeviceManager.noticeProgressComplete(data);
+
+ return inoutComplete(data);
+ }
+
+ // 璋冪敤淇濆瓨鏂规硶鎵ц
+ if (StringUtils.isEmpty(data.getId())) {
+ msg = inoutService.insertData(data);
+ } else {
+ msg = inoutService.updateData(data);
+ }
+
+ // 鎵ц闄勪欢淇℃伅
+ if (null != files) {
+ fileService.saveInoutFiles(files, data.getCompanyId(),
+ data.getId(), curProgress);
+ }
+
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+ }
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛",
+ data);
+ }
+
+ public InoutData inoutProgressQuery(InoutData data) throws Exception {
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setPlateNum(data.getPlateNum());
+ param.setIntelCard(data.getIntelCard());
+ param.setType(data.getType());
+
+ return inoutService.inoutProgressQuery(param);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public PageResponse<InoutData> updateCheck(InoutData data) throws Exception {
+
+ if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼", data);
+ }
+
+ CheckUpdateResult checkResult = this.updateCheckItems(data);
+ String tag = checkResult.getMsg();
+
+ if (null != tag) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鍚庡彴鎵ц寮傚父锛�" + tag, data);
+ }
+
+ // 鑾峰彇涓氬姟鏁版嵁淇℃伅
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ InoutData progressData = inoutService.inoutProgressQuery(param);
+ if (null == progressData) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "娌℃湁鑾峰彇鍒板嚭鍏ュ簱涓氬姟鏁版嵁淇℃伅锛屾洿鏂板け璐�", data);
+ }
+ if (InoutConstant.PROGRESS_RECORD.equals(progressData.getProgress())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
+ }
+ progressData.setCheckStatus(data.getCheckStatus());
+
+ // 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
+ if (InoutConstant.PROGRESS_CHECK.equals(progressData.getProgress())) {
+ progressData = updateInBasicInfo(progressData, null);
+ // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
+ if (InoutConstant.STATUS_UNPASS.equals(progressData
+ .getCheckStatus())) {
+ progressData = checkNoPass(progressData);
+ }
+ }
+ progressData.setCheckUser(ContextUtil.getLoginUserCName());
// if (StringUtils.isNotEmpty(data.getCustomerName())) {
// progressData.setCustomerId(data.getCustomerId());
// progressData.setCustomerName(data.getCustomerName());
// }
- if (StringUtils.isNotEmpty(data.getDepotId())) {
- progressData.setDepotId(data.getDepotId());
- }
- if (StringUtils.isNotEmpty(data.getFoodVariety())) {
- progressData.setFoodVariety(data.getFoodVariety());
- }
- if (StringUtils.isNotEmpty(data.getFoodLevel())) {
- progressData.setFoodLevel(data.getFoodLevel());
- }
- if (StringUtils.isNotEmpty(data.getFoodLocation())) {
- progressData.setFoodLocation(data.getFoodLocation());
- }
- if (StringUtils.isNotEmpty(data.getFoodYear())) {
- progressData.setFoodYear(data.getFoodYear());
- }
- if (null != data.getPrice()) {
- progressData.setPrice(data.getPrice());
- }
- if (StringUtils.isNotEmpty(data.getRemarks())) {
- progressData.setRemarks(data.getRemarks());
- }
- if (StringUtils.isNotEmpty(data.getNoticeId())) {
- progressData.setNoticeId(data.getNoticeId());
- }
+ if (StringUtils.isNotEmpty(data.getDepotId())) {
+ progressData.setDepotId(data.getDepotId());
+ }
+ if (StringUtils.isNotEmpty(data.getFoodVariety())) {
+ progressData.setFoodVariety(data.getFoodVariety());
+ }
+ if (StringUtils.isNotEmpty(data.getFoodLevel())) {
+ progressData.setFoodLevel(data.getFoodLevel());
+ }
+ if (StringUtils.isNotEmpty(data.getFoodLocation())) {
+ progressData.setFoodLocation(data.getFoodLocation());
+ }
+ if (StringUtils.isNotEmpty(data.getFoodYear())) {
+ progressData.setFoodYear(data.getFoodYear());
+ }
+ if (null != data.getPrice()) {
+ progressData.setPrice(data.getPrice());
+ }
+ if (StringUtils.isNotEmpty(data.getRemarks())) {
+ progressData.setRemarks(data.getRemarks());
+ }
+ if (StringUtils.isNotEmpty(data.getNoticeId())) {
+ progressData.setNoticeId(data.getNoticeId());
+ }
// // 鍥炲～姘村垎鍜屾潅璐�
// if (checkResult.getWet() > 0) {
@@ -401,662 +394,715 @@
// progressData.setImpurity(checkResult.getImpurity());
// }
- String msg = inoutService.updateData(progressData);
+ String msg = inoutService.updateData(progressData);
- if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
- }
- if (InoutConstant.PROGRESS_RECORD.equals(progressData.getProgress())) {
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+ }
+ if (InoutConstant.PROGRESS_RECORD.equals(progressData.getProgress())) {
- inoutComplete(progressData);
- }
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
- }
+ inoutComplete(progressData);
+ }
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
+ }
- /**
- * 鍖栭獙缁撴灉涓嶉�氳繃鏃舵牎楠岄厤缃俊鎭�
- *
- * @param data
- * @return
- */
- private InoutData checkNoPass(InoutData data) {
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(
- data.getCompanyId(), data.getDeptId());
+ /**
+ * 鍖栭獙缁撴灉涓嶉�氳繃鏃舵牎楠岄厤缃俊鎭�
+ *
+ * @param data
+ * @return
+ */
+ private InoutData checkNoPass(InoutData data) {
+ InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(
+ data.getCompanyId(), data.getDeptId());
- if (inoutSysConf.getNoPassNext().equals(InoutConstant.CHECK_NOPASS_RECORD)) {
- // 娴佺▼缁撴潫
- data.setProgress(InoutConstant.PROGRESS_RECORD);
- data.setCompleteTime(new Date());
- }
- if (inoutSysConf.getNoPassNext().equals(InoutConstant.CHECK_NOPASS_BACK)) {
- // 绂诲簱鏀跺崱
- data.setProgress(InoutConstant.PROGRESS_CARD_BACK);
- }
- return data;
- }
+ if (inoutSysConf.getNoPassNext().equals(InoutConstant.CHECK_NOPASS_RECORD)) {
+ // 娴佺▼缁撴潫
+ data.setProgress(InoutConstant.PROGRESS_RECORD);
+ data.setCompleteTime(new Date());
+ }
+ if (inoutSysConf.getNoPassNext().equals(InoutConstant.CHECK_NOPASS_BACK)) {
+ // 绂诲簱鏀跺崱
+ data.setProgress(InoutConstant.PROGRESS_CARD_BACK);
+ }
+ return data;
+ }
- private CheckUpdateResult updateCheckItems(InoutData data) {
- CheckUpdateResult result = new CheckUpdateResult();
- if (null == data.getCheckItems())
- return result;
- try {
- // 鏇存柊妫�楠岄」鏁版嵁
- result = checkStandardManager.updateCheckItems(data.getCheckId(),
- data.getCompanyId(), data.getCheckItems());
+ private CheckUpdateResult updateCheckItems(InoutData data) {
+ CheckUpdateResult result = new CheckUpdateResult();
+ if (null == data.getCheckItems())
+ return result;
+ try {
+ // 鏇存柊妫�楠岄」鏁版嵁
+ result = checkStandardManager.updateCheckItems(data.getCheckId(),
+ data.getCompanyId(), data.getCheckItems());
- // 灏嗗寲楠屾暟鎹瓨鍏ョ紦瀛樹腑
- inoutService.setCheckCache(data);
+ // 灏嗗寲楠屾暟鎹瓨鍏ョ紦瀛樹腑
+ inoutService.setCheckCache(data);
- return result;
+ return result;
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父锛歿}", e);
- result.setMsg("鎵ц寮傚父锛�" + e.getMessage());
- }
- return result;
- }
+ } catch (Exception e) {
+ log.error("鍚庡彴寮傚父锛歿}", e);
+ result.setMsg("鎵ц寮傚父锛�" + e.getMessage());
+ }
+ return result;
+ }
- /**
- * 浠庣紦瀛樹腑鑾峰彇涓嬩竴娴佺▼
- *
- * @return
- */
- private String getNextProgress(String curProgress, String type,
- InoutSysConf sysConf) {
- String nextProgress = null;
- List<String> list = null;
- if (InoutConstant.TYPE_IN.equals(type)) {
- list = Arrays.asList(sysConf.getProgressIn().split("-"));
- }
- if (InoutConstant.TYPE_OUT.equals(type)) {
- list = Arrays.asList(sysConf.getProgressOut().split("-"));
- }
- if (list != null) {
- for (int i = 0; i < list.size() - 1; i++) {
- if (curProgress.equals(list.get(i))) {
- nextProgress = list.get(i + 1);
- break;
- }
- }
- }
- return nextProgress;
- }
+ /**
+ * 浠庣紦瀛樹腑鑾峰彇涓嬩竴娴佺▼
+ *
+ * @return
+ */
+ private String getNextProgress(String curProgress, String type, InoutSysConf sysConf) {
+ String nextProgress = null;
+ List<String> list = null;
+ if (InoutConstant.TYPE_IN.equals(type)) {
+ list = Arrays.asList(sysConf.getProgressIn().split("-"));
+ }
+ if (InoutConstant.TYPE_OUT.equals(type)) {
+ list = Arrays.asList(sysConf.getProgressOut().split("-"));
+ }
+ if (list != null) {
+ for (int i = 0; i < list.size() - 1; i++) {
+ if (curProgress.equals(list.get(i))) {
+ nextProgress = list.get(i + 1);
+ break;
+ }
+ }
+ }
+ return nextProgress;
+ }
- /**
- * 鏍规嵁闇�瑕佷繚瀛樼殑鏁版嵁锛岃皟鏁翠笅涓�涓祦绋嬬姸鎬� 涓嶅悓鐨勪粨搴撶粍缁囨祦绋嬪彲鑳戒笉涓�鏍凤紝闇�瑕佹牴鎹疄闄呰皟鏁�
- *
- * @param data
- * @return
- */
- private InoutData updateInBasicInfo(InoutData data, InoutSysConf sysConf) {
- if (null == sysConf) {
- sysConf = inoutManagerService.getCacheInoutSysConf(
- data.getCompanyId(), data.getDeptId());
- }
+ /**
+ * 鏍规嵁闇�瑕佷繚瀛樼殑鏁版嵁锛岃皟鏁翠笅涓�涓祦绋嬬姸鎬� 涓嶅悓鐨勪粨搴撶粍缁囨祦绋嬪彲鑳戒笉涓�鏍凤紝闇�瑕佹牴鎹疄闄呰皟鏁�
+ *
+ * @param data
+ * @return
+ */
+ private InoutData updateInBasicInfo(InoutData data, InoutSysConf sysConf) {
+ if (null == sysConf) {
+ sysConf = inoutManagerService.getCacheInoutSysConf(
+ data.getCompanyId(), data.getDeptId());
+ }
- if (InoutConstant.PROGRESS_REGISTER.equals(data.getProgress())) {
- data.setRegisterTime(new Date());
- data.setRegisterUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
+ if (InoutConstant.PROGRESS_REGISTER.equals(data.getProgress())) {
+ data.setRegisterTime(new Date());
+ data.setRegisterUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
- return data;
- }
+ return data;
+ }
- if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(data.getProgress())) {
- data.setFullWeightTime(new Date());
- data.setFullWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
- return data;
- }
- if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
- return data;
- }
+ if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(data.getProgress())) {
+ data.setFullWeightTime(new Date());
+ data.setFullWeightUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
+ return data;
+ }
+ if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
+ return data;
+ }
- if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(data.getProgress())) {
- data.setEmptyWeightTime(new Date());
- data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
+ if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(data.getProgress())) {
+ data.setEmptyWeightTime(new Date());
+ data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- }
- return data;
- }
+ if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+ data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
+ data.setCompleteUser(ContextUtil.getLoginUserCName());
+ }
+ return data;
+ }
- if (InoutConstant.PROGRESS_HANDLE.equals(data.getProgress())) {
+ if (InoutConstant.PROGRESS_HANDLE.equals(data.getProgress())) {
- // 鏌ヨ缂撳瓨涓粨搴撲俊鎭紝鏍规嵁浠撳簱id璁剧疆鍊间粨浜轰负浠撳簱淇濈鍛�
- Depot depot = commonService.getCacheDepot(data.getCompanyId(),
- data.getDepotId());
- data.setHandleUser(depot == null ? "" : depot.getStoreKeeperName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
- return data;
- }
+ // 鏌ヨ缂撳瓨涓粨搴撲俊鎭紝鏍规嵁浠撳簱id璁剧疆鍊间粨浜轰负浠撳簱淇濈鍛�
+ Depot depot = commonService.getCacheDepot(data.getCompanyId(),
+ data.getDepotId());
+ data.setHandleUser(depot == null ? "" : depot.getStoreKeeperName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
+ return data;
+ }
- if (InoutConstant.PROGRESS_CARD_BACK.equals(data.getProgress())) {
- data.setCompleteTime(new Date());
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
- return data;
- }
- return data;
- }
+ if (InoutConstant.PROGRESS_CARD_BACK.equals(data.getProgress())) {
+ data.setCompleteTime(new Date());
+ data.setCompleteUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
+ return data;
+ }
+ return data;
+ }
- /**
- * 鏍规嵁闇�瑕佷繚瀛樼殑鏁版嵁锛岃皟鏁翠笅涓�涓祦绋嬬姸鎬� 涓嶅悓鐨勪粨搴撶粍缁囨祦绋嬪彲鑳戒笉涓�鏍凤紝闇�瑕佹牴鎹疄闄呰皟鏁�
- *
- * @param data
- * @return
- */
- private InoutData updateOutBasicInfo(InoutData data, InoutSysConf sysConf) {
- if (InoutConstant.PROGRESS_REGISTER.equals(data.getProgress())) {
- data.setRegisterTime(new Date());
- data.setRegisterUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
+ /**
+ * 鏍规嵁闇�瑕佷繚瀛樼殑鏁版嵁锛岃皟鏁翠笅涓�涓祦绋嬬姸鎬� 涓嶅悓鐨勪粨搴撶粍缁囨祦绋嬪彲鑳戒笉涓�鏍凤紝闇�瑕佹牴鎹疄闄呰皟鏁�
+ *
+ * @param data
+ * @return
+ */
+ private InoutData updateOutBasicInfo(InoutData data, InoutSysConf sysConf) {
+ if (InoutConstant.PROGRESS_REGISTER.equals(data.getProgress())) {
+ data.setRegisterTime(new Date());
+ data.setRegisterUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
- return data;
- }
- if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(data.getProgress())) {
- data.setEmptyWeightTime(new Date());
- data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
+ return data;
+ }
+ if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(data.getProgress())) {
+ data.setEmptyWeightTime(new Date());
+ data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
- return data;
- }
+ return data;
+ }
- if (InoutConstant.PROGRESS_HANDLE.equals(data.getProgress())) {
- // 鏌ヨ缂撳瓨涓粨搴撲俊鎭紝鏍规嵁浠撳簱id璁剧疆鍊间粨浜轰负浠撳簱淇濈鍛�
- Depot depot = commonService.getCacheDepot(data.getCompanyId(),
- data.getDepotId());
- data.setHandleUser(depot == null ? "" : depot.getStoreKeeperName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
+ if (InoutConstant.PROGRESS_HANDLE.equals(data.getProgress())) {
+ // 鏌ヨ缂撳瓨涓粨搴撲俊鎭紝鏍规嵁浠撳簱id璁剧疆鍊间粨浜轰负浠撳簱淇濈鍛�
+ Depot depot = commonService.getCacheDepot(data.getCompanyId(),
+ data.getDepotId());
+ data.setHandleUser(depot == null ? "" : depot.getStoreKeeperName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
- return data;
- }
+ return data;
+ }
- if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(data.getProgress())) {
- data.setFullWeightTime(new Date());
- data.setFullWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- }
- return data;
- }
+ if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(data.getProgress())) {
+ data.setFullWeightTime(new Date());
+ data.setFullWeightUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
+ if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+ data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
+ data.setCompleteUser(ContextUtil.getLoginUserCName());
+ }
+ return data;
+ }
- if (InoutConstant.PROGRESS_CARD_BACK.equals(data.getProgress())) {
- data.setCompleteTime(new Date());
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
+ if (InoutConstant.PROGRESS_CARD_BACK.equals(data.getProgress())) {
+ data.setCompleteTime(new Date());
+ data.setCompleteUser(ContextUtil.getLoginUserCName());
+ data.setProgress(getNextProgress(data.getProgress(),
+ data.getType(), sysConf));
- return data;
- }
+ return data;
+ }
- return data;
- }
+ return data;
+ }
- public PageResponse<Page<InoutData>> pageRecordData(InoutParam param) {
+ public PageResponse<Page<InoutData>> pageRecordData(InoutParam param) {
- log.debug("鍒嗛〉淇℃伅--page={},limit={},cuur={}", param.getPage(),
- param.getLimit(), param.getCurr());
+ log.debug("鍒嗛〉淇℃伅--page={},limit={},cuur={}", param.getPage(),
+ param.getLimit(), param.getCurr());
- Page<InoutData> result = inoutService.pageRecordData(param);
+ Page<InoutData> result = inoutService.pageRecordData(param);
- if (null == result.getRecords() || result.getRecords().isEmpty()) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "鑾峰彇鍒版暟鎹俊鎭负绌�");
- }
+ if (null == result.getRecords() || result.getRecords().isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "鑾峰彇鍒版暟鎹俊鎭负绌�");
+ }
- return new PageResponse<>(RespCodeEnum.CODE_0000, result);
- }
+ return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+ }
- /**
- * @param param
- * @return
- */
- public PageResponse<Page<InoutData>> pageCheckData(InoutParam param) {
- // 濡傛灉鏄凡鍖栭獙锛屽垯灏嗘祦绋嬬姸鎬佺疆绌猴紝濡傛灉鏄湭鍖栭獙锛屽垯娴佺▼鐘舵�佷笉澶勭悊锛屼粛鏄疌HECK鐘舵��
- if (!"NONE".equals(param.getCheckStatus())) {
- param.setProgress(null);
- }
- // 璁剧疆鍒嗗簱Id
- String deptId = ContextUtil.subDeptId(null);
- param.setDeptId(deptId);
- return pageRecordData(param);
- }
+ /**
+ * @param param
+ * @return
+ */
+ public PageResponse<Page<InoutData>> pageCheckData(InoutParam param) {
+ // 濡傛灉鏄凡鍖栭獙锛屽垯灏嗘祦绋嬬姸鎬佺疆绌猴紝濡傛灉鏄湭鍖栭獙锛屽垯娴佺▼鐘舵�佷笉澶勭悊锛屼粛鏄疌HECK鐘舵��
+ if (!"NONE".equals(param.getCheckStatus())) {
+ param.setProgress(null);
+ }
+ // 璁剧疆鍒嗗簱Id
+ String deptId = ContextUtil.subDeptId(null);
+ param.setDeptId(deptId);
+ return pageRecordData(param);
+ }
- public PageResponse<InoutData> inoutComplete(InoutData data) throws Exception {
+ public PageResponse<InoutData> inoutComplete(InoutData data) throws Exception {
- if (StringUtils.isEmpty(data.getId())
- || StringUtils.isEmpty(data.getType())) {
+ if (StringUtils.isEmpty(data.getId())
+ || StringUtils.isEmpty(data.getType())) {
- return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(),
- "娌℃湁鑾峰彇鍒拌溅杈嗕俊鎭��", data);
- }
+ return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(),
+ "娌℃湁鑾峰彇鍒拌溅杈嗕俊鎭��", data);
+ }
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- param.setType(data.getType());
- param.setDeptId(data.getDeptId());
- param.setIntelCard(data.getIntelCard());
- param.setUserId(ContextUtil.getLoginUserCName());
- param.setDepotId(data.getDepotId());
- param.setCompleteTime(data.getCompleteTime());
- if (null == param.getCompleteTime()) {
- param.setCompleteTime(new Date());
- }
- // 璁剧疆娴佺▼鑺傜偣鐩存帴瀹屾垚
- param.setProgress(InoutConstant.PROGRESS_RECORD);
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ param.setType(data.getType());
+ param.setDeptId(data.getDeptId());
+ param.setIntelCard(data.getIntelCard());
+ param.setUserId(ContextUtil.getLoginUserCName());
+ param.setDepotId(data.getDepotId());
+ param.setCompleteTime(data.getCompleteTime());
+ if (null == param.getCompleteTime()) {
+ param.setCompleteTime(new Date());
+ }
+ // 璁剧疆娴佺▼鑺傜偣鐩存帴瀹屾垚
+ param.setProgress(InoutConstant.PROGRESS_RECORD);
- if (null == data.getCompleteTime()) {
- data.setCompleteTime(DateUtil.getNewByMinute(new Date(), 2));
- }
- String msg = inoutService.toComplete(param);
+ if (null == data.getCompleteTime()) {
+ data.setCompleteTime(DateUtil.getNewByMinute(new Date(), 2));
+ }
+ String msg = inoutService.toComplete(param);
- if (null != msg) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
- }
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+ }
- // 搴撳瓨璋冩暣
- commonService.initInoutDepotStore(data);
+ // 搴撳瓨璋冩暣
+ commonService.initInoutDepotStore(data);
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
- }
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
+ }
- /**
- * 鎵︽牱鍖栭獙椤甸潰鑾峰彇妫�楠岄」鏉＄洰淇℃伅
- *
- * @param data
- * @return
- */
- public PageResponse<List<CheckItemData>> getCheckItem(InoutData data) {
+ /**
+ * 鎵︽牱鍖栭獙椤甸潰鑾峰彇妫�楠岄」鏉＄洰淇℃伅
+ *
+ * @param data
+ * @return
+ */
+ public PageResponse<List<CheckItemData>> getCheckItem(InoutData data) {
- List<CheckItemData> result = checkStandardManager.listCheckItem(
- data.getCheckId(), data.getCompanyId(), data.getDeptId(),
- data.getFoodVariety());
+ List<CheckItemData> result = checkStandardManager.listCheckItem(
+ data.getCheckId(), data.getCompanyId(), data.getDeptId(),
+ data.getFoodVariety());
- return new PageResponse<>(RespCodeEnum.CODE_0000, result);
- }
+ return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+ }
- /**
- * 鍒犻櫎骞跺畬鎴�
- *
- * @param data
- * @return
- */
- public PageResponse<InoutData> deleteInoutData(InoutData data, String msg) {
- try {
- data.setRemarks(msg);
- String result = this.delInoutData(data, false);
- if (null != result) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- result, data);
- }
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父:{}", e);
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�"
- + e.getMessage(), data);
- }
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц瀹屾垚",
- data);
- }
+ /**
+ * 鍒犻櫎骞跺畬鎴�
+ *
+ * @param data
+ * @return
+ */
+ public PageResponse<InoutData> deleteInoutData(InoutData data, String msg) {
+ try {
+ data.setRemarks(msg);
+ String result = this.delInoutData(data, false);
+ if (null != result) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ result, data);
+ }
+ } catch (Exception e) {
+ log.error("鍚庡彴寮傚父:{}", e);
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�"
+ + e.getMessage(), data);
+ }
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц瀹屾垚",
+ data);
+ }
- /**
- * 鍗″洖鏀堕�昏緫澶勭悊
- *
- * @param data
- * @return
- */
- public PageResponse<InoutData> inoutBack(InoutData data) {
- try {
- // 浠庣紦瀛樹腑鑾峰彇鏈�鏂扮殑鏁版嵁锛屽鏋滄病鏈夊垯琛ㄧず娴佺▼宸茬粡缁撴潫銆�
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- InoutData curData = inoutService.inoutProgressQuery(param);
- if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "褰撳墠鍗℃祦绋嬪凡缁忓畬鎴愶紝鏃犻渶鎵ц鍗″洖鏀�", data);
- }
- if (InoutConstant.RECORD_STATUS_DEL.equals(curData
- .getRecordStatus())) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "褰撳墠鍗′俊鎭凡琚垹闄わ紝涓嶈兘鎵ц鍗″洖鏀�", data);
- }
+ /**
+ * 鍗″洖鏀堕�昏緫澶勭悊
+ *
+ * @param data
+ * @return
+ */
+ public PageResponse<InoutData> inoutBack(InoutData data) {
+ try {
+ // 浠庣紦瀛樹腑鑾峰彇鏈�鏂扮殑鏁版嵁锛屽鏋滄病鏈夊垯琛ㄧず娴佺▼宸茬粡缁撴潫銆�
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ InoutData curData = inoutService.inoutProgressQuery(param);
+ if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "褰撳墠鍗℃祦绋嬪凡缁忓畬鎴愶紝鏃犻渶鎵ц鍗″洖鏀�", data);
+ }
+ if (InoutConstant.RECORD_STATUS_DEL.equals(curData
+ .getRecordStatus())) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "褰撳墠鍗′俊鎭凡琚垹闄わ紝涓嶈兘鎵ц鍗″洖鏀�", data);
+ }
- // 濡傛灉褰撳墠娴佺▼鐘舵�佹槸鍗″洖鏀剁姸鎬侊紝灏辨槸瀹屾垚娴佺▼銆�
- if (InoutConstant.PROGRESS_CARD_BACK.equals(curData.getProgress())) {
- return inoutComplete(curData);
- }
+ // 濡傛灉褰撳墠娴佺▼鐘舵�佹槸鍗″洖鏀剁姸鎬侊紝灏辨槸瀹屾垚娴佺▼銆�
+ if (InoutConstant.PROGRESS_CARD_BACK.equals(curData.getProgress())) {
+ return inoutComplete(curData);
+ }
- // 濡傛灉鏄叾浠栫姸鎬侊紝鍒欐墽琛屽垹闄ら�昏緫
- return deleteInoutData(curData, "鍗″洖鏀跺垹闄�");
+ // 濡傛灉鏄叾浠栫姸鎬侊紝鍒欐墽琛屽垹闄ら�昏緫
+ return deleteInoutData(curData, "鍗″洖鏀跺垹闄�");
- } catch (Exception e) {
- return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
- "鍚庣鎵ц寮傚父锛�" + e.getMessage());
- }
- }
+ } catch (Exception e) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鍚庣鎵ц寮傚父锛�" + e.getMessage());
+ }
+ }
- /* ============================== 璇﹀崟椤甸潰鐩稿叧鎿嶄綔 ================================= */
+ /* ============================== 璇﹀崟椤甸潰鐩稿叧鎿嶄綔 ================================= */
- /**
- * 琛ュ崟鎿嶄綔 琛ュ崟鍥犱负瀹屾垚鏃堕棿涓嶇‘瀹氾紝鎵�浠ラ渶瑕佺郴缁熸牴鎹綋鍓嶆暟鎹繘琛岃嚜鍔ㄦ娴嬶紝璋冩暣鍘熸潵娴佹按淇℃伅鍜屽簱瀛�
- *
- * @param data
- * @return
- * @throws Exception
- */
- @Transactional
- public String addInoutData(InoutData data) throws Exception {
+ /**
+ * 琛ュ崟鎿嶄綔 琛ュ崟鍥犱负瀹屾垚鏃堕棿涓嶇‘瀹氾紝鎵�浠ラ渶瑕佺郴缁熸牴鎹綋鍓嶆暟鎹繘琛岃嚜鍔ㄦ娴嬶紝璋冩暣鍘熸潵娴佹按淇℃伅鍜屽簱瀛�
+ *
+ * @param data
+ * @return
+ * @throws Exception
+ */
+ @Transactional
+ public String addInoutData(InoutData data) throws Exception {
- if (data.getSettleWeight() <= 0.0) {
- return "琛ュ崟鏁版嵁瑕佹眰缁撶畻閲嶉噺蹇呴』澶т簬0";
- }
+ if (data.getSettleWeight() <= 0.0) {
+ return "琛ュ崟鏁版嵁瑕佹眰缁撶畻閲嶉噺蹇呴』澶т簬0";
+ }
- // 琛ュ崟鏁版嵁鐩存帴鍒扮粨鏋滅姸鎬�
- data.setRecordStatus(InoutConstant.RECORD_STATUS_ADD);
- data.setProgress(InoutConstant.PROGRESS_RECORD);
- if (InoutConstant.STATUS_NONE.equals(data.getCheckStatus())) {
- data.setCheckStatus(InoutConstant.STATUS_PASS);
- }
+ // 琛ュ崟鏁版嵁鐩存帴鍒扮粨鏋滅姸鎬�
+ data.setRecordStatus(InoutConstant.RECORD_STATUS_ADD);
+ data.setProgress(InoutConstant.PROGRESS_RECORD);
+ if (InoutConstant.STATUS_NONE.equals(data.getCheckStatus())) {
+ data.setCheckStatus(InoutConstant.STATUS_PASS);
+ }
- String loginUser = ContextUtil.getLoginUserCName();
- data.setRegisterUser(loginUser);
- data.setFullWeightUser(loginUser);
- data.setEmptyWeightUser(loginUser);
- data.setHandleUser(loginUser);
- data.setCompleteUser(loginUser);
- if (null == data.getCompleteTime()) {
- data.setCompleteTime(new Date());
- }
- // 娉ㄥ唽鏃堕棿姣斿畬鎴愭椂闂存棭涓�涓皬鏃�
- data.setRegisterTime(DateUtil.getNewByMinute(new Date(), -60));
+ String loginUser = ContextUtil.getLoginUserCName();
+ data.setRegisterUser(loginUser);
+ data.setFullWeightUser(loginUser);
+ data.setEmptyWeightUser(loginUser);
+ data.setHandleUser(loginUser);
+ data.setCompleteUser(loginUser);
+ if (null == data.getCompleteTime()) {
+ data.setCompleteTime(new Date());
+ }
+ // 娉ㄥ唽鏃堕棿姣斿畬鎴愭椂闂存棭涓�涓皬鏃�
+ data.setRegisterTime(DateUtil.getNewByMinute(new Date(), -60));
- if (StringUtils.isEmpty(data.getUserId())) {
- data.setUserId(InoutConstant.DEFAULT_ID_CARD);
- }
- if (null == data.getIntelCard()) {
- data.setIntelCard(data.getUserId());
- }
- if (null != data.getCheckItems()) {
- data.setCheckUser(loginUser);
- }
+ if (StringUtils.isEmpty(data.getUserId())) {
+ data.setUserId(InoutConstant.DEFAULT_ID_CARD);
+ }
+ if (null == data.getIntelCard()) {
+ data.setIntelCard(data.getUserId());
+ }
+ if (null != data.getCheckItems()) {
+ data.setCheckUser(loginUser);
+ }
- // 淇濆瓨妫�娴嬮」鐩�
- if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ // 淇濆瓨妫�娴嬮」鐩�
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
- if (null == data.getFullWeightTime()) {
- data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -50));
- }
- if (null == data.getHandleEnd()) {
- data.setHandleEnd(DateUtil.getNewByMinute(new Date(), -40));
- }
- if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -10));
- }
+ if (null == data.getFullWeightTime()) {
+ data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -50));
+ }
+ if (null == data.getHandleEnd()) {
+ data.setHandleEnd(DateUtil.getNewByMinute(new Date(), -40));
+ }
+ if (null == data.getEmptyWeightTime()) {
+ data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -10));
+ }
- // 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
- CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(),data.getCheckItems());
- if (null != checkResult) {
+ // 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
+ CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
+ if (null != checkResult) {
// if (null == data.getWet())data.setWet(checkResult.getWet());
// if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
- }
- } else {
- if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -50));
- }
- if (null == data.getHandleEnd()) {
- data.setHandleEnd(DateUtil.getNewByMinute(new Date(), -40));
- }
- if (null == data.getFullWeightTime()) {
- data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -10));
- }
- }
+ }
+ } else {
+ if (null == data.getEmptyWeightTime()) {
+ data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -50));
+ }
+ if (null == data.getHandleEnd()) {
+ data.setHandleEnd(DateUtil.getNewByMinute(new Date(), -40));
+ }
+ if (null == data.getFullWeightTime()) {
+ data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -10));
+ }
+ }
- // 娣诲姞琛ュ崟鏁版嵁
- String msg = inoutService.insertData(data);
+ // 娣诲姞琛ュ崟鏁版嵁
+ String msg = inoutService.insertData(data);
- // 鍒濆鍖栭獙璇佸嚭鍏ュ簱搴撳瓨
- commonService.initInoutDepotStore(data);
- return msg;
- }
+ // 鍒濆鍖栭獙璇佸嚭鍏ュ簱搴撳瓨
+ commonService.initInoutDepotStore(data);
+ return msg;
+ }
- /**
- * 淇敼鎿嶄綔 淇敼閫昏緫璇存槑锛氫慨鏀规暟鎹渶瑕佽幏鍙栧師鏁版嵁搴撲腑鐨勬暟鎹繘琛屽姣斻��
- *
- * @param data
- * @return
- * @throws Exception
- */
- @javax.transaction.Transactional(rollbackOn = Exception.class)
- public String updateInoutData(InoutData data) throws Exception {
+ /**
+ * 淇敼鎿嶄綔 淇敼閫昏緫璇存槑锛氫慨鏀规暟鎹渶瑕佽幏鍙栧師鏁版嵁搴撲腑鐨勬暟鎹繘琛屽姣斻��
+ *
+ * @param data
+ * @return
+ * @throws Exception
+ */
+ @javax.transaction.Transactional(rollbackOn = Exception.class)
+ public String updateInoutData(InoutData data) throws Exception {
- if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
- return "绯荤粺锛氬凡缁忓垹闄ょ殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
- }
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return "绯荤粺锛氬紓甯哥粓姝㈢殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
- }
+ 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 inoutService.updateData(data);
- }
+ // 濡傛灉娴佺▼鏈粨鏉燂紝鍙洿鏂版暟鎹�
+ if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+ return inoutService.updateData(data);
+ }
- // 濡傛灉鏄凡缁忓畬鎴愮殑鏁版嵁锛屽厛鑾峰彇鍒颁慨鏀圭洿鎺ョ殑鏁版嵁鏍规嵁鏁版嵁杩涜瀵规瘮
- InoutParam param = new InoutParam();
- param.setId(data.getId());
- param.setCompanyId(data.getCompanyId());
- param.setType(data.getType());
- InoutData record = inoutService.inoutQueryById(param);
+ // 濡傛灉鏄凡缁忓畬鎴愮殑鏁版嵁锛屽厛鑾峰彇鍒颁慨鏀圭洿鎺ョ殑鏁版嵁鏍规嵁鏁版嵁杩涜瀵规瘮
+ InoutParam param = new InoutParam();
+ param.setId(data.getId());
+ param.setCompanyId(data.getCompanyId());
+ param.setType(data.getType());
+ InoutData record = inoutService.inoutQueryById(param);
- if (null == record) {
- return "褰撳墠淇敼鏁版嵁宸茬粡涓嶅瓨鍦紒";
- }
+ if (null == record) {
+ return "褰撳墠淇敼鏁版嵁宸茬粡涓嶅瓨鍦紒";
+ }
- // 閬垮厤鏁版嵁搴撲腑鐨勬暟鎹凡缁忚鍏朵粬浜轰慨鏀�
- if (InoutConstant.RECORD_STATUS_DEL.equals(record.getRecordStatus())) {
- return "绯荤粺锛氬凡缁忓垹闄ょ殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
- }
- if (InoutConstant.RECORD_STATUS_ERROR.equals(record.getRecordStatus())) {
- return "绯荤粺锛氬紓甯哥粓姝㈢殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
- }
+ // 閬垮厤鏁版嵁搴撲腑鐨勬暟鎹凡缁忚鍏朵粬浜轰慨鏀�
+ if (InoutConstant.RECORD_STATUS_DEL.equals(record.getRecordStatus())) {
+ return "绯荤粺锛氬凡缁忓垹闄ょ殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
+ }
+ if (InoutConstant.RECORD_STATUS_ERROR.equals(record.getRecordStatus())) {
+ return "绯荤粺锛氬紓甯哥粓姝㈢殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
+ }
- // 淇濆瓨妫�娴嬮」鐩�
- if (InoutConstant.TYPE_IN.equals(data.getType())) {
- // 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
- CheckUpdateResult checkResult = checkStandardManager
- .updateCheckItems(data.getCheckId(), data.getCompanyId(),
- data.getCheckItems());
- if (null != checkResult) {
+ // 淇濆瓨妫�娴嬮」鐩�
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ // 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
+ CheckUpdateResult checkResult = checkStandardManager
+ .updateCheckItems(data.getCheckId(), data.getCompanyId(),
+ data.getCheckItems());
+ if (null != checkResult) {
// if (null == data.getWet())
// data.setWet(checkResult.getWet());
// if (null == data.getImpurity())
// data.setImpurity(checkResult.getImpurity());
- }
- }
+ }
+ }
- // 鏇存柊鏁版嵁
- inoutService.updateData(data);
- // this.autoCheckByUpdate(data, record);
- return null;
- }
+ // 鏇存柊鏁版嵁
+ inoutService.updateData(data);
+ // this.autoCheckByUpdate(data, record);
+ return null;
+ }
- /**
- * 鍒犻櫎鎿嶄綔 鍒犻櫎鏁版嵁涓鸿蒋鍒犻櫎锛屽垹闄ゆ暟鎹悗闇�瑕佹牴鎹垹闄ゆ儏鍐佃仈鍔ㄥ簱瀛樼瓑淇℃伅
- *
- * @param data
- * @param selected
- * 鏄惁宸茬粡鏌ヨ杩囨暟鎹�
- * @return
- * @throws Exception
- */
- @Transactional
- public String delInoutData(InoutData data, boolean selected)
- throws Exception {
+ /**
+ * 鍒犻櫎鎿嶄綔 鍒犻櫎鏁版嵁涓鸿蒋鍒犻櫎锛屽垹闄ゆ暟鎹悗闇�瑕佹牴鎹垹闄ゆ儏鍐佃仈鍔ㄥ簱瀛樼瓑淇℃伅
+ *
+ * @param data
+ * @param selected 鏄惁宸茬粡鏌ヨ杩囨暟鎹�
+ * @return
+ * @throws Exception
+ */
+ @Transactional
+ public String delInoutData(InoutData data, boolean selected)
+ throws Exception {
- // 閬垮厤椤甸潰缂撳瓨棣栧厛鑾峰彇鏁版嵁搴撲腑鏈�鏂扮殑褰撳墠鏁版嵁淇℃伅
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- param.setMsg(" [" + ContextUtil.getLoginUserCName() + "]鎵ц鍒犻櫎锛屽師鍥狅細"
- + data.getRemarks());
+ // 閬垮厤椤甸潰缂撳瓨棣栧厛鑾峰彇鏁版嵁搴撲腑鏈�鏂扮殑褰撳墠鏁版嵁淇℃伅
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ param.setMsg(" [" + ContextUtil.getLoginUserCName() + "]鎵ц鍒犻櫎锛屽師鍥狅細"
+ + data.getRemarks());
- if (!selected) {
- data = inoutService.inoutQueryById(param);
+ if (!selected) {
+ data = inoutService.inoutQueryById(param);
- if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
- return "宸茬粡鍒犻櫎鐨勬暟鎹紝涓嶆敮鎸侀噸澶嶅垹闄わ紒";
- }
- if (InoutConstant.RECORD_STATUS_ERROR
- .equals(data.getRecordStatus())) {
- return "褰撳墠鏁版嵁宸茬粡琚爣璁颁负寮傚父锛屼笉鏀寔鍒犻櫎锛�";
- }
- }
+ if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
+ return "宸茬粡鍒犻櫎鐨勬暟鎹紝涓嶆敮鎸侀噸澶嶅垹闄わ紒";
+ }
+ if (InoutConstant.RECORD_STATUS_ERROR
+ .equals(data.getRecordStatus())) {
+ return "褰撳墠鏁版嵁宸茬粡琚爣璁颁负寮傚父锛屼笉鏀寔鍒犻櫎锛�";
+ }
+ }
- // 鎵ц鍒犻櫎
- param.setProgress(InoutConstant.PROGRESS_RECORD);
- param.setRecordStatus(InoutConstant.RECORD_STATUS_DEL);
- param.setType(data.getType());
- inoutService.deleteData(param);
+ // 鎵ц鍒犻櫎
+ param.setProgress(InoutConstant.PROGRESS_RECORD);
+ param.setRecordStatus(InoutConstant.RECORD_STATUS_DEL);
+ param.setType(data.getType());
+ inoutService.deleteData(param);
- // 濡傛灉娴佺▼鏈粨鏉燂紝鐩存帴鍒犻櫎锛屼笉鐗垫壇鍒拌仈鍔ㄨ皟鏁�
- if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return null;
- }
- return null;
- }
+ // 濡傛灉娴佺▼鏈粨鏉燂紝鐩存帴鍒犻櫎锛屼笉鐗垫壇鍒拌仈鍔ㄨ皟鏁�
+ if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+ return null;
+ }
+ return null;
+ }
- /**
- * 寮傚父缁堟鎿嶄綔 璁剧疆寮傚父 涓轰簡閬垮厤椤甸潰鏁版嵁缂撳瓨锛岄渶瑕侀噸鏂拌幏鍙栨渶鏂版暟鎹垽鏂�
- *
- * @param data
- * @return
- * @throws Exception
- */
- @Transactional
- public String errorInoutData(InoutData data){
+ /**
+ * 寮傚父缁堟鎿嶄綔 璁剧疆寮傚父 涓轰簡閬垮厤椤甸潰鏁版嵁缂撳瓨锛岄渶瑕侀噸鏂拌幏鍙栨渶鏂版暟鎹垽鏂�
+ *
+ * @param data
+ * @return
+ * @throws Exception
+ */
+ @Transactional
+ public String errorInoutData(InoutData data) {
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- param.setMsg(" [" + ContextUtil.getLoginUserCName() + "]鎵ц寮傚父缁堟锛屽師鍥狅細"
- + data.getRemarks());
- data = inoutService.inoutQueryById(param);
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ param.setMsg(" [" + ContextUtil.getLoginUserCName() + "]鎵ц寮傚父缁堟锛屽師鍥狅細"
+ + data.getRemarks());
+ data = inoutService.inoutQueryById(param);
- 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 "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
- }
+ 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 "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
+ }
- return inoutService.inoutStop(param);
- }
+ return inoutService.inoutStop(param);
+ }
- /**
- * 蹇�熺粨鏉熸搷浣� 娴佺▼娌℃湁缁撴潫鐨勫崟鎹繘琛岀粨鏉�
- *
- * @param data
- * @return
- */
- public String completeInoutData(InoutData data) throws Exception {
- 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 "娴佺▼宸插畬鎴愮殑鏁版嵁锛屼笉鏀寔瀹屾垚锛�";
- }
+ /**
+ * 蹇�熺粨鏉熸搷浣� 娴佺▼娌℃湁缁撴潫鐨勫崟鎹繘琛岀粨鏉�
+ *
+ * @param data
+ * @return
+ */
+ public String completeInoutData(InoutData data) throws Exception {
+ 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 "娴佺▼宸插畬鎴愮殑鏁版嵁锛屼笉鏀寔瀹屾垚锛�";
+ }
- // 浠庢柊鏌ヨ鏁版嵁
- InoutParam param = new InoutParam();
- param.setId(data.getId());
- param.setCompanyId(data.getCompanyId());
- param.setType(data.getType());
- InoutData cuData = inoutService.inoutProgressQuery(param);
- if (null == cuData) {
- return "褰撳墠杞﹁締娴佺▼鐘舵�佸凡缁忓彉鍖栵紝璇峰埛鏂伴〉闈㈤噸鏂版搷浣滐紒";
- }
- if (!cuData.getProgress().equals(data.getProgress())) {
- return "褰撳墠杞﹁締娴佺▼鐘舵�佸凡缁忓彉鍖栵紝璇峰埛鏂伴〉闈㈤噸鏂版搷浣滐紒";
- }
+ // 浠庢柊鏌ヨ鏁版嵁
+ InoutParam param = new InoutParam();
+ param.setId(data.getId());
+ param.setCompanyId(data.getCompanyId());
+ param.setType(data.getType());
+ InoutData cuData = inoutService.inoutProgressQuery(param);
+ if (null == cuData) {
+ return "褰撳墠杞﹁締娴佺▼鐘舵�佸凡缁忓彉鍖栵紝璇峰埛鏂伴〉闈㈤噸鏂版搷浣滐紒";
+ }
+ if (!cuData.getProgress().equals(data.getProgress())) {
+ return "褰撳墠杞﹁締娴佺▼鐘舵�佸凡缁忓彉鍖栵紝璇峰埛鏂伴〉闈㈤噸鏂版搷浣滐紒";
+ }
- if (null == data.getCompleteTime()) {
- return "璇峰～鍐欏畬鎴愭椂闂达紒锛�";
- }
- if (StringUtils.isEmpty(data.getDepotId())) {
- return "璇峰～鍐欎粨搴撲俊鎭紒";
- }
+ if (null == data.getCompleteTime()) {
+ return "璇峰～鍐欏畬鎴愭椂闂达紒锛�";
+ }
+ if (StringUtils.isEmpty(data.getDepotId())) {
+ return "璇峰～鍐欎粨搴撲俊鎭紒";
+ }
// if (StringUtils.isEmpty(data.getCustomerId())) {
// return "璇峰～鍐欏線鏉ュ崟浣嶄俊鎭紒";
// }
- if (StringUtils.isEmpty(data.getFoodYear())) {
- return "璇峰～鍐欑伯椋熷勾浠戒俊鎭紒";
- }
- if (StringUtils.isEmpty(data.getFoodVariety())) {
- return "璇峰～鍐欑伯椋熷搧绉嶄俊鎭紒";
- }
+ if (StringUtils.isEmpty(data.getFoodYear())) {
+ return "璇峰～鍐欑伯椋熷勾浠戒俊鎭紒";
+ }
+ if (StringUtils.isEmpty(data.getFoodVariety())) {
+ return "璇峰～鍐欑伯椋熷搧绉嶄俊鎭紒";
+ }
- if (data.getSettleWeight() <= 0) {
- return "璇峰～鍐欑粨绠楀噣閲嶄俊鎭紒";
- }
+ if (data.getSettleWeight() <= 0) {
+ return "璇峰～鍐欑粨绠楀噣閲嶄俊鎭紒";
+ }
- String msg = inoutService.quickComplete(data);
+ String msg = inoutService.quickComplete(data);
- if (null == msg) {
- data.setProgress(InoutConstant.PROGRESS_RECORD);
- commonService.initInoutDepotStore(data);
- }
- return msg;
- }
+ if (null == msg) {
+ data.setProgress(InoutConstant.PROGRESS_RECORD);
+ commonService.initInoutDepotStore(data);
+ }
+ return msg;
+ }
- public void initLpr(InoutConf conf) {
- inoutDeviceManager.initLpr(conf);
- }
-
- /**
- * 鑾峰彇鍑哄叆搴撹澶囬厤缃俊鎭�
- *
- * @param companyId
- * @param deptId
- * @return
- */
- public List<InoutConf> getListInoutConf(String companyId, String deptId) {
- return inoutManagerService.getCacheInoutConf(companyId, deptId);
- }
+ public void initLpr(InoutConf conf) {
+ inoutDeviceManager.initLpr(conf);
+ }
- /**
- * 鎿嶄綔閬撻椄璁惧
- * @param param
- * @return
- */
- public PageResponse<List<CheckItemData>> gateCtrl(InoutGateDto param){
+ /**
+ * 鑾峰彇鍑哄叆搴撹澶囬厤缃俊鎭�
+ *
+ * @param companyId
+ * @param deptId
+ * @return
+ */
+ public List<InoutConf> getListInoutConf(String companyId, String deptId) {
+ return inoutManagerService.getCacheInoutConf(companyId, deptId);
+ }
- return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "", null);
- }
+ /**
+ * 鎿嶄綔閬撻椄璁惧
+ *
+ * @param param
+ * @return
+ */
+ public PageResponse<List<CheckItemData>> gateCtrl(InoutGateDto param) {
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "", null);
+ }
+
+ /**
+ * 鍑哄叆搴撴敞鍐屾暟鎹彁浜わ紝鍏ュ簱鐧昏鍜屽嚭鍏ュ簱鐧昏浣跨敤鍚屼竴涓柟娉�
+ *
+ * @param data
+ * @return
+ * @throws Exception
+ */
+ public PageResponse<InoutData> submitRegisterInout(InoutData data) throws Exception {
+
+ //棣栧厛鍒ゆ柇娴佺▼涓槸鍚︽湁宸茬粡瀛樺湪鐨勮溅杈嗕俊鎭湭鎵ц瀹屾垚锛岀洿鎺ヤ粠鏁版嵁搴撲腑鏌ヨ
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setPlateNum(data.getPlateNum());
+ param.setIntelCard(data.getIntelCard());
+ param.setType(data.getType());
+ param.setStart(DateUtil.getNewByDay(null, -10));
+
+ int num = inoutService.checkExist(param);
+ if (num > 0) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠杞︾墝鎴栨櫤鎱у崱鏈夋鍦ㄦ墽琛屾祦绋嬫湭缁撴潫锛岃鑱旂郴绠＄悊鍛�", data);
+ }
+
+
+ //鑾峰彇绯荤粺鍙傛暟閰嶇疆
+ InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
+ if (null == inoutSysConf) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鎻愮ず锛氬綋鍓嶅簱鍖烘湭閰嶇疆鍑哄叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳", data);
+ }
+
+ String curProgress = data.getProgress();
+
+ //鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
+ String nextProgress = getNextProgress(curProgress, data.getType(), inoutSysConf);
+ data.setRegisterTime(new Date());
+ data.setRegisterUser(ContextUtil.getLoginUserCName());
+ data.setProgress(nextProgress);
+
+ String msg = inoutService.insertData(data);
+
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ msg, data);
+ }
+
+ // 鎵ц闄勪欢淇℃伅
+ fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
+
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛", data);
+ }
+
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutRecordMapper.java b/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutRecordMapper.java
index 305a370..d60b2c6 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutRecordMapper.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutRecordMapper.java
@@ -97,9 +97,7 @@
* 鏇存柊鍑哄叆搴撴祦姘村疄鏃跺簱瀛�
*
* @param param
- * @return
-
- int updateCuStorage(@Param("param") InoutParam param);
+ * @return int updateCuStorage(@Param("param") InoutParam param);
*/
/**
@@ -120,24 +118,6 @@
void toComplete(@Param("param") InoutParam param);
/**
- * 鑾峰彇鍏ュ簱瀹屾垚閲�
- *
- * @param param
- * @return
-
- CommonData getInComplete(@Param("param") NoticeParam param);
- */
-
- /**
- * 鑾峰彇鍑哄簱瀹屾垚閲�
- *
- * @param param
- * @return
-
- CommonData getOutComplete(@Param("param") NoticeParam param);
- */
-
- /**
* 鑾峰彇娴佺▼鏈畬鎴愮殑娴佹按鏁版嵁
*
* @param page
@@ -154,4 +134,12 @@
* @return CommonData.numValue1
*/
CommonData sumRecordWeight(@Param("param") InoutParam param);
+
+ /**
+ * 鏍规嵁杞︾墝鍙峰拰鍗″彿鏌ヨ鏄惁鏈夋湭瀹屾垚鐨勬祦绋嬩俊鎭�
+ *
+ * @param param
+ * @return
+ */
+ int checkExist(@Param("param") InoutParam param);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
index d329fa8..791b08c 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
@@ -56,7 +56,7 @@
* @return 杩斿洖寮傚父淇℃伅锛屾甯歌繑鍥瀗ull
* @throws Exception
*/
- String insertData(InoutData data) throws Exception;
+ String insertData(InoutData data);
/**
* 鏇存柊鏁版嵁
@@ -236,4 +236,12 @@
* @return
*/
double sumRecordWeight(InoutParam param);
+
+ /**
+ * 鏁版嵁搴撴牴鎹溅鐗屽彿鍜屾櫤鎱у崱鍙锋槸鍚﹀凡缁忓瓨鍦�
+ *
+ * @param param
+ * @return
+ */
+ int checkExist(InoutParam param);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index c1396a9..88ab4fd 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -118,59 +118,44 @@
@Override
public String insertData(InoutData data) {
+ try {
+ data.setUpdateTime(new Date());
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
- // 鑾峰彇褰撳墠浠撳簱鐨勫疄闄呭簱瀛�
- if (StringUtils.isNotEmpty(data.getDepotId())) {
- if (null == data.getFoodYear() || null == data.getFoodType()) {
- Depot depot = commonService.getCacheDepot(data.getCompanyId(), data.getDepotId());
- if (null == data.getFoodYear()) {
- data.setFoodYear(depot.getFoodYear());
- }
- if (null == data.getFoodType()) {
- data.setFoodType(depot.getFoodType());
+ String id = this.createId(data.getRegisterTime(), data.getCompanyId());
+ if (StringUtils.isEmpty(data.getId())) {
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ data.setId("R_" + id);
+ } else if (InoutConstant.TYPE_OUT.equals(data.getType())) {
+ data.setId("C_" + id);
+ } else if (Constant.LOSS_OVER_OVER.equals(data.getType())) {
+ data.setId("R_" + id);
+ } else if (Constant.LOSS_OVER_LOSS.equals(data.getType())) {
+ data.setId("C_" + id);
+ } else {
+ data.setId("M_" + id);
}
}
- }
-
- if (null == data.getRegisterTime()) {
- data.setRegisterTime(new Date());
- }
-
- String id = this.createId(data.getRegisterTime(), data.getCompanyId());
-
- if (StringUtils.isEmpty(data.getId())) {
- if (InoutConstant.TYPE_IN.equals(data.getType())) {
- data.setId("R_" + id);
- } else if (InoutConstant.TYPE_OUT.equals(data.getType())) {
- data.setId("C_" + id);
- } else if (Constant.LOSS_OVER_OVER.equals(data.getType())) {
- data.setId("R_" + id);
- } else if (Constant.LOSS_OVER_LOSS.equals(data.getType())) {
- data.setId("C_" + id);
- } else {
- data.setId("M_" + id);
+ if (StringUtils.isEmpty(data.getCheckId())) {
+ data.setCheckId(id);
}
- }
- if (StringUtils.isEmpty(data.getCheckId())) {
- data.setCheckId(id);
- }
- if (null == data.getDeptId()) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- if (null == data.getUserName()) {
- data.setUserName("");
- }
- inoutMapper.insertData(data);
+ if (null == data.getUserName()) {
+ data.setUserName("");
+ }
- // 濡傛灉涓嶆槸鎵嬪姩琛ュ綍鐨勬暟鎹紝娣诲姞鍒扮紦瀛樹腑
- if (!InoutConstant.RECORD_STATUS_ADD.equals(data.getRecordStatus())) {
+ inoutMapper.insertData(data);
+
this.addInoutCache(data);
+
+ } catch (Exception e) {
+ log.error("------------鍑哄叆搴撴墽琛屼繚瀛樺嚭閿�---{}", e);
+ return "鍚庡彴寮傚父锛�" + e.getMessage();
}
+
return null;
}
@@ -234,9 +219,9 @@
List<InoutData> records = inoutMapper.pageRecordData(page, param);
//鍒ゆ柇鍏ュ簱閲嶉噺鏄惁涓虹┖锛屼负绌哄垯璧嬪�肩粨绠楅噸閲�
- if(records != null){
+ if (records != null) {
for (InoutData record : records) {
- if(record.getRecordWeight() == null || record.getRecordWeight() == 0.0){
+ if (record.getRecordWeight() == null || record.getRecordWeight() == 0.0) {
record.setRecordWeight(record.getSettleWeight());
}
}
@@ -677,6 +662,11 @@
return result.getNumValue1();
}
+ @Override
+ public int checkExist(InoutParam param) {
+ return inoutMapper.checkExist(param);
+ }
+
/**
* 鏈畬鎴愭祦绋嬪瓨鍏ョ紦瀛�
*
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutConfService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutConfService.java
index 5b68639..69581d2 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutConfService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutConfService.java
@@ -4,9 +4,11 @@
import com.ld.igds.models.InoutConf;
import com.ld.igds.models.InoutSysConf;
import com.ld.igds.util.ContextUtil;
+
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -64,42 +66,30 @@
return null;
}
- public List<InoutSysConf> getSysConfData(Map<String, Object> param) {
-
- Map<String, Object> args = new HashMap<String, Object>();
- String hql = " from " + InoutSysConf.class.getName()
- + " where companyId=:companyId and deptId=:deptId";
-
- args.put("companyId", ContextUtil.getCompanyId());
- String deptId = "";
- if (null != param) {
- deptId = (String) param.get("deptId");
- }
-
- if (StringUtils.isEmpty(deptId)) {
- deptId = ContextUtil.subDeptId(null);
- }
-
- args.put("deptId", deptId);
-
- return this.query(hql, args);
- }
-
public String saveSysConfData(InoutSysConf data) {
Session session = this.getSessionFactory().openSession();
try {
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setDeptId(ContextUtil.subDeptId(null));
- data.setCompanyId(ContextUtil.getCompanyId());
- session.save(data);
- } else {
- session.update(data);
- }
-
+ session.saveOrUpdate(data);
} finally {
session.flush();
session.close();
}
return null;
}
+
+ public InoutSysConf getSysConfData(String companyId, String deptId) {
+
+ String hql = " from " + InoutSysConf.class.getName()
+ + " where companyId=:companyId and deptId=:deptId";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", companyId);
+ args.put("deptId", deptId);
+
+ List<InoutSysConf> list = this.query(hql, args);
+
+ if(null == list || list.isEmpty()) return new InoutSysConf();
+
+ return list.get(0);
+ }
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java
index 0cde589..151307e 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java
@@ -188,14 +188,14 @@
InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(companyId, deptId);
- if(Constant.YN_Y.equals(inoutSysConf.getNoticeTagIn())){
- List<InoutNoticeIn> noticeInList = inoutManagerService.getUnComNoticeIn(companyId);
+ List<InoutNoticeIn> noticeInList = inoutManagerService.getUnComNoticeIn(companyId);
- if (noticeInList != null && noticeInList.size() > 0) {
- inoutManagerService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
- return "success";
- }
+ if (noticeInList != null && noticeInList.size() > 0) {
+ inoutManagerService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
+ return "success";
}
+
+
return "fail";
}
@@ -269,13 +269,11 @@
InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(companyId, deptId);
- if(Constant.YN_Y.equals(inoutSysConf.getNoticeTagOut())){
- List<InoutNoticeOut> noticeOutList = inoutManagerService.getUnComNoticeOut(companyId);
+ List<InoutNoticeOut> noticeOutList = inoutManagerService.getUnComNoticeOut(companyId);
- if (noticeOutList != null && noticeOutList.size() > 0) {
- inoutManagerService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
- return "success";
- }
+ if (noticeOutList != null && noticeOutList.size() > 0) {
+ inoutManagerService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
+ return "success";
}
return "fail";
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConf.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConf.view.xml
index adf01e6..a37f7ab 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConf.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConf.view.xml
@@ -8,7 +8,6 @@
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
- <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
@@ -22,26 +21,6 @@
<PropertyDef name="progressOut">
<Property></Property>
<Property name="label">鍑哄簱娴佺▼</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="noticeTagIn">
- <Property></Property>
- <Property name="label">鍏ュ簱閫氱煡鍗曞惎鐢�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("inoutSysConfPR#triggerYesOrNo").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="noticeTagOut">
- <Property></Property>
- <Property name="label">鍑哄簱閫氱煡鍗曞惎鐢�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("inoutSysConfPR#triggerYesOrNo").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="noticeWx">
@@ -81,19 +60,10 @@
</DataType>
</Model>
<View layout="padding:5;regionPadding:5">
- <ClientEvent name="onReady">var deptId = "${request.getParameter('deptId')}";
-
-//鏌ヨ
-query = function(){
- var data = {deptId:deptId};
- view.get("#dsMain").set("parameter",data).flushAsync();
-};
-query();</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataProvider">inoutSysConfPR#getSysConfData</Property>
<Property name="dataType">dtMain</Property>
- <Property name="loadMode">manual</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -132,20 +102,6 @@
<Property name="name">progressOut</Property>
<Property name="property">progressOut</Property>
<Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:3"/>
- <Control/>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">noticeTagIn</Property>
- <Property name="property">noticeTagIn</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:3"/>
- <Control/>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">noticeTagOut</Property>
- <Property name="property">noticeTagOut</Property>
<Editor/>
</AutoFormElement>
<Label layoutConstraint="colSpan:3"/>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConfPR.java b/igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConfPR.java
index 7988cab..eea934f 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConfPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConfPR.java
@@ -1,5 +1,6 @@
package com.ld.igds.m.view;
+import com.bstek.bdf2.core.business.IUser;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.ld.igds.constant.Constant;
@@ -8,6 +9,7 @@
import com.ld.igds.m.service.InoutCommonService;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.models.InoutSysConf;
+import com.ld.igds.util.ContextUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +17,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* 鍑哄叆搴撴祦绋嬮厤缃�
@@ -68,16 +69,9 @@
* @throws Exception
*/
@DataProvider
- public InoutSysConf getSysConfData(Map<String, Object> param) {
- List<InoutSysConf> list = inoutConfService.getSysConfData(param);
- InoutSysConf inoutSysConf;
- if (list.isEmpty()) {
- inoutSysConf = new InoutSysConf();
- saveSysConfData(inoutSysConf);
- } else {
- inoutSysConf = list.get(0);
- }
- return inoutSysConf;
+ public InoutSysConf getSysConfData() {
+ IUser u = ContextUtil.getLoginUser();
+ return inoutConfService.getSysConfData(u.getCompanyId(),ContextUtil.subDeptId(u));
}
/**
@@ -88,13 +82,21 @@
*/
@DataResolver
public String saveSysConfData(InoutSysConf data) {
+
+ if(null == data.getDeptId()){
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ if(null == data.getCompanyId()){
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+
inoutConfService.saveSysConfData(data);
-
-
+
+
InoutSysConf newData = new InoutSysConf();
- BeanUtils.copyProperties(data, newData);
+ BeanUtils.copyProperties(data, newData);
inoutManagerService.flushInoutSysConfCache(newData);
-
+
return null;
}
diff --git a/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java b/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
index 511c9c9..003eb33 100644
--- a/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
+++ b/igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java
@@ -3,7 +3,6 @@
import com.bstek.bdf2.core.model.DefaultCompany;
import com.bstek.dorado.annotation.Expose;
import com.ld.igds.common.CoreCommonService;
-import com.ld.igds.constant.Constant;
import com.ld.igds.constant.DepotStatus;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
@@ -208,16 +207,12 @@
for (InoutSysConf inoutSysConf : inoutSysConfList) {
// 鍒ゆ柇鍏ュ簱閫氱煡鍗曟槸鍚﹀惎鐢�
- if (Constant.YN_Y.equals(inoutSysConf.getNoticeTagIn())) {
- //鏇存柊鍏ュ簱閫氱煡鍗曞畬鎴愰噺
- inoutCommonService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
- }
+ //鏇存柊鍏ュ簱閫氱煡鍗曞畬鎴愰噺
+ inoutCommonService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
// 鍒ゆ柇鍑哄簱閫氱煡鍗曟槸鍚﹀惎鐢�
- if (Constant.YN_Y.equals(inoutSysConf.getNoticeTagOut())) {
- //鏇存柊鍑哄簱閫氱煡鍗曞畬鎴愰噺
- inoutCommonService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
- }
+ //鏇存柊鍑哄簱閫氱煡鍗曞畬鎴愰噺
+ inoutCommonService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
}
}
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 4dfa0b2..28c4f73 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -14,37 +14,35 @@
TYPE_ as type,
PROGRESS_ as progress,
RECORD_STATUS_ as recordStatus,
+ CUSTOMER_NAME_ as customerName,
+ INTEL_CARD_ as intelCard,
REGISTER_TIME_ as registerTime,
REGISTER_USER_ as registerUser,
USER_NAME_ as userName,
+ USER_CONTACT_ as userContact,
+ USER_ID_ as userId,
USER_BIRTHDAY_ as userBirthday,
USER_SEX_ as userSex,
USER_NATION_ as userNation,
- USER_ID_ as userId,
- USER_CONTACT_ as userContact,
USER_ADDRESS_ as userAddress,
- CUR_STORAGE_ as curStorage,
- INTEL_CARD_ as intelCard,
PLATE_NUM_ as plateNum,
TRANS_TYPE_ as transType,
- SPEC_TYPE_ as specType,
- CUSTOMER_ID_ as customerId,
- CUSTOMER_NAME_ as customerName,
FOOD_VARIETY_ as foodVariety,
FOOD_TYPE_ as foodType,
FOOD_LEVEL_ as foodLevel,
+ FOOD_LOCATION_ID_ as foodLocationId,
FOOD_LOCATION_ as foodLocation,
FOOD_YEAR_ as foodYear,
CHECK_STATUS_ as checkStatus,
CHECK_USER_ as checkUser,
+ CHECK_TIME_ as checkTime,
+ SAMPLE_USER_ as sampleUser,
+ SAMPLE_TIME_ as sampleTime,
+ SAMPLE_TYPE_ as sampleType,
CHECK_ID_ as checkId,
- IMPURITY_ as impurity,
- WET_ as wet,
- DE_IMPURITY_ as deImpurity,
- DE_WET_ as deWet,
- DE_HANDLE_ as deHandle,
- DE_OTHER_ as deOther,
- DE_SUM_ as deSum,
+ DE_CHECK_ as deCheck,
+ ADD_CHECK_ as addCheck,
+ jjlx as jjlx,
FULL_WEIGHT_ as fullWeight,
FULL_WEIGHT_TIME_ as fullWeightTime,
FULL_WEIGHT_USER_ as fullWeightUser,
@@ -52,16 +50,22 @@
EMPTY_WEIGHT_TIME_ as emptyWeightTime,
EMPTY_WEIGHT_USER_ as emptyWeightUser,
NET_WEIGHT_ as netWeight,
+ DE_HANDLE_ as deHandle,
+ DE_PACKAGE_ as dePackage,
+ DE_OTHER_ as deOther,
+ DE_OTHER_INTO_ as deOtherInfo,
SETTLE_WEIGHT_ as settleWeight,
RECORD_WEIGHT_ as recordWeight,
PRICE_ as price,
SETTLE_MONEY_ as settleMoney,
- HANDLE_START_ as handleStart,
- HANDLE_END_ as handleEnd,
+ SETTLE_ID_ as settleId,
HANDLE_USER_ as handleUser,
COMPLETE_TIME_ as completeTime,
COMPLETE_USER_ as completeUser,
- REMARKS_ as remarks
+ REMARKS_ as remarks,
+ bzw as bzw,
+ dbz as dbz,
+ bzbjs as bzbjs
</sql>
<!-- 鏍规嵁鏉′欢鏌ヨ锛屾暟鎹繀椤绘槸娴佺▼涓殑鏁版嵁 -->
@@ -262,7 +266,7 @@
</update>
- <!-- 鐧昏鏃跺�欐彃鍏ュ綋鍓嶅簱瀛樼殑鍊糲urStorage 涔嬪悗涓嶅仛鏇存敼 -->
+ <!-- 鏂板鏁版嵁 -->
<insert id="insertData" parameterType="com.ld.igds.inout.dto.InoutData">
insert into
D_INOUT_RECORD(
@@ -274,37 +278,35 @@
TYPE_,
PROGRESS_,
RECORD_STATUS_,
+ CUSTOMER_NAME_,
+ INTEL_CARD_,
REGISTER_TIME_,
REGISTER_USER_,
USER_NAME_,
+ USER_CONTACT_,
+ USER_ID_,
USER_BIRTHDAY_,
USER_SEX_,
USER_NATION_,
- USER_ID_,
- USER_CONTACT_,
USER_ADDRESS_,
- CUR_STORAGE_,
- INTEL_CARD_,
PLATE_NUM_,
TRANS_TYPE_,
- SPEC_TYPE_,
- CUSTOMER_ID_,
- CUSTOMER_NAME_,
FOOD_VARIETY_,
FOOD_TYPE_,
FOOD_LEVEL_,
+ FOOD_LOCATION_ID_,
FOOD_LOCATION_,
FOOD_YEAR_,
CHECK_STATUS_,
CHECK_USER_,
+ CHECK_TIME_,
+ SAMPLE_USER_,
+ SAMPLE_TIME_,
+ SAMPLE_TYPE_,
CHECK_ID_,
- IMPURITY_,
- WET_,
- DE_IMPURITY_,
- DE_WET_,
- DE_HANDLE_,
- DE_OTHER_,
- DE_SUM_,
+ DE_CHECK_,
+ ADD_CHECK_,
+ jjlx,
FULL_WEIGHT_,
FULL_WEIGHT_TIME_,
FULL_WEIGHT_USER_,
@@ -312,17 +314,23 @@
EMPTY_WEIGHT_TIME_,
EMPTY_WEIGHT_USER_,
NET_WEIGHT_,
+ DE_HANDLE_,
+ DE_PACKAGE_,
+ DE_OTHER_,
+ DE_OTHER_INTO_,
SETTLE_WEIGHT_,
RECORD_WEIGHT_,
PRICE_,
SETTLE_MONEY_,
- HANDLE_START_,
- HANDLE_END_,
+ SETTLE_ID_,
HANDLE_USER_,
COMPLETE_TIME_,
COMPLETE_USER_,
REMARKS_,
- SETTLE_TAG_
+ bzw,
+ dbz,
+ bzbjs,
+ UPDATE_TIME_
)
values
(
@@ -334,37 +342,35 @@
#{data.type},
#{data.progress},
#{data.recordStatus},
+ #{data.customerName},
+ #{data.intelCard},
#{data.registerTime},
#{data.registerUser},
#{data.userName},
+ #{data.userContact},
+ #{data.userId},
#{data.userBirthday},
#{data.userSex},
#{data.userNation},
- #{data.userId},
- #{data.userContact},
#{data.userAddress},
- #{data.curStorage},
- #{data.intelCard},
#{data.plateNum},
#{data.transType},
- #{data.specType},
- #{data.customerId},
- #{data.customerName},
#{data.foodVariety},
#{data.foodType},
#{data.foodLevel},
+ #{data.foodLocationId},
#{data.foodLocation},
#{data.foodYear},
#{data.checkStatus},
#{data.checkUser},
+ #{data.checkTime},
+ #{data.sampleUser},
+ #{data.sampleTime},
+ #{data.sampleType},
#{data.checkId},
- #{data.impurity},
- #{data.wet},
- #{data.deImpurity},
- #{data.deWet},
- #{data.deHandle},
- #{data.deOther},
- #{data.deSum},
+ #{data.deCheck},
+ #{data.addCheck},
+ #{data.jjlx},
#{data.fullWeight},
#{data.fullWeightTime},
#{data.fullWeightUser},
@@ -372,17 +378,23 @@
#{data.emptyWeightTime},
#{data.emptyWeightUser},
#{data.netWeight},
+ #{data.deHandle},
+ #{data.dePackage},
+ #{data.deOther},
+ #{data.deOtherInfo},
#{data.settleWeight},
#{data.recordWeight},
#{data.price},
#{data.settleMoney},
- #{data.handleStart},
- #{data.handleEnd},
+ #{data.settleId},
#{data.handleUser},
#{data.completeTime},
#{data.completeUser},
#{data.remarks},
- #{data.settleTag}
+ #{data.bzw},
+ #{data.dbz},
+ #{data.bzbjs},
+ #{data.updateTime}
)
</insert>
@@ -520,4 +532,20 @@
</if>
</select>
+ <!--鏍规嵁杞︾墝鍜屽崱鍙烽獙璇佹槸鍚︽湁閲嶅淇℃伅-->
+ <select id="checkExist" parameterType="com.ld.igds.inout.dto.InoutParam">
+ select count(1)
+ from
+ D_INOUT_RECORD
+ WHERE COMPANY_ID_ = #{param.companyId}
+ AND TYPE_ = #{param.type}
+ AND (PLATE_NUM_ = #{param.plateNum} or INTEL_CARD_ = #{param.intelCard})
+ AND PROGRESS_ != 'RECORD'
+ AND RECORD_STATUS_ != 'ERROR'
+ AND RECORD_STATUS_ != 'DEL'
+ <if test="param.start != null">
+ AND REGISTER_TIME_ <![CDATA[ > ]]> #{param.start}
+ </if>
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-register.js b/igds-web/src/main/resources/static/admin/inout/in-register.js
index db6dead..b33dec3 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-register.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-register.js
@@ -78,9 +78,7 @@
layer.close(index);
var data = json.content;
if (data === "not found") {
- layer.alert("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�", {
- offset: ['300px', '300px']
- });
+ alertError("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�");
return;
}
// 涓存椂璧嬪��
@@ -100,16 +98,15 @@
}
},
error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紒", {
- offset: ['300px', '300px']
- });
layer.close(index);
+ alertError("韬唤璇佽鍙栧け璐ワ紒");
}
});
}
//浣跨敤鎻掍欢璇诲彇鏅烘収鍗″彿
function flushICCard() {
+ var index = layer.load();
$("#intelCard").val(null);
$.ajax({
type: "GET",
@@ -120,23 +117,25 @@
jsonp: "callback",
jsonpCallback: "jsonpCallback",
success: function (json) {
+ layer.close(index);
//console.log(json);
var data = json.no;
//console.log(data);
if (data === "not found") {
- layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
+ alertError("璇烽噸鏂拌鍗★紒");
} else {
$("#intelCard").val(data);
}
},
error: function () {
- layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
+ layer.close(index);
+ alertError("IC鍗¤鍙栧嚭閿欙紒");
}
});
}
//璇诲彇杞︾墝鍙�
-function flushPlateNum() {
+function getPlateNum() {
var index = layer.load();
$.ajax({
type: "POST",
@@ -146,26 +145,16 @@
data: JSON.stringify(lprDto),
success: function (result) {
if (result.code != "0000") {
- layer.alert(result.msg, {
- offset: ['300px', '300px']
- });
+ alertError(result.msg);
} else {
- if (result.data.errorMsg) {
- layer.alert(result.data.errorMsg, {
- offset: ['300px', '300px']
- });
- } else {
- $("#plateNum").val(result.data.plateNum);
- $("#plateNum2").val(result.data.plateNum);
- }
+ $("#plateNum").val(result.data.plateNum);
+ $("#plateNum2").val(result.data.plateNum);
}
layer.close(index);
},
error: function () {
layer.close(index);
- layer.alert("杞︾墝璇嗗埆澶辫触锛�", {
- offset: ['300px', '300px']
- });
+ alertError("杞︾墝璇嗗埆澶辫触锛�");
}
});
}
@@ -183,15 +172,15 @@
function submit() {
var data = form.val("form-data");
if (!data.userName) {
- notify("鎵胯繍浜轰俊鎭笉鑳戒负绌�", null);
+ alertError("鎵胯繍浜轰俊鎭笉鑳戒负绌�");
return;
}
if (!data.plateNum) {
- notify("杞︾墝鍙蜂笉鑳戒负绌�", null);
+ alertError("杞︾墝鍙蜂笉鑳戒负绌�");
return;
}
if (!data.userId) {
- notify("韬唤璇佸彿涓嶈兘涓虹┖", null);
+ alertError("韬唤璇佸彿涓嶈兘涓虹┖");
return;
}
@@ -214,14 +203,12 @@
data: JSON.stringify(snapData),
success: function (result) {
if (result.code != "0000") {
- layer.alert(result.msg);
+ alertError(result.msg);
submitData(data);
} else {
snapData = result.data;
-
$("#pz-img").addClass("kccz-r-img-red");
$("#pz-text").text("宸叉媿鐓�");
-
submitData(data);
}
},
@@ -235,66 +222,28 @@
//鎵ц淇濆瓨鏁版嵁
function submitData(data) {
var index = layer.load();
-
var files = [{
fileName: snapData.fileName1
}];
data.files = files;
-
$.ajax({
type: "POST",
- url: "../../basic/inout/inout-next-step",
+ url: "../../basic/inout/submit-register",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(data),
success: function (result) {
layer.close(index);
if (result.code != "0000") {
- notify(result.msg, result.data);
+ notifyProgress(result.msg, result.data);
} else {
- notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
- // 閲嶇疆椤甸潰
+ notifyProgress("鏁版嵁鎻愪氦鎴愬姛", result.data);
resetForm();
}
},
error: function () {
layer.close(index);
- layer.alert("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
}
});
-}
-
-/**
- * 寮瑰嚭鎻愰啋妗�
- * @param msg 鎻愰啋淇℃伅
- * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
- */
-function notify(msg, data) {
- if (data) {
- //璧嬪��
- $("#resultMsg").text(msg);
- $("#resultUserName").text(data.userName);
- $("#resultPlateNum").text(data.plateNum);
- if ("IN" == data.type) {
- $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
- } else {
- $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
- }
- $("#resultIntelCard").text(data.intelCard);
-
- layer.open({
- type: 1,
- offset: ['150px', '200px'],
- area: '450px;',
- shade: 0.8,
- id: 'dialog_notify_info',
- btn: ['纭畾'],
- content: $('#dialog-from-notify'),
- yes: function (index) {
- layer.closeAll();
- }
- });
- } else {
- layer.alert(msg, {offset: ['300px', '300px']});
- }
}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-register20220529.js b/igds-web/src/main/resources/static/admin/inout/in-register20220529.js
new file mode 100644
index 0000000..58a76fd
--- /dev/null
+++ b/igds-web/src/main/resources/static/admin/inout/in-register20220529.js
@@ -0,0 +1,359 @@
+//褰撳墠鑺傜偣 鍏ュ簱鐧昏
+var layer;
+var form;
+var snapData;//鐧昏鐓х墖
+
+$(function () {
+ layui.use(['layer', 'laydate', 'form', 'util'], function () {
+ var util = layui.util;
+ var laydate = layui.laydate;
+ layer = layui.layer;
+ form = layui.form;
+ laydate.render({
+ elem: '#userBirthday'
+ });
+
+ // 鍙充笅瑙掓坊鍔犲浐瀹氫俊鎭�
+ util.fixbar({
+ bar1: true,
+ css: {
+ right: 10,
+ bottom: 20
+ },
+ bgcolor: '#53adce',
+ click: function (type) {
+ if (type === 'bar1') {
+ layer.closeAll();
+ layer.open({
+ type: 2,
+ title: false,
+ shadeClose: true,
+ shade: 0.3,
+ closeBtn: 2,
+ offset: ['50px','50px'],
+ area: ['1000px', '640px'],
+ content: '../../basic/inout/inout-progress?type=' + type + "&t=" + Math.random()
+ });
+ }
+ }
+ });
+ });
+
+ //鏄剧ず鍏ュ簱娴佺▼
+ showProgress();
+
+ var rightH = $(".rkbk-left-wrap").height();
+ $(".rkbk-right-wrap").height(rightH);
+
+ $(window).resize(function () {
+ var rightH = $(".rkbk-left-wrap").height();
+ $(".rkbk-right-wrap").height(rightH);
+ });
+
+ // 鍒濆鍖朩ebSocket
+ initInoutWS(deptId, bizType, progress, userId);
+});
+
+window.onload = function () {
+ // 鍔犺浇瑙嗛
+ initVideo(lprDto, null, null);
+};
+
+//鎺у埗娴佺▼鐜妭鏄剧ず
+function showProgress() {
+ if (!inoutProgress) {
+ return;
+ }
+ if (inoutProgress.indexOf("REGISTER") == -1) {
+ $("#progress-register").css("display", "none");
+ }
+ if (inoutProgress.indexOf("CHECK") == -1) {
+ $("#progress-check").css("display", "none");
+ }
+ if (inoutProgress.indexOf("WEIGHT_FULL") == -1) {
+ $("#progress-fullWeight").css("display", "none");
+ }
+ if (inoutProgress.indexOf("HANDLE") == -1) {
+ $("#progress-hand").css("display", "none");
+ }
+ if (inoutProgress.indexOf("WEIGHT_EMPTY") == -1) {
+ $("#progress-emptyWeight").css("display", "none");
+ }
+ if (inoutProgress.indexOf("CARD_BACK") == -1) {
+ $("#progress-cardBack").css("display", "none");
+ }
+}
+
+// socket淇℃伅杩斿洖铏曠悊
+function socketOnMessage(packet) {
+
+}
+
+//浣跨敤鎻掍欢璇诲彇韬唤璇�
+function flushIdCard() {
+ var index = layer.load();
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/IDCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ layer.close(index);
+ var data = json.content;
+ if (data === "not found") {
+ layer.alert("娌℃湁鑾峰彇鍒拌韩浠借瘉淇℃伅锛�", {
+ offset: ['300px', '300px']
+ });
+ return;
+ }
+ // 涓存椂璧嬪��
+ $("#userName").val(data.cnName);
+ $("#userSex").val(data.sex);
+ $("#userNation").val(data.nation);
+ $("#userAddress").val(data.address);
+ //$("#id_img_pers").attr("src",data.Image);
+ var time = data.birthdate;
+ if (time.length == 8) {
+ time = time.substring(0, 4) + "-" + time.substring(4, 6) + "-" + time.substring(6);
+ }
+ $("#userBirthday").val(time);
+ $("#userId").val(data.idNum);
+ if (data.Image) {
+ $("#id_img_pers").attr("src", data.Image);
+ }
+ },
+ error: function () {
+ layer.alert("韬唤璇佽鍙栧け璐ワ紒", {
+ offset: ['300px', '300px']
+ });
+ layer.close(index);
+ }
+ });
+}
+
+//浣跨敤鎻掍欢璇诲彇鏅烘収鍗″彿
+function flushICCard() {
+ $("#intelCard").val(null);
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/ICCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ //console.log(json);
+ var data = json.no;
+ //console.log(data);
+ if (data === "not found") {
+ layer.alert("璇烽噸鏂拌鍗★紒", {offset: ['300px', '300px']});
+ } else {
+ $("#intelCard").val(data);
+ }
+ },
+ error: function () {
+ layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
+ }
+ });
+}
+
+//璇诲彇杞︾墝鍙�
+function flushPlateNum() {
+ var param = JSON.stringify(lprDto);
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../inout/api/flush-lpr",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: param,
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.alert(result.msg, {
+ offset: ['300px', '300px']
+ });
+ } else {
+ if (result.data.errorMsg) {
+ layer.alert(result.data.errorMsg, {
+ offset: ['300px', '300px']
+ });
+ } else {
+ $("#plateNum").val(result.data.plateNum);
+ }
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ layer.alert("杞︾墝璇嗗埆澶辫触锛�", {
+ offset: ['300px', '300px']
+ });
+ }
+ });
+}
+
+//閲嶇疆杞︾墝璇嗗埆淇℃伅
+function resetPlateNum() {
+ var index = layer.load();
+ var param = JSON.stringify(lprDto);
+ $.ajax({
+ type: "POST",
+ url: "../../inout/api/reset-lpr",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: param,
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.alert(result.msg, {
+ offset: ['300px', '300px']
+ });
+ } else {
+ layer.alert("閲嶇疆鎴愬姛锛岃閲嶆柊鑾峰彇杞︾墝淇℃伅", {
+ offset: ['300px', '300px']
+ });
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ layer.alert("閲嶇疆鎵ц澶辫触", {
+ offset: ['300px', '300px']
+ });
+ }
+ });
+}
+
+// 琛ㄥ崟娓呯┖
+function resetForm() {
+ $("#form-data")[0].reset();
+ form.render();
+ // 韬唤璇侀噸缃�
+ $("#id_img_pers").attr("src", "../../static/images/rkbk-photo_03.png");
+ $("#pz-img").removeClass("kccz-r-img-red");
+ $("#pz-text").text("鑷姩鎶撴媿");
+}
+
+// 褰撳墠瀹屾垚
+function submit() {
+ var data = form.val("form-data");
+ if (!data.userName) {
+ notify("鎵胯繍浜轰俊鎭笉鑳戒负绌�", null);
+ return;
+ }
+ if (!data.plateNum) {
+ notify("杞︾墝鍙蜂笉鑳戒负绌�", null);
+ return;
+ }
+ if (!data.intelCard && !data.userId) {
+ notify("鏅烘収鍗″彿涓庤韩浠借瘉鍙蜂笉鑳藉悓鏃朵负绌�", null);
+ return;
+ }
+
+ //绯荤粺鎶撴媿
+ layer.msg("绯荤粺鑷姩鎶撴媿璁板綍鈥︹��");
+ snapData = {
+ companyId: companyId,
+ deptId: deptId,
+ progress: progress,
+ bizType: bizType,
+ plateNum: data.plateNum,
+ id1: (null != lprDto) ? lprDto.id : null
+ };
+
+ $.ajax({
+ sync: false,
+ type: "POST",
+ url: "../../inout/api/snap-img",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(snapData),
+ success: function (result) {
+ if (result.code != "0000") {
+ layer.alert(result.msg);
+ submitData(data);
+ } else {
+ snapData = result.data;
+
+ $("#pz-img").addClass("kccz-r-img-red");
+ $("#pz-text").text("宸叉媿鐓�");
+
+ submitData(data);
+ }
+ },
+ error: function () {
+ layer.msg("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ submitData(data);
+ }
+ });
+}
+
+//鎵ц淇濆瓨鏁版嵁
+function submitData(data) {
+ var index = layer.load();
+
+ var files = [{
+ fileName: snapData.fileName1
+ }];
+ data.files = files;
+
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/inout-next-step",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ notify(result.msg, result.data);
+ } else {
+ notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
+ // 閲嶇疆椤甸潰
+ resetForm();
+ }
+ },
+ error: function () {
+ layer.close(index);
+ layer.alert("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
+}
+
+/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @param msg 鎻愰啋淇℃伅
+ * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
+ */
+function notify(msg, data) {
+ if (data) {
+ //璧嬪��
+ $("#resultMsg").text(msg);
+ $("#resultUserName").text(data.userName);
+ $("#resultPlateNum").text(data.plateNum);
+ if ("IN" == data.type) {
+ $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
+ } else {
+ $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
+ }
+ $("#resultIntelCard").text(data.intelCard);
+
+ layer.open({
+ type: 1,
+ offset: ['150px', '200px'],
+ area: '450px;',
+ shade: 0.8,
+ id: 'dialog_notify_info',
+ btn: ['纭畾'],
+ content: $('#dialog-from-notify'),
+ yes: function (index) {
+ layer.closeAll();
+ }
+ });
+ } else {
+ layer.alert(msg, {offset: ['300px', '300px']});
+ }
+}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/inout-common.js b/igds-web/src/main/resources/static/admin/inout/inout-common.js
index 231d61b..b7b5603 100644
--- a/igds-web/src/main/resources/static/admin/inout/inout-common.js
+++ b/igds-web/src/main/resources/static/admin/inout/inout-common.js
@@ -21,4 +21,46 @@
if (inoutProgress.indexOf("CARD_BACK") == -1) {
$("#progress-cardBack").css("display", "none");
}
-}
\ No newline at end of file
+}
+
+//閿欒鎻愰啋
+function alertError(msg) {
+ layer.alert(msg, {
+ icon: 5,
+ offset: ['300px', '300px']
+ });
+}
+
+/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @param msg 鎻愰啋淇℃伅
+ * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
+ */
+function notifyProgress(msg, data) {
+ if (data) {
+ //璧嬪��
+ $("#resultMsg").text(msg);
+ $("#resultUserName").text(data.userName);
+ $("#resultPlateNum").text(data.plateNum);
+ if ("IN" == data.type) {
+ $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
+ } else {
+ $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
+ }
+ $("#resultIntelCard").text(data.intelCard);
+ layer.open({
+ type: 1,
+ offset: ['150px', '200px'],
+ area: '450px;',
+ shade: 0.8,
+ id: 'dialog_notify_info',
+ btn: ['纭畾'],
+ content: $('#dialog-from-notify'),
+ yes: function (index) {
+ layer.closeAll();
+ }
+ });
+ } else {
+ layer.alert(msg, {offset: ['300px', '300px']});
+ }
+}
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-register.html b/igds-web/src/main/resources/templates/admin/inout/in-register.html
index 13eb2c5..d5be5c1 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-register.html
@@ -262,7 +262,7 @@
<div class="layui-form-item">
<input type="button" value="璇昏溅鐗�"
class="rkbk-r-btn fr layui-btn layui-btn-normal"
- onclick="flushPlateNum()" /> <label
+ onclick="getPlateNum()" /> <label
class="layui-form-label color-red">杩愯緭杞︾墝锛�</label>
<div class="layui-input-block">
<input type="text" name="plateNum" id="plateNum"
--
Gitblit v1.9.3