From 08cea428e888b6fdd2a3c3783e87e4f828385783 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 08 六月 2023 08:55:47 +0800
Subject: [PATCH] 出入库优化-提交优化
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 17
igds-inout/src/main/java/com/ld/igds/timer/InoutScheduled.java | 290 ++--
igds-web/src/main/resources/application-dev.yml | 1
igds-web/src/main/resources/static/admin/inout/in-handle.js | 561 ++++-----
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java | 2
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 235 +--
igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java | 6
igds-inout/src/main/java/com/ld/igds/m/service/InoutCommonService.java | 8
igds-web/src/main/resources/static/admin/inout/in-weight.js | 5
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 26
igds-web/src/main/resources/templates/admin/inout/in-handle20230605.html | 540 ++++++++++
igds-web/src/main/resources/templates/admin/inout/in-handle.html | 976 +++++++++--------
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java | 2
igds-web/src/main/resources/static/admin/inout/in-handle20230506.js | 327 ++++++
igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutRecordMapper.java | 16
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java | 2
igds-core/src/main/java/com/ld/igds/models/InoutSysConf.java | 9
igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java | 145 --
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5205.java | 2
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java | 8
igds-inout/src/main/java/com/ld/igds/m/view/InoutSysConfPR.java | 2
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
23 files changed, 1,969 insertions(+), 1,259 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5205.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5205.java
index a2c5fd7..09f5ce1 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5205.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5205.java
@@ -64,12 +64,10 @@
if(param.getType().equals(PhoneConstant.PHONE_INOUT_START)){
//鍊间粨寮�濮嬫彁浜わ紝鍙洿鏂板�间粨寮�濮嬫椂闂�
- data.setHandleStart(new Date());
String msg = inoutService.updateData(data);
return PhoneRespUtil.success(msg, req);
}else{
//鍊间粨缁撴潫鎻愪氦,闇�鏇存柊娴佺▼鐘舵�併�佸�间粨缁撴潫鏃堕棿銆佸�间粨浜恒�佸�间粨鎵ｉ噸绛�
- data.setHandleEnd(new Date());
data.setDeHandle(param.getDeHandle());
data.setHandleUser(authUser.getCname());
//璁剧疆鍊间粨鍥剧墖淇℃伅
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java
index 1aa450e..adffa5d 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5207.java
@@ -64,12 +64,10 @@
if(param.getType().equals(PhoneConstant.PHONE_INOUT_START)){
//鍊间粨寮�濮嬫彁浜わ紝鍙洿鏂板�间粨寮�濮嬫椂闂�
- data.setHandleStart(new Date());
String msg = inoutService.updateData(data);
return PhoneRespUtil.success(msg, req);
}else{
//鍊间粨缁撴潫鎻愪氦,闇�鏇存柊娴佺▼鐘舵�併�佸�间粨缁撴潫鏃堕棿銆佸�间粨浜恒�佸�间粨鎵ｉ噸绛�
- data.setHandleEnd(new Date());
data.setDeHandle(param.getDeHandle());
data.setHandleUser(authUser.getCname());
//璁剧疆鍊间粨鍥剧墖淇℃伅
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java
index e2ef6cd..4f8058c 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5208.java
@@ -92,8 +92,6 @@
inoutHandle.setFoodVariety(inoutData.getFoodVariety());
inoutHandle.setSettleWeight(inoutData.getSettleWeight());
inoutHandle.setFoodLevel(inoutData.getFoodLevel());
- inoutHandle.setHandleStart(inoutData.getHandleStart());
- inoutHandle.setHandelEnd(inoutData.getHandleEnd());
inoutHandle.setProgress(inoutData.getProgress());
//鏍规嵁娴佹按id銆佺粍缁囩紪鐮佹煡璇㈠浘鐗囦俊鎭�
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java
index 303514f..b7dc42e 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5207.java
@@ -70,12 +70,10 @@
BeanUtils.copyProperties(record, data);
if(param.getType().equals(Phone35Constant.PHONE_INOUT_START)){
//鍊间粨寮�濮嬫彁浜わ紝鍙洿鏂板�间粨寮�濮嬫椂闂�
- data.setHandleStart(new Date());
String msg = inoutService.updateData(data);
return PhoneRespUtil.success(null, req, msg);
}else{
//鍊间粨缁撴潫鎻愪氦,闇�鏇存柊娴佺▼鐘舵�併�佸�间粨缁撴潫鏃堕棿銆佸�间粨浜恒�佸�间粨鎵ｉ噸绛�
- data.setHandleEnd(new Date());
data.setDeHandle(param.getDeHandle());
data.setHandleUser(phone35AuthUser.getCname());
//璁剧疆鍊间粨鍥剧墖淇℃伅
diff --git a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java b/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java
index 6dc7185..f1549e1 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java
@@ -42,12 +42,6 @@
private Date emptyWeightTime;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
- private Date handleStart;
-
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
- private Date handleEnd;
-
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date completeTime;
private List<FileData> 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 f699791..116ef44 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,15 +44,6 @@
@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_WX_", length = 1)
@PropertyDef(label = "鏄惁鍚敤寰俊閫氱煡")
private String noticeWx = Constant.YN_N;
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 c5d050f..e71e477 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
@@ -238,7 +238,12 @@
* @return
*/
@RequestMapping("/in-handle")
- public ModelAndView inHandle() {
+ public ModelAndView inHandle(HttpServletRequest httpRequest, @RequestParam(value = "sort", required = false) String sort) {
+
+ //濡傛灉娌℃湁鎸囧畾鍦扮锛屼粠鐢ㄦ埛涓婁竴涓�夋嫨涓幏鍙�
+ if (StringUtils.isEmpty(sort)) {
+ sort = commonManager.getInoutWeightByClient(httpRequest);
+ }
ModelAndView view = new ModelAndView();
@@ -262,15 +267,13 @@
// 褰撳墠娴佺▼鑺傜偣
view.addObject("progress", InoutConstant.PROGRESS_HANDLE);
- // 绮鍝佺涓嬫媺妗�
- List<DicTrigger> listFoodVariety = inoutCommonManager.getDicTrigger(
- Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
- view.addObject("listFoodVariety", listFoodVariety);
+ // 杩滅▼鏅烘収鍗�
+ // 鑾峰彇鍑哄叆搴撹澶囬厤缃俊鎭�
+ List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);
+ InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_80, InoutConstant.PROGRESS_WEIGHT_TAG, 1);
+ if (null != conf) conf.setSort(sort);
+ view.addObject("cardDto", conf);
- // 绮绛夌骇涓嬫媺妗�
- List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
- Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
- view.addObject("listFoodLevel", listFoodLevel);
view.setViewName("admin/inout/in-handle");
return view;
@@ -613,13 +616,26 @@
@Transactional
public PageResponse<InoutData> submitWeight(@RequestBody InoutData data) throws Exception {
- if(null == data.getJjlx()) data.setJjlx("0");
+ if (null == data.getJjlx()) data.setJjlx("0");
if (InoutConstant.TYPE_IN.equals(data.getType())) {
return inoutManager.submitWeightIn(data);
} else {
return inoutManager.submitWeightOut(data);
}
+ }
+
+ /**
+ * 鍑哄叆搴撶О閲嶇幆鑺傛彁浜わ紝璇锋敞鎰忥細鍊间粨鎸戞彁浜ょ殑鏁版嵁闈炲嚭鍏ュ簱娴佹按瀹屾暣淇℃伅锛屼笉鑳界洿鎺ヨ皟鐢╱pdate鏂规硶
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/submit-handle")
+ @Transactional
+ public PageResponse<InoutData> submitHandle(@RequestBody InoutData data) throws Exception {
+
+ return inoutManager.submitHandle(data);
}
/**
@@ -836,7 +852,7 @@
*/
@RequestMapping("/get-check-item")
public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutCheckParam param) {
- return inoutManager.getCheckItemData(param);
+ return inoutManager.getCheckItemData(param);
}
/**
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
index 3bba0c7..23e56bf 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
@@ -4,13 +4,11 @@
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.service.InoutService;
-import com.ld.igds.io.dto.WeightDto;
import com.ld.igds.m.service.InoutCommonService;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.models.InoutConf;
import com.ld.igds.models.InoutSysConf;
import com.ld.igds.sys.service.DicTriggerService;
-import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -110,16 +108,12 @@
if (null == listInoutConf) return new InoutConf(sort);
if (StringUtils.isEmpty(sort)) sort = "1";
- InoutConf result = null;
for (InoutConf conf : listInoutConf) {
if (sort.equals(conf.getSort()) && type.equals(conf.getType())) {
return conf;
}
}
-
- if (null == result) return new InoutConf(sort);
-
- return result;
+ return new InoutConf(sort);
}
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 ac4dce1..621ad16 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
@@ -23,7 +23,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -48,8 +47,8 @@
private CoreFileService fileService;
@Autowired
private CoreCommonService commonService;
- @Autowired
- private InoutCommonService inoutManagerService;
+ @Resource
+ private InoutCommonService inoutCommonService;
@Autowired
private CheckStandardManager checkStandardManager;
@Resource
@@ -143,14 +142,14 @@
List<FileData> files = data.getFiles();
// 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(
data.getCompanyId(), data.getDeptId());
if (null == inoutSysConf
|| StringUtils.isEmpty(inoutSysConf.getProgressIn())) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"褰撳墠搴撳尯鏈厤缃嚭搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳閰嶇疆銆�", data);
}
- data = updateOutBasicInfo(data, inoutSysConf);
+ data = updateBasicInfo(data, inoutSysConf);
// 濡傛灉褰撳墠鑺傜偣鏄敞鍐岋紝鍒欓渶瑕侀獙璇佷笅锛屾槸鍚︽湁涓哄畬鎴愮殑娴佺▼鍦ㄦ墽琛屼腑
if (InoutConstant.PROGRESS_REGISTER.equals(curProgress)) {
@@ -211,7 +210,7 @@
}
// 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
if (null == inoutSysConf
|| StringUtils.isEmpty(inoutSysConf.getProgressIn())) {
@@ -219,7 +218,7 @@
"褰撳墠搴撳尯鏈厤缃叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳閰嶇疆銆�", data);
}
- data = updateInBasicInfo(data, inoutSysConf);
+ data = updateBasicInfo(data, inoutSysConf);
// 濡傛灉褰撳墠鑺傜偣鏄敞鍐岋紝鍒欓渶瑕侀獙璇佷笅锛屾槸鍚︽湁涓哄畬鎴愮殑娴佺▼鍦ㄦ墽琛屼腑
if (InoutConstant.PROGRESS_REGISTER.equals(curProgress)) {
@@ -317,7 +316,7 @@
// 鏇存柊涓嬩竴涓姸鎬佸拰鍩烘湰淇℃伅
if (InoutConstant.PROGRESS_CHECK.equals(progressData.getProgress())) {
- progressData = updateInBasicInfo(progressData, null);
+ progressData = updateBasicInfo(progressData, null);
// 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
if (InoutConstant.STATUS_UNPASS.equals(progressData
.getCheckStatus())) {
@@ -325,10 +324,7 @@
}
}
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());
}
@@ -354,15 +350,6 @@
progressData.setNoticeId(data.getNoticeId());
}
-// // 鍥炲～姘村垎鍜屾潅璐�
-// if (checkResult.getWet() > 0) {
-// progressData.setWet(checkResult.getWet());
-// }
-//
-// if (checkResult.getImpurity() > 0) {
-// progressData.setImpurity(checkResult.getImpurity());
-// }
-
String msg = inoutService.updateData(progressData);
if (null != msg) {
@@ -382,7 +369,7 @@
* @return
*/
private InoutData checkNoPass(InoutData data) {
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(
data.getCompanyId(), data.getDeptId());
if (inoutSysConf.getNoPassNext().equals(InoutConstant.CHECK_NOPASS_RECORD)) {
@@ -450,82 +437,59 @@
}
/**
- * 鏍规嵁闇�瑕佷繚瀛樼殑鏁版嵁锛岃皟鏁翠笅涓�涓祦绋嬬姸鎬� 涓嶅悓鐨勪粨搴撶粍缁囨祦绋嬪彲鑳戒笉涓�鏍凤紝闇�瑕佹牴鎹疄闄呰皟鏁�
+ * 鏍规嵁鏁版嵁褰撳墠鐘舵�佸拰涓嬩竴涓姸鎬侊紝鏇存柊鍩虹淇℃伅
*
* @param data
* @return
*/
- private InoutData updateInBasicInfo(InoutData data, InoutSysConf sysConf) {
- if (null == sysConf) {
- sysConf = inoutManagerService.getCacheInoutSysConf(
- data.getCompanyId(), data.getDeptId());
- }
+ private InoutData updateBasicInfo(InoutData data, String curProgress, String nextProgress) {
- if (InoutConstant.PROGRESS_REGISTER.equals(data.getProgress())) {
+ if (InoutConstant.PROGRESS_REGISTER.equals(curProgress)) {
data.setRegisterTime(new Date());
data.setRegisterUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
-
- return data;
+ data.setProgress(nextProgress);
}
- 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())) {
+ if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(curProgress)) {
data.setEmptyWeightTime(new Date());
data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
+ data.setProgress(nextProgress);
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
+ }
+ if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(curProgress)) {
+ data.setFullWeightTime(new Date());
+ data.setFullWeightUser(ContextUtil.getLoginUserCName());
+ data.setProgress(nextProgress);
+ }
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
- data.setCompleteUser(ContextUtil.getLoginUserCName());
+ if (InoutConstant.PROGRESS_HANDLE.equals(curProgress)) {
+ if (null == data.getHandleUser()) {
+ data.setHandleUser(ContextUtil.getLoginUserCName());
}
- return data;
+ data.setProgress(nextProgress);
}
- 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;
- }
-
- if (InoutConstant.PROGRESS_CARD_BACK.equals(data.getProgress())) {
- data.setCompleteTime(new Date());
+ //濡傛灉涓嬩竴涓暟鎹姸鎬�=娴佺▼缁撴潫锛岀洿鎺ヨˉ鍏呭畬鏁翠俊鎭�
+ if (InoutConstant.PROGRESS_RECORD.equals(nextProgress)) {
+ data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
data.setCompleteUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
- return data;
+ data.setProgress(nextProgress);
}
+
+
return data;
}
/**
+ * 褰撳墠鏂规硶闇�瑕佸垹闄�
+ * <p>
* 鏍规嵁闇�瑕佷繚瀛樼殑鏁版嵁锛岃皟鏁翠笅涓�涓祦绋嬬姸鎬� 涓嶅悓鐨勪粨搴撶粍缁囨祦绋嬪彲鑳戒笉涓�鏍凤紝闇�瑕佹牴鎹疄闄呰皟鏁�
*
* @param data
* @return
*/
- private InoutData updateOutBasicInfo(InoutData data, InoutSysConf sysConf) {
+ private InoutData updateBasicInfo(InoutData data, InoutSysConf sysConf) {
if (InoutConstant.PROGRESS_REGISTER.equals(data.getProgress())) {
data.setRegisterTime(new Date());
data.setRegisterUser(ContextUtil.getLoginUserCName());
@@ -577,36 +541,6 @@
return data;
}
-
-// public PageResponse<Page<InoutData>> pageRecordData(InoutParam param) {
-//
-// log.debug("鍒嗛〉淇℃伅--page={},limit={},cuur={}", param.getPage(),
-// param.getLimit(), param.getCurr());
-//
-// Page<InoutData> result = inoutService.pageRecordData(param);
-//
-// if (null == result.getRecords() || result.getRecords().isEmpty()) {
-// return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
-// "鑾峰彇鍒版暟鎹俊鎭负绌�");
-// }
-//
-// 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);
-// }
public PageResponse<InoutData> inoutComplete(InoutData data) throws Exception {
@@ -774,9 +708,6 @@
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));
}
@@ -790,9 +721,6 @@
} 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));
@@ -1026,19 +954,19 @@
//鑾峰彇绯荤粺鍙傛暟閰嶇疆
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
if (null == inoutSysConf) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鎻愮ず锛氬綋鍓嶅簱鍖烘湭閰嶇疆鍑哄叆搴撴祦绋嬩俊鎭紝璇疯仈绯荤鐞嗗憳", data);
}
- String curProgress = data.getProgress();
//鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
+ String curProgress = data.getProgress();
String nextProgress = getNextProgress(curProgress, data.getType(), inoutSysConf);
- data.setRegisterTime(new Date());
- data.setRegisterUser(ContextUtil.getLoginUserCName());
- data.setProgress(nextProgress);
+
+
+ data = updateBasicInfo(data, curProgress, nextProgress);
String msg = inoutService.insertData(data);
@@ -1056,36 +984,17 @@
public PageResponse<InoutData> submitWeightIn(InoutData data) throws Exception {
//鑾峰彇绯荤粺鍙傛暟閰嶇疆
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
if (null == inoutSysConf) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鎻愮ず锛氬綋鍓嶇郴缁熶腑娴佺▼閰嶇疆寮傚父锛岃鑱旂郴绠＄悊鍛�", data);
}
- String curProgress = data.getProgress();
//鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
+ String curProgress = data.getProgress();
String nextProgress = getNextProgress(curProgress, data.getType(), inoutSysConf);
-
- if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(curProgress)) {
- data.setEmptyWeightTime(new Date());
- data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(nextProgress);
-
- }
- if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(nextProgress)) {
- data.setFullWeightTime(new Date());
- data.setFullWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(nextProgress);
- }
-
-
- //濡傛灉涓嬩竴涓暟鎹姸鎬�=娴佺▼缁撴潫
- if (InoutConstant.PROGRESS_RECORD.equals(nextProgress)) {
- data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- data.setProgress(nextProgress);
- }
+ data = updateBasicInfo(data, curProgress, nextProgress);
//鍏ュ簱绉伴噸鍙兘璋冩暣璐ㄦ鍗�
@@ -1116,37 +1025,17 @@
public PageResponse<InoutData> submitWeightOut(InoutData data) throws Exception {
//鑾峰彇绯荤粺鍙傛暟閰嶇疆
- InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
+ InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
if (null == inoutSysConf) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鎻愮ず锛氬綋鍓嶇郴缁熶腑娴佺▼閰嶇疆寮傚父锛岃鑱旂郴绠＄悊鍛�", data);
}
- String curProgress = data.getProgress();
//鑾峰彇涓嬩竴涓祦绋嬬姸鎬�
+ String curProgress = data.getProgress();
String nextProgress = getNextProgress(curProgress, data.getType(), inoutSysConf);
-
- if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(curProgress)) {
- data.setEmptyWeightTime(new Date());
- data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(nextProgress);
-
- }
- if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(nextProgress)) {
- data.setFullWeightTime(new Date());
- data.setFullWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(nextProgress);
- }
-
-
- //濡傛灉涓嬩竴涓暟鎹姸鎬�=娴佺▼缁撴潫
- if (InoutConstant.PROGRESS_RECORD.equals(nextProgress)) {
- data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- data.setProgress(nextProgress);
- }
-
+ data = updateBasicInfo(data, curProgress, nextProgress);
//鎵ц鏁版嵁鏇存柊
String msg = inoutService.updateData(data);
@@ -1158,8 +1047,35 @@
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);
- //绉伴噸瀹屾垚锛岃皟鐢ㄥ嚭鍏ュ簱鎺у埗閫昏緫澶勭悊
+ //绉伴噸鍚庢牴鎹綋鍓嶆祦绋嬬姸鎬佸拰涓嬩竴涓姸鎬侊紝閫氱煡绉伴噸鎺у埗鍣�
inoutDeviceManager.controlWeight(data, curProgress, nextProgress);
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛", data);
+ }
+
+ public PageResponse<InoutData> submitHandle(InoutData data) throws Exception {
+ //鑾峰彇绯荤粺鍙傛暟閰嶇疆
+ InoutSysConf inoutSysConf = inoutCommonService.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 = updateBasicInfo(data, curProgress, nextProgress);
+
+
+ //鎵ц鏁版嵁鏇存柊
+ String msg = inoutService.updateDataByHandle(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);
}
@@ -1302,7 +1218,7 @@
//鏇存柊涓嬩竴娴佺▼鐘舵��
if (InoutConstant.PROGRESS_CHECK.equals(curData.getProgress())) {
- curData = updateInBasicInfo(curData, null);
+ curData = updateBasicInfo(curData, null);
// 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
if (InoutConstant.STATUS_UNPASS.equals(curData.getCheckStatus())) {
curData = checkNoPass(curData);
@@ -1330,8 +1246,5 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"鍚庡彴寮傚父锛�" + e.getMessage(), null);
}
-
}
-
-
}
\ No newline at end of file
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 12f00b7..b1b0f60 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
@@ -66,6 +66,14 @@
*/
int updateData(@Param("data") InoutData data);
+
+ /**
+ * 鏇存柊鏁版嵁鏍规嵁鍊间粨锛屾洿鏂伴儴鍒嗕俊鎭�
+ *
+ * @param data
+ */
+ void updateDataByHandle(@Param("data") InoutData data);
+
/**
* 鍒嗛〉鑾峰彇鏁版嵁
*
@@ -92,12 +100,6 @@
*/
int validateInoutData(@Param("param") InoutParam param);
- /**
- * 鏇存柊鍑哄叆搴撴祦姘村疄鏃跺簱瀛�
- *
- * @param param
- * @return int updateCuStorage(@Param("param") InoutParam param);
- */
/**
* 鏍规嵁like鑾峰彇鏁版嵁搴撲腑鏈�澶х殑ID锛�
@@ -141,4 +143,6 @@
* @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 539d8e4..82f981e 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
@@ -68,6 +68,14 @@
String updateData(InoutData data) throws Exception;
/**
+ * 鍊间粨鐜妭鎻愪氦鏁版嵁锛屽彧鏇存柊閮ㄥ垎淇℃伅
+ *
+ * @param data
+ * @return
+ */
+ String updateDataByHandle(InoutData data);
+
+ /**
* 鍒嗛〉鑾峰彇浣忎俊鎭�
*
* @param param
@@ -265,4 +273,6 @@
* @throws Exception
*/
String updateCheckData(InoutCheckData data);
+
+
}
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 460f565..e5e34a6 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
@@ -5,7 +5,6 @@
import com.ld.igds.common.CoreCommonService;
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
-import com.ld.igds.constant.FoodType;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.data.CommonData;
import com.ld.igds.data.Page;
@@ -171,6 +170,8 @@
@Override
public String updateData(InoutData data) throws Exception {
+
+ data.setUpdateTime(new Date());
if (StringUtils.isEmpty(data.getCompanyId())) {
data.setCompanyId(ContextUtil.getCompanyId());
}
@@ -187,6 +188,28 @@
//鏇存柊缂撳瓨
updateInoutCache(newData);
+ return null;
+ }
+
+ @Override
+ public String updateDataByHandle(InoutData data) {
+ data.setUpdateTime(new Date());
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ InoutData newData;
+ if (EntityUtils.isEntity(data)) {
+ newData = new InoutData();
+ BeanUtils.copyProperties(data, newData, new String[]{"checkItems", "files"});
+ } else {
+ newData = data;
+ }
+
+ inoutMapper.updateDataByHandle(newData);
+
+ //鏇存柊缂撳瓨
+ updateInoutCache(newData);
+
return null;
}
@@ -660,7 +683,6 @@
.getCode())
|| WebSocketServer.contextOnLineMap.get(BizType.SCREEN_CHECK
.getCode())) {
-
// 鍒涘缓涓�涓瓙浠诲姟杩涜鎺ㄩ�佷俊鎭�
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/InoutCommonService.java b/igds-inout/src/main/java/com/ld/igds/m/service/InoutCommonService.java
index 3a429c0..a91269b 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/InoutCommonService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/InoutCommonService.java
@@ -33,14 +33,6 @@
InoutSysConf getCacheInoutSysConf(String companyId, String deptId);
/**
- * 鍑哄叆搴撴祦绋� - 浠庣紦瀛樿幏鍙�
- *
- * @param companyId
- * @return
- */
- List<InoutSysConf> getCacheInoutSysConf(String companyId);
-
- /**
* 鍑哄叆搴撹澶囧強娴佺▼ - 鏍规嵁缁勭粐缂栫爜鍒锋柊鍏ㄩ儴缂撳瓨
*
* @param companyId
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java
index 7146260..96f94fa 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/impl/InoutCommonServiceImpl.java
@@ -1,5 +1,7 @@
package com.ld.igds.m.service.impl;
+import java.util.List;
+
import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutParam;
@@ -14,10 +16,9 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-import java.util.*;
+import javax.annotation.Resource;
/**
* 鍑哄叆搴撳紑濮嬪墠鐨勫悇绉嶉厤缃� --- 鍖呭惈娴佺▼閰嶇疆銆佸嚭鍏ュ簱璁惧閰嶇疆銆侀�氱煡鍗曠瓑
@@ -28,71 +29,37 @@
@Repository(InoutCommonService.BEAN_ID)
public class InoutCommonServiceImpl implements InoutCommonService {
- @Autowired
+ @Resource
private RedisUtil redisUtil;
- @Autowired
- private InoutCommonMapper inoutManagerMapper;
+ @Resource
+ private InoutCommonMapper inoutCommonMapper;
@Override
public void flushInoutSysConfCache(InoutSysConf data) {
-
- String key = RedisConst.buildKey(data.getCompanyId(), InoutConstant.CACHE_INOUT_SYS_CONF, data.getDeptId());
-
+ String key = RedisConst.buildKey(data.getDeptId(), InoutConstant.CACHE_INOUT_SYS_CONF);
redisUtil.set(key, data);
}
@Override
public InoutSysConf getCacheInoutSysConf(String companyId, String deptId) {
- if (null == companyId || null == deptId) {
- return null;
- }
- // 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
- String key = RedisConst.buildKey(companyId, InoutConstant.CACHE_INOUT_SYS_CONF, deptId);
-
+ String key = RedisConst.buildKey(deptId, InoutConstant.CACHE_INOUT_SYS_CONF);
return (InoutSysConf) redisUtil.get(key);
}
- @Override
- public List<InoutSysConf> getCacheInoutSysConf(String companyId) {
- if (StringUtils.isEmpty(companyId)) {
- return null;
- }
-
- String pattern = RedisConst.buildKey(companyId, InoutConstant.CACHE_INOUT_SYS_CONF);
-
- Set<String> keys = redisUtil.keys(pattern);
- if (null == keys || keys.isEmpty()) {
- return null;
- }
-
- List<InoutSysConf> list = new ArrayList<>();
- for (String key : keys) {
- list.add((InoutSysConf) redisUtil.get(key));
- }
- return list;
- }
@Override
public void flushInoutConfCache(String companyId, String deptId) {
- List<InoutConf> list = inoutManagerMapper.listInoutConf(companyId, deptId);
-
+ List<InoutConf> list = inoutCommonMapper.listInoutConf(companyId, deptId);
+
String key = RedisConst.buildKey(companyId, InoutConstant.CACHE_INOUT_CONF_LIST, deptId);
-
redisUtil.set(key, list);
-
- log.debug("---鏇存柊鍑哄叆搴撻厤缃俊鎭紦瀛�----");
}
- @Override
@SuppressWarnings("unchecked")
+ @Override
public List<InoutConf> getCacheInoutConf(String companyId, String deptId) {
- if (null == companyId || null == deptId) {
- return null;
- }
- String key = RedisConst.buildKey(companyId,
- InoutConstant.CACHE_INOUT_CONF_LIST, deptId);
-
+ String key = RedisConst.buildKey(companyId, InoutConstant.CACHE_INOUT_CONF_LIST, deptId);
return (List<InoutConf>) redisUtil.get(key);
}
@@ -117,7 +84,7 @@
@Override
public void updateInoutConfStatus(String ip, Integer port, String status) {
- inoutManagerMapper.updateInoutConfStatus(ip, port, status);
+ inoutCommonMapper.updateInoutConfStatus(ip, port, status);
}
@Override
@@ -128,53 +95,12 @@
if (StringUtils.isNotEmpty(param.getKey())) {
param.setKey("%" + param.getKey() + "%");
}
- return inoutManagerMapper.listCustomer(param);
+ return inoutCommonMapper.listCustomer(param);
}
-
-// @Override
-// public List<InoutCustomer> listCustomerByNoticeIn(InoutParam param) {
-// if (StringUtils.isEmpty(param.getCompanyId())) {
-// param.setCompanyId(ContextUtil.getCompanyId());
-// }
-// //璁剧疆褰撳墠骞翠唤
-// Date date = new Date();
-// if (null != param.getStart()) {
-// date = param.getStart();
-// }
-// param.setYear(DateFormatUtils.format(date, "yyyy"));
-//
-// if (StringUtils.isNotEmpty(param.getKey())) {
-// param.setKey("%" + param.getKey() + "%");
-// }
-// //璁剧疆閫氱煡鍗曞畬鎴愮姸鎬�
-// param.setType(InoutConstant.COMPLETE_STATUS_NONE);
-// return inoutManagerMapper.listCustomerByNoticeIn(param);
-// }
-
-// @Override
-// public List<InoutCustomer> listCustomerByNoticeOut(InoutParam param) {
-// if (StringUtils.isEmpty(param.getCompanyId())) {
-// param.setCompanyId(ContextUtil.getCompanyId());
-// }
-//
-// //璁剧疆褰撳墠骞翠唤
-// Date date = new Date();
-// if (null != param.getStart()) {
-// date = param.getStart();
-// }
-// param.setYear(DateFormatUtils.format(date, "yyyy"));
-//
-// if (StringUtils.isNotEmpty(param.getKey())) {
-// param.setKey("%" + param.getKey() + "%");
-// }
-// //璁剧疆閫氱煡鍗曞畬鎴愮姸鎬�
-// param.setType(InoutConstant.COMPLETE_STATUS_NONE);
-// return inoutManagerMapper.listCustomerByNoticeOut(param);
-// }
@Override
public int updateCustomer(NoticeInData data) {
- return inoutManagerMapper.updateCustomer(data);
+ return inoutCommonMapper.updateCustomer(data);
}
@Override
@@ -183,22 +109,13 @@
companyId = ContextUtil.getCompanyId();
}
- return inoutManagerMapper.getMaxCustomerId(companyId);
+ return inoutCommonMapper.getMaxCustomerId(companyId);
}
-
-// @Override
-// public InoutNoticeIn getInoutNoticeIn(NoticeInParam param) {
-// List<InoutNoticeIn> list = inoutManagerMapper.listNoticeIn(param);
-// if (null == list || list.isEmpty()) {
-// return null;
-// }
-// return list.get(0);
-// }
@Override
public int updateNoticeIn(NoticeInData data) {
- int i = inoutManagerMapper.updateNoticeIn(data);
+ int i = inoutCommonMapper.updateNoticeIn(data);
if (i == 0) {
log.info("绯荤粺涓病鏈夋洿鏂板埌褰撳墠鐢ㄦ埛浠诲姟淇℃伅锛屾柊澧炰竴涓鎴蜂换鍔★紒");
@@ -214,14 +131,14 @@
param.setName("鍏ュ簱閫氱煡鍗�");
param.setCreateUser(data.getCreateUser());
param.setId(data.getId());
- inoutManagerMapper.addNoticeIn(param);
+ inoutCommonMapper.addNoticeIn(param);
}
return i;
}
@Override
public List<InoutNoticeIn> getUnComNoticeIn(String companyId) {
- return inoutManagerMapper.getUnComNoticeIn(companyId);
+ return inoutCommonMapper.getUnComNoticeIn(companyId);
}
@Override
@@ -238,32 +155,24 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(ContextUtil.subDeptId(null));
}
- inoutManagerMapper.reSumNoticeInComplete(param);
+ inoutCommonMapper.reSumNoticeInComplete(param);
return null;
}
@Override
public Integer queryNoticeOut(NoticeParam param) {
- return inoutManagerMapper.queryNoticeOut(param);
+ return inoutCommonMapper.queryNoticeOut(param);
}
@Override
public Integer queryNoticeIn(NoticeParam param) {
- return inoutManagerMapper.queryNoticeIn(param);
+ return inoutCommonMapper.queryNoticeIn(param);
}
-// @Override
-// public InoutNoticeOut getInoutNoticeOut(NoticeOutParam param) {
-// List<InoutNoticeOut> list = inoutManagerMapper.getNoticeOut(param);
-// if (null == list || list.isEmpty()) {
-// return null;
-// }
-// return list.get(0);
-// }
@Override
public List<InoutNoticeOut> getUnComNoticeOut(String companyId) {
- return inoutManagerMapper.getUnComNoticeOut(companyId);
+ return inoutCommonMapper.getUnComNoticeOut(companyId);
}
@@ -284,7 +193,7 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(ContextUtil.subDeptId(null));
}
- inoutManagerMapper.reSumNoticeOutComplete(param);
+ inoutCommonMapper.reSumNoticeOutComplete(param);
return null;
}
@@ -344,13 +253,11 @@
@Override
public List<InoutNoticeIn> listNoticeIn(NoticeParam param) {
- return inoutManagerMapper.listNoticeIn(param);
+ return inoutCommonMapper.listNoticeIn(param);
}
@Override
public List<InoutNoticeOut> listNoticeOut(NoticeParam param) {
- return inoutManagerMapper.listNoticeOut(param);
+ return inoutCommonMapper.listNoticeOut(param);
}
-
-
}
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 eea934f..561a594 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
@@ -92,11 +92,9 @@
inoutConfService.saveSysConfData(data);
-
InoutSysConf newData = new InoutSysConf();
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 003eb33..11e9d06 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
@@ -23,9 +23,7 @@
import java.util.Map;
/**
- * @Desc: 鍑哄叆搴撳畾鏃朵换鍔°��
- * 1銆侀�氱煡鍗曞畬鎴愰噺缁熻
- * 2銆佸嚭鍏ュ簱搴撳瓨绠＄悊缁熻
+ * @Desc: 鍑哄叆搴撳畾鏃朵换鍔°�� 1銆侀�氱煡鍗曞畬鎴愰噺缁熻 2銆佸嚭鍏ュ簱搴撳瓨绠＄悊缁熻
* @author: Andy
* @update-time: 2022/11/22
*/
@@ -33,187 +31,181 @@
@Component(InoutScheduled.BEAN_ID)
public class InoutScheduled {
- public static final String BEAN_ID = "basic.inoutScheduled";
+ public static final String BEAN_ID = "basic.inoutScheduled";
- @Resource
- private InoutCommonService inoutCommonService;
+ @Resource
+ private InoutCommonService inoutCommonService;
- @Resource
- private InoutService inoutService;
+ @Resource
+ private InoutService inoutService;
- @Resource
- private CoreCommonService commonService;
+ @Resource
+ private CoreCommonService commonService;
+ /**
+ * 姣忓ぉ鏅氫笂11鐐硅繘琛屾洿鏂版湭瀹屾垚鍑哄叆搴撻�氱煡鍗曠殑瀹屾垚閲�
+ */
+ @Scheduled(cron = "0 0 23 * * ?")
+ public void scheduled1() {
- /**
- * 姣忓ぉ鏅氫笂11鐐硅繘琛屾洿鏂版湭瀹屾垚鍑哄叆搴撻�氱煡鍗曠殑瀹屾垚閲�
- */
- @Scheduled(cron = "0 0 23 * * ?")
- public void scheduled1() {
+ List<DefaultCompany> listCompany = commonService.getCompanyList();
+ if (null == listCompany)
+ return;
- List<DefaultCompany> listCompany = commonService.getCompanyList();
- if (null == listCompany) return;
+ // 鑾峰彇3澶╁唴鐨勫嚭鍏ュ簱璁板綍锛屽鏋滄湁璁板綍鍒欐墽琛岋紝濡傛灉娌℃湁锛屽垯鏃犻渶鎵ц
+ Date start = DateUtil.getNewByDay(null, -3);
+ InoutParam param;
+ List<InoutData> listRecord;
+ for (DefaultCompany company : listCompany) {
+ param = new InoutParam();
+ param.setStart(start);
+ param.setCompanyId(company.getId());
+ listRecord = inoutService.listRecordData(param);
- //鑾峰彇3澶╁唴鐨勫嚭鍏ュ簱璁板綍锛屽鏋滄湁璁板綍鍒欐墽琛岋紝濡傛灉娌℃湁锛屽垯鏃犻渶鎵ц
- Date start = DateUtil.getNewByDay(null, -3);
- InoutParam param;
- List<InoutData> listRecord;
- for (DefaultCompany company : listCompany) {
- param = new InoutParam();
- param.setStart(start);
- param.setCompanyId(company.getId());
- listRecord = inoutService.listRecordData(param);
+ noticeCompleteExe(company.getId(), listRecord);
- noticeCompleteExe(company.getId(), listRecord);
+ sumDepotStoreExe(company.getId(), listRecord);
+ }
- sumDepotStoreExe(company.getId(), listRecord);
- }
+ }
- }
+ /**
+ * basic.inoutScheduled#sumDepotStoreExeByHand
+ * <p>
+ * <p>
+ * 鎵嬪姩鎵ц鍑哄叆搴撳簱瀛樼粺璁″叆鍙�
+ *
+ * @param start
+ * @return
+ */
+ @Expose
+ public String sumDepotStoreExeByHand(Date start) {
+ if (null == start)
+ start = new Date();
- /**
- * basic.inoutScheduled#sumDepotStoreExeByHand
- * <p>
- * <p>
- * 鎵嬪姩鎵ц鍑哄叆搴撳簱瀛樼粺璁″叆鍙�
- *
- * @param start
- * @return
- */
- @Expose
- public String sumDepotStoreExeByHand(Date start) {
+ start = DateUtil.getCurZero(start);
- if (null == start) start = new Date();
+ // 鑾峰彇3澶╁唴鐨勫嚭鍏ュ簱璁板綍锛屽鏋滄湁璁板綍鍒欐墽琛岋紝濡傛灉娌℃湁锛屽垯鏃犻渶鎵ц
+ start = DateUtil.getNewByDay(null, -3);
+ String companyId = ContextUtil.getCompanyId();
- start = DateUtil.getCurZero(start);
+ InoutParam param = new InoutParam();
+ param.setStart(start);
+ param.setCompanyId(companyId);
- //鑾峰彇3澶╁唴鐨勫嚭鍏ュ簱璁板綍锛屽鏋滄湁璁板綍鍒欐墽琛岋紝濡傛灉娌℃湁锛屽垯鏃犻渶鎵ц
- start = DateUtil.getNewByDay(null, -3);
- String companyId = ContextUtil.getCompanyId();
+ List<InoutData> listRecord = inoutService.listRecordData(param);
- InoutParam param = new InoutParam();
- param.setStart(start);
- param.setCompanyId(companyId);
+ sumDepotStoreExe(companyId, listRecord);
- List<InoutData> listRecord = inoutService.listRecordData(param);
+ return "SUCCESS";
+ }
- sumDepotStoreExe(companyId, listRecord);
+ /**
+ * 鍚屾浠撳簱搴撳瓨锛屾牴鎹繎鏈熷嚭鍏ュ簱璁板綍锛屽鏋滄病鏈夎褰曞垯琛ㄧず鏃犲嚭鍏ュ簱鎿嶄綔锛屽彇娑堟墽琛�
+ *
+ * @param companyId
+ * @param listRecord
+ */
+ private void sumDepotStoreExe(String companyId, List<InoutData> listRecord) {
- return "SUCCESS";
- }
+ if (null == listRecord || listRecord.isEmpty()) {
+ log.info("-----------绯荤粺鑷姩鍚屾搴撳瓨锛岃繎鏈熸棤鍑哄叆搴撹褰曪紝鍙栨秷鍚屾浠撳簱搴撳瓨鈥︹�}", companyId);
+ return;
+ }
- /**
- * 鍚屾浠撳簱搴撳瓨锛屾牴鎹繎鏈熷嚭鍏ュ簱璁板綍锛屽鏋滄病鏈夎褰曞垯琛ㄧず鏃犲嚭鍏ュ簱鎿嶄綔锛屽彇娑堟墽琛�
- *
- * @param companyId
- * @param listRecord
- */
- private void sumDepotStoreExe(String companyId, List<InoutData> listRecord) {
+ // 鑾峰彇鏈夊嚭鍏ュ簱璁板綍鐨勪粨搴�
+ Map<String, InoutRecord> map = new HashMap<>();
+ String key;
+ DepotStore lastStore;
+ double sumRecordWeight = 0.0;
+ InoutParam param;
+ for (InoutData data : listRecord) {
+ key = data.getDepotId() + "_" + data.getType();
+ if (null != map.get(key))
+ continue;
- if (null == listRecord || listRecord.isEmpty()) {
- log.info("-----------绯荤粺鑷姩鍚屾搴撳瓨锛岃繎鏈熸棤鍑哄叆搴撹褰曪紝鍙栨秷鍚屾浠撳簱搴撳瓨鈥︹�}", companyId);
- return;
- }
+ map.put(key, data);
- //鑾峰彇鏈夊嚭鍏ュ簱璁板綍鐨勪粨搴�
- Map<String, InoutRecord> map = new HashMap<>();
- String key;
- DepotStore lastStore;
- double sumRecordWeight = 0.0;
- InoutParam param;
- for (InoutData data : listRecord) {
- key = data.getDepotId() + "_" + data.getType();
- if (null != map.get(key)) continue;
+ // 鏍规嵁鏈�鍚庝竴杞﹁繘琛屾眹鎬荤粺璁★紝寮�濮嬫椂闂存槸浠撳簱搴撳瓨鏈�鍚庝竴涓椂闂存埅姝㈠埌褰撳墠
+ lastStore = commonService.getLastDepotStore(data.getDepotId());
+ if (null == lastStore) {
+ log.error(
+ "--------鍑哄叆搴撳畾鏃朵换鍔�-----娌℃湁鑾峰彇鍒颁粨搴撴渶鍚庡簱瀛樹俊鎭紝鍙栨秷鑷姩缁熻锛岃鏍稿涓氬姟閫昏緫--浠撳簱-{}",
+ data.getDepotId());
+ continue;
+ }
+ // 鍙湁鍑哄叆搴撶姸鎬佺殑浠撳簱鎵嶈繘琛岀粺璁★紝鍏朵粬鐘舵�佽〃绀哄嚭鍏ュ簱浣滀笟瀹屾垚锛屼笉鍦ㄦ墽琛岀粺璁�
+ if (DepotStatus.STATUS_2.getCode().equals(
+ lastStore.getDepotStatus())
+ || DepotStatus.STATUS_4.getCode().equals(
+ lastStore.getDepotStatus())) {
- map.put(key, data);
+ param = new InoutParam();
+ // param.setStart(lastStore.getCreateDate());
+ param.setEnd(new Date());
+ param.setDeptId(data.getDeptId());
+ param.setDepotId(data.getDepotId());
+ param.setCompanyId(data.getCompanyId());
+ param.setType(data.getType());
- //鏍规嵁鏈�鍚庝竴杞﹁繘琛屾眹鎬荤粺璁★紝寮�濮嬫椂闂存槸浠撳簱搴撳瓨鏈�鍚庝竴涓椂闂存埅姝㈠埌褰撳墠
- lastStore = commonService.getLastDepotStore(data.getDepotId());
- if (null == lastStore) {
- log.error("--------鍑哄叆搴撳畾鏃朵换鍔�-----娌℃湁鑾峰彇鍒颁粨搴撴渶鍚庡簱瀛樹俊鎭紝鍙栨秷鑷姩缁熻锛岃鏍稿涓氬姟閫昏緫--浠撳簱-{}", data.getDepotId());
- continue;
- }
+ // 鍑哄叆搴撻噸閲忓悎璁�
+ sumRecordWeight = inoutService.sumRecordWeight(param);
+ // 鏂板涓�鏉″簱瀛樿褰�
+ lastStore.setRemark("绯荤粺瀹氭椂鐢熸垚璁板綍");
+ lastStore.setId(ContextUtil.getUUID());
+ lastStore.setUpdateUser(null);
+ lastStore.setUpdateDate(new Date());
+ // lastStore.setCreateDate(new Date());
- //鍙湁鍑哄叆搴撶姸鎬佺殑浠撳簱鎵嶈繘琛岀粺璁★紝鍏朵粬鐘舵�佽〃绀哄嚭鍏ュ簱浣滀笟瀹屾垚锛屼笉鍦ㄦ墽琛岀粺璁�
- if (DepotStatus.STATUS_2.getCode().equals(lastStore.getDepotStatus()) ||
- DepotStatus.STATUS_4.getCode().equals(lastStore.getDepotStatus())) {
+ if (InoutConstant.TYPE_IN.equals(data.getType())) {
+ lastStore.setStorageReal(lastStore.getStorageReal()
+ + sumRecordWeight);
+ }
- param = new InoutParam();
- //param.setStart(lastStore.getCreateDate());
- param.setEnd(new Date());
- param.setDeptId(data.getDeptId());
- param.setDepotId(data.getDepotId());
- param.setCompanyId(data.getCompanyId());
- param.setType(data.getType());
+ if (InoutConstant.TYPE_OUT.equals(data.getType())) {
+ lastStore.setStorageReal(lastStore.getStorageReal()
+ - sumRecordWeight);
+ }
- //鍑哄叆搴撻噸閲忓悎璁�
- sumRecordWeight = inoutService.sumRecordWeight(param);
+ commonService.addDepotStore(lastStore, true);
+ }
- //鏂板涓�鏉″簱瀛樿褰�
- lastStore.setRemark("绯荤粺瀹氭椂鐢熸垚璁板綍");
- lastStore.setId(ContextUtil.getUUID());
- lastStore.setUpdateUser(null);
- lastStore.setUpdateDate(new Date());
- // lastStore.setCreateDate(new Date());
+ }
+ }
- if (InoutConstant.TYPE_IN.equals(data.getType())) {
- lastStore.setStorageReal(lastStore.getStorageReal() + sumRecordWeight);
- }
+ /**
+ * 鍚屾閫氱煡鍗曞畬鎴愰噺锛屾牴鎹繎鏈熷嚭鍏ュ簱璁板綍锛屽鏋滄棤杩戞湡鍑哄叆搴撹褰曪紝鍒欒〃绀烘棤鍑哄叆搴撲綔涓氾紝鍙栨秷鎵ц
+ *
+ * @param companyId
+ * @param listRecord
+ */
+ public void noticeCompleteExe(String companyId, List<InoutData> listRecord) {
+ log.info("----------绯荤粺瀹氭椂鏇存柊鍑哄叆搴撻�氱煡鍗曞畬鎴愰噺----------");
- if (InoutConstant.TYPE_OUT.equals(data.getType())) {
- lastStore.setStorageReal(lastStore.getStorageReal() - sumRecordWeight);
- }
+ if (null == listRecord || listRecord.isEmpty()) {
+ log.info("-----------绯荤粺鑷姩鍚屾搴撳瓨锛岃繎鏈熸棤鍑哄叆搴撹褰曪紝鍙栨秷鍚屾閫氱煡鍗曞畬鎴愰噺鈥︹�}", companyId);
+ return;
+ }
+
+ //TODO 寰呬紭鍖�
- commonService.addDepotStore(lastStore, true);
- }
+ // 鑾峰彇鎵�鏈夋湭瀹屾垚鐘舵�佺殑鍑哄簱閫氱煡鍗�
+ List<InoutNoticeOut> noticeOutList = inoutCommonService.getUnComNoticeOut(companyId);
- }
- }
+ // 鑾峰彇鎵�鏈夋湭瀹屾垚鐘舵�佺殑鍏ュ簱閫氱煡鍗�
+ List<InoutNoticeIn> noticeInList = inoutCommonService.getUnComNoticeIn(companyId);
+
+ String deptId = noticeInList.get(0).getDeptId();
+ // 鏇存柊鍏ュ簱閫氱煡鍗曞畬鎴愰噺
+ inoutCommonService.updateSumNoticeIn(deptId,
+ noticeInList);
- /**
- * 鍚屾閫氱煡鍗曞畬鎴愰噺锛屾牴鎹繎鏈熷嚭鍏ュ簱璁板綍锛屽鏋滄棤杩戞湡鍑哄叆搴撹褰曪紝鍒欒〃绀烘棤鍑哄叆搴撲綔涓氾紝鍙栨秷鎵ц
- *
- * @param companyId
- * @param listRecord
- */
- public void noticeCompleteExe(String companyId, List<InoutData> listRecord) {
- log.info("----------绯荤粺瀹氭椂鏇存柊鍑哄叆搴撻�氱煡鍗曞畬鎴愰噺----------");
-
- if (null == listRecord || listRecord.isEmpty()) {
- log.info("-----------绯荤粺鑷姩鍚屾搴撳瓨锛岃繎鏈熸棤鍑哄叆搴撹褰曪紝鍙栨秷鍚屾閫氱煡鍗曞畬鎴愰噺鈥︹�}", companyId);
- return;
- }
-
-
- List<InoutSysConf> inoutSysConfList = inoutCommonService.getCacheInoutSysConf(companyId);
-
- //涓嶉厤缃鏄庢病鏈夊惎鍔ㄥ嚭鍏ュ簱
- if (null == inoutSysConfList || inoutSysConfList.isEmpty()) {
- return;
- }
-
- //鑾峰彇鎵�鏈夋湭瀹屾垚鐘舵�佺殑鍑哄簱閫氱煡鍗�
- List<InoutNoticeOut> noticeOutList = inoutCommonService.getUnComNoticeOut(companyId);
-
-
- //鑾峰彇鎵�鏈夋湭瀹屾垚鐘舵�佺殑鍏ュ簱閫氱煡鍗�
- List<InoutNoticeIn> noticeInList = inoutCommonService.getUnComNoticeIn(companyId);
-
-
- for (InoutSysConf inoutSysConf : inoutSysConfList) {
-
- // 鍒ゆ柇鍏ュ簱閫氱煡鍗曟槸鍚﹀惎鐢�
- //鏇存柊鍏ュ簱閫氱煡鍗曞畬鎴愰噺
- inoutCommonService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
-
- // 鍒ゆ柇鍑哄簱閫氱煡鍗曟槸鍚﹀惎鐢�
- //鏇存柊鍑哄簱閫氱煡鍗曞畬鎴愰噺
- inoutCommonService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
- }
- }
+ // 鏇存柊鍑哄簱閫氱煡鍗曞畬鎴愰噺
+ inoutCommonService.updateSumNoticeOut(deptId,noticeOutList);
+ }
}
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 43bf850..205cf4b 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -263,6 +263,23 @@
and id_=#{data.id}
</update>
+ <update id="updateDataByHandle" parameterType="com.ld.igds.inout.dto.InoutData">
+ update D_INOUT_RECORD set
+ <if test="data.deHandle != null">DE_HANDLE_ = #{data.deHandle},</if>
+ <if test="data.handleUser != null">HANDLE_USER_ = #{data.handleUser},</if>
+ <if test="data.deOther != null">DE_OTHER_ = #{data.deOther},</if>
+ <if test="data.deOtherInfo != null">DE_OTHER_INFO_ = #{data.deOtherInfo},</if>
+ <if test="data.dePackage != null">DE_PACKAGE_ = #{data.package},</if>
+ <if test="data.bzw != null">bzw = #{data.bzw},</if>
+ <if test="data.dbz != null">dbz = #{data.dbz},</if>
+ <if test="data.bzbjs != null">bzbjs = #{data.bzbjs},</if>
+ <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
+ UPDATE_TIME_ = #{data.updateTime}
+ where
+ company_id_ =#{data.companyId}
+ and id_=#{data.id}
+ </update>
+
<!-- 鏂板鏁版嵁 -->
<insert id="insertData" parameterType="com.ld.igds.inout.dto.InoutData">
diff --git a/igds-web/src/main/resources/application-dev.yml b/igds-web/src/main/resources/application-dev.yml
index 3a8318f..3fb2357 100644
--- a/igds-web/src/main/resources/application-dev.yml
+++ b/igds-web/src/main/resources/application-dev.yml
@@ -47,7 +47,6 @@
host: 127.0.0.1
port: 6379
password: Abc123..
- # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
max-wait: -1
diff --git a/igds-web/src/main/resources/static/admin/inout/in-handle.js b/igds-web/src/main/resources/static/admin/inout/in-handle.js
index 530ee1e..342373c 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-handle.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-handle.js
@@ -1,327 +1,296 @@
-//鍊间粨
+//绉伴噸-鍖呮嫭绌鸿溅鍜屾弧杞︾О閲�
var layer;
var form;
var upload;
-var plateNum = null;
var recordData = null;// 涓氬姟鏁版嵁淇℃伅
+var paramIntelCard;//璁惧璇嗗埆缁撴灉
+var paramIdCard;//璁惧璇嗗埆缁撴灉
var img1, img2, img3;// 椤甸潰涓殑鍥剧墖涓婁紶鍚嶇О
-$(function() {
- layui.use([ 'layer', 'laydate', 'form', 'upload'], function() {
- upload = layui.upload;
- layer = layui.layer;
- form = layui.form;
+$(function () {
+ layui.use(['layer', 'laydate', 'form', 'upload'], function () {
+ upload = layui.upload;
+ layer = layui.layer;
+ form = layui.form;
- layui.laydate.render({
- elem : '#handleEnd',
- type : "datetime",
- theme : '#7b8e9f'
- });
- layui.laydate.render({
- elem : '#handleStart',
- type : "datetime",
- theme : '#7b8e9f'
- });
+ //涓婁紶
+ upload.render({
+ elem: '#kccz-r-btn1',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept: 'images',
+ before: function (obj) {
+ var plateNum = $("#plateNum").val();
+ this.data = {"plateNum": plateNum, "type": "1"};//鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function (index, file, result) {
+ $('#kccz-r-img1').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function (res) {
+ //濡傛灉涓婁紶澶辫触
+ if (res.code > 0) {
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img1 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ //console.log(img1);
+ }
+ });
+ upload.render({
+ elem: '#kccz-r-btn2',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept: 'images',
+ before: function (obj) {
+ var plateNum = $("#plateNum").val();
+ this.data = {"plateNum": plateNum, "type": "1"};//鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function (index, file, result) {
+ $('#kccz-r-img2').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function (res) {
+ //濡傛灉涓婁紶澶辫触
+ if (res.code > 0) {
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img2 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ // console.log(img2);
+ }
+ });
+ upload.render({
+ elem: '#kccz-r-btn3',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4 * 1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept: 'images',
+ before: function (obj) {
+ var plateNum = $("#plateNum").val();
+ this.data = {"plateNum": plateNum}; //鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function (index, file, result) {
+ $('#kccz-r-img3').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function (res) {
+ //濡傛灉涓婁紶澶辫触
+ if (res.code > 0) {
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img3 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ }
+ });
- //涓婁紶
- upload.render({
- elem: '#kccz-r-btn1',
- url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
- accept : 'images',
- before: function(obj){
- var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum,"type":"1"};//鎼哄甫鍙傛暟
- //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
- obj.preview(function(index, file, result){
- $('#kccz-r-img1').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
- });
- },
- done: function(res){
- //濡傛灉涓婁紶澶辫触
- if(res.code > 0){
- layer.msg("鍥剧墖涓婁紶澶辫触锛�");
- }
- //涓婁紶鎴愬姛
- img1 = res.msg;
- layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
- //console.log(img1);
- }
- });
- upload.render({
- elem: '#kccz-r-btn2',
- url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
- accept : 'images',
- before: function(obj){
- var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum,"type":"1"};//鎼哄甫鍙傛暟
- //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
- obj.preview(function(index, file, result){
- $('#kccz-r-img2').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
- });
- },
- done: function(res){
- //濡傛灉涓婁紶澶辫触
- if(res.code > 0){
- layer.msg("鍥剧墖涓婁紶澶辫触锛�");
- }
- //涓婁紶鎴愬姛
- img2 = res.msg;
- layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
- // console.log(img2);
- }
- });
- upload.render({
- elem: '#kccz-r-btn3',
- url: '../file/update-file', //涓婁紶鎺ュ彛
- size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
- accept : 'images',
- before: function(obj){
- var plateNum = $("#plateNum").val();
- this.data={"plateNum":plateNum}; //鎼哄甫鍙傛暟
- //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
- obj.preview(function(index, file, result){
- $('#kccz-r-img3').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
- });
- },
- done: function(res){
- //濡傛灉涓婁紶澶辫触
- if(res.code > 0){
- layer.msg("鍥剧墖涓婁紶澶辫触锛�");
- }
- //涓婁紶鎴愬姛
- img3 = res.msg;
- layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
- }
- });
- });
+ });
- showProgress();
-
- //璋冩暣瀛楁涓嶇紪杈�
- $("#depotId").attr("disabled",true);
- $("#foodVariety").attr("disabled",true);
- $("#foodLevel").attr("disabled",true);
+ //鏄剧ず娴佺▼鐜妭
+ showProgress();
});
-//鎺у埗娴佺▼鐜妭鏄剧ず
-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");
- }
-}
-
-//鏂扮殑璇诲崱鏂瑰紡
+//璇绘櫤鎱у崱
function flushICCard() {
- $("#intelCard").val(null);
- resetForm();
- $.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);
- flushData();
- }
- },
- error: function () {
- layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
- }
- });
+ if (!cardDto.protocol) {
+ flushICCard1();
+ } else {
+ flushICCard2();
+ }
}
-// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+/**
+ * 鍗忚璇诲彇鏅烘収鍗�
+ */
+function flushICCard2() {
+ var index = layer.load();
+ var param = JSON.stringify(cardDto);
+ $.ajax({
+ type: "POST",
+ url: "../../inout/api/get-icCard",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: param,
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ alertError(result.msg);
+ } else {
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("IC鍗¤鍙栧け璐�");
+ }
+ });
+}
+
+/**
+ * 鏈湴璇诲彇鏅烘収鍗�
+ */
+function flushICCard1() {
+ var index = layer.load();
+ $("#text-param").val(null);
+ $("#form-data")[0].reset();
+ form.render();
+ recordData = null;
+ $.ajax({
+ type: "GET",
+ async: true,
+ url: "http://127.0.0.1:9111/ICCARD",
+ data: {},
+ dataType: "jsonp",
+ jsonp: "callback",
+ jsonpCallback: "jsonpCallback",
+ success: function (json) {
+ var data = json.no;
+ layer.close(index);
+ if (data === "not found") {
+ alertError("璇烽噸鏂拌鍗★紒");
+ } else {
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("IC鍗¤鍙栧嚭閿欙紒");
+ }
+ });
+}
+
+// 浣跨敤鎻掍欢鑾峰彇韬唤璇�
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;
- }
- $("#userId").val(data.idNum);
- flushData();
- },
- error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
- offset: ['300px', '300px']
- });
- layer.close(index);
- }
- });
+ 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") {
+ alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
+ return;
+ }
+ paramIdCard = data;
+ $("#text-param").text("璇嗗埆韬唤璇侊細" + paramIdCard);
+ flushData(null, paramIdCard);
+ },
+ error: function () {
+ alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
+ layer.close(index);
+ }
+ });
}
-// 鎵撳嵃鎶芥牱鍗�
-function printBill() {
- layer.alert("鎵撳嵃鏍煎紡寰呭畾涔夆�︹��");
+function flushByHand() {
+ flushData(null, null);
}
// 琛ㄥ崟娓呯┖
function resetForm() {
- $("#form-data")[0].reset();
- //娓呴櫎鍥剧墖
- $('#kccz-r-img1').removeAttr('src');
- $('#kccz-r-img2').removeAttr('src');
- $('#kccz-r-img3').removeAttr('src');
- form.render();
- recordData = null;
+ $("#form-data")[0].reset();
+ form.render();
+ recordData = null;
+ $("#text-param").val(null);
}
-// 鏇存柊鏁版嵁淇℃伅
-function flushData() {
- var userId2 = $("#userId").val();
- var plateNum = $("#plateNum").val();
- var intelCard = $("#intelCard").val();
- var param = {
- type : type,
- progress : progress,
- userId:userId2,
- intelCard:intelCard,
- plateNum : plateNum
- };
- var index = layer.load();
- $.ajax({
- type : "POST",
- url : "../../basic/inout/inout-query",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(param),
- success : function(result) {
- layer.close(index);
- if (result.code != "0000") {
- notify(result.msg,result.data);
- } else {
- recordData = result.data;
- // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
- form.val("form-data", recordData);
- form.render();
- }
- },
- error : function() {
- layer.close(index);
- layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
+function flushPage() {
+ layer.confirm('纭畾瑕佸埛鏂伴〉闈㈠悧锛�', {icon: 3, title: '鎻愮ず'}, function (index) {
+ resetForm();
+ layer.close(index);
+ });
+}
+
+// --鏌ヨ鏂规硶,鑾峰彇韬唤璇佸彿銆佸崱鍙枫�佽溅鐗屽彿锛岃繘琛屾煡璇�
+function flushData(intelCard, userIdCard) {
+ var index = layer.load();
+ var userIdCard = userIdCard;
+ var intelCard = intelCard;
+ var plateNum = $("#plateNum").val();
+ var param = {
+ type: type,
+ progress: progress,
+ intelCard: intelCard,
+ userId: userIdCard,
+ plateNum: plateNum
+ };
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/inout-query",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(param),
+ success: function (result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ notifyProgress(result.msg, result.data);
+ } else {
+ recordData = result.data;
+ // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
+ form.val("form-data", recordData);
+ form.render();
+ }
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯");
+ }
+ });
}
// 褰撳墠瀹屾垚
function submit() {
- if (null == recordData) {
- layer.alert("娌℃湁鏁版嵁鍙互鎻愪氦锛侊紒锛�");
- return;
- }
- var index = layer.load();
- var data = form.val("form-data");
+ if (!recordData) {
+ alertError("娌℃湁涓氬姟鏁版嵁淇℃伅锛屾墽琛岃鎷掔粷");
+ return;
+ }
+ var data = form.val("form-data");
- // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
- Object.assign(recordData, data);
+ if (!data.handleUser) {
+ alertError("鎻愮ず锛氬�间粨浜轰笉鍙负绌�");
+ return;
+ }
- // 鑾峰彇鍥剧墖鍚嶇О
- recordData.files = [{
- fileName: img1
- }, {
- fileName: img2
- }, {
- fileName: img3
- }];
+ // 鑾峰彇鐓х墖
+ var files = [{
+ fileName: snapData.fileName1
+ }, {
+ fileName: snapData.fileName2
+ }, {
+ fileName: snapData.fileName3
+ }];
+ data.files = files;
- console.log(recordData);
-
- $.ajax({
- type : "POST",
- url : "../../basic/inout/inout-next-step",
- dataType : "json",
- contentType : "application/json;charset=UTF-8",
- data : JSON.stringify(recordData),
- success : function(result) {
- if (result.code != "0000") {
- notify(result.msg,result.data);
- } else {
- notify("鍊间粨瀹屾垚",result.data);
- // 閲嶇疆椤甸潰
- resetForm();
- }
- layer.close(index);
- },
- 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']});
- }
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: "../../basic/inout/submit-handle",
+ dataType: "json",
+ contentType: "application/json;charset=UTF-8",
+ data: JSON.stringify(data),
+ success: function (result) {
+ if (result.code != "0000") {
+ notify(result.msg, result.data);
+ } else {
+ notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
+ }
+ layer.close(index);
+ },
+ error: function () {
+ layer.close(index);
+ alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
+ }
+ });
}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-handle20230506.js b/igds-web/src/main/resources/static/admin/inout/in-handle20230506.js
new file mode 100644
index 0000000..530ee1e
--- /dev/null
+++ b/igds-web/src/main/resources/static/admin/inout/in-handle20230506.js
@@ -0,0 +1,327 @@
+//鍊间粨
+var layer;
+var form;
+var upload;
+var plateNum = null;
+var recordData = null;// 涓氬姟鏁版嵁淇℃伅
+var img1, img2, img3;// 椤甸潰涓殑鍥剧墖涓婁紶鍚嶇О
+
+$(function() {
+ layui.use([ 'layer', 'laydate', 'form', 'upload'], function() {
+ upload = layui.upload;
+ layer = layui.layer;
+ form = layui.form;
+
+ layui.laydate.render({
+ elem : '#handleEnd',
+ type : "datetime",
+ theme : '#7b8e9f'
+ });
+ layui.laydate.render({
+ elem : '#handleStart',
+ type : "datetime",
+ theme : '#7b8e9f'
+ });
+
+ //涓婁紶
+ upload.render({
+ elem: '#kccz-r-btn1',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept : 'images',
+ before: function(obj){
+ var plateNum = $("#plateNum").val();
+ this.data={"plateNum":plateNum,"type":"1"};//鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function(index, file, result){
+ $('#kccz-r-img1').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function(res){
+ //濡傛灉涓婁紶澶辫触
+ if(res.code > 0){
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img1 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ //console.log(img1);
+ }
+ });
+ upload.render({
+ elem: '#kccz-r-btn2',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept : 'images',
+ before: function(obj){
+ var plateNum = $("#plateNum").val();
+ this.data={"plateNum":plateNum,"type":"1"};//鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function(index, file, result){
+ $('#kccz-r-img2').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function(res){
+ //濡傛灉涓婁紶澶辫触
+ if(res.code > 0){
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img2 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ // console.log(img2);
+ }
+ });
+ upload.render({
+ elem: '#kccz-r-btn3',
+ url: '../file/update-file', //涓婁紶鎺ュ彛
+ size: 4*1024, //闄愬埗鏂囦欢澶у皬锛屽崟浣岾B, 鏈�澶т笂浼�4MB
+ accept : 'images',
+ before: function(obj){
+ var plateNum = $("#plateNum").val();
+ this.data={"plateNum":plateNum}; //鎼哄甫鍙傛暟
+ //棰勮鏈湴鏂囦欢绀轰緥锛屼笉鏀寔ie8
+ obj.preview(function(index, file, result){
+ $('#kccz-r-img3').attr('src', result); //鍥剧墖閾炬帴锛坆ase64锛�
+ });
+ },
+ done: function(res){
+ //濡傛灉涓婁紶澶辫触
+ if(res.code > 0){
+ layer.msg("鍥剧墖涓婁紶澶辫触锛�");
+ }
+ //涓婁紶鎴愬姛
+ img3 = res.msg;
+ layer.msg("鍥剧墖涓婁紶鎴愬姛锛�");
+ }
+ });
+ });
+
+ showProgress();
+
+ //璋冩暣瀛楁涓嶇紪杈�
+ $("#depotId").attr("disabled",true);
+ $("#foodVariety").attr("disabled",true);
+ $("#foodLevel").attr("disabled",true);
+});
+
+//鎺у埗娴佺▼鐜妭鏄剧ず
+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");
+ }
+}
+
+//鏂扮殑璇诲崱鏂瑰紡
+function flushICCard() {
+ $("#intelCard").val(null);
+ resetForm();
+ $.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);
+ flushData();
+ }
+ },
+ error: function () {
+ layer.alert("IC鍗¤鍙栧嚭閿欙紒", {offset: ['300px', '300px']});
+ }
+ });
+}
+
+// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+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;
+ }
+ $("#userId").val(data.idNum);
+ flushData();
+ },
+ error: function () {
+ layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
+ offset: ['300px', '300px']
+ });
+ layer.close(index);
+ }
+ });
+}
+
+// 鎵撳嵃鎶芥牱鍗�
+function printBill() {
+ layer.alert("鎵撳嵃鏍煎紡寰呭畾涔夆�︹��");
+}
+
+// 琛ㄥ崟娓呯┖
+function resetForm() {
+ $("#form-data")[0].reset();
+ //娓呴櫎鍥剧墖
+ $('#kccz-r-img1').removeAttr('src');
+ $('#kccz-r-img2').removeAttr('src');
+ $('#kccz-r-img3').removeAttr('src');
+ form.render();
+ recordData = null;
+}
+
+// 鏇存柊鏁版嵁淇℃伅
+function flushData() {
+ var userId2 = $("#userId").val();
+ var plateNum = $("#plateNum").val();
+ var intelCard = $("#intelCard").val();
+ var param = {
+ type : type,
+ progress : progress,
+ userId:userId2,
+ intelCard:intelCard,
+ plateNum : plateNum
+ };
+ var index = layer.load();
+ $.ajax({
+ type : "POST",
+ url : "../../basic/inout/inout-query",
+ dataType : "json",
+ contentType : "application/json;charset=UTF-8",
+ data : JSON.stringify(param),
+ success : function(result) {
+ layer.close(index);
+ if (result.code != "0000") {
+ notify(result.msg,result.data);
+ } else {
+ recordData = result.data;
+ // 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
+ form.val("form-data", recordData);
+ form.render();
+ }
+ },
+ error : function() {
+ layer.close(index);
+ layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ }
+ });
+}
+
+// 褰撳墠瀹屾垚
+function submit() {
+ if (null == recordData) {
+ layer.alert("娌℃湁鏁版嵁鍙互鎻愪氦锛侊紒锛�");
+ return;
+ }
+ var index = layer.load();
+ var data = form.val("form-data");
+
+ // 鍚堝苟鏇存柊鐣跺墠缂栬緫鏁版嵁
+ Object.assign(recordData, data);
+
+ // 鑾峰彇鍥剧墖鍚嶇О
+ recordData.files = [{
+ fileName: img1
+ }, {
+ fileName: img2
+ }, {
+ fileName: img3
+ }];
+
+ console.log(recordData);
+
+ $.ajax({
+ type : "POST",
+ url : "../../basic/inout/inout-next-step",
+ dataType : "json",
+ contentType : "application/json;charset=UTF-8",
+ data : JSON.stringify(recordData),
+ success : function(result) {
+ if (result.code != "0000") {
+ notify(result.msg,result.data);
+ } else {
+ notify("鍊间粨瀹屾垚",result.data);
+ // 閲嶇疆椤甸潰
+ resetForm();
+ }
+ layer.close(index);
+ },
+ 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/in-weight.js b/igds-web/src/main/resources/static/admin/inout/in-weight.js
index b2cf50b..4577e0a 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-weight.js
@@ -7,6 +7,7 @@
var timerWeight;
var paramIntelCard;//璁惧璇嗗埆缁撴灉
var paramIdCard;//璁惧璇嗗埆缁撴灉
+var step = 1;
$(function () {
layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
@@ -324,6 +325,8 @@
weightDto.weight = 0.0;
$("#weightValue").text("0.0");
$("#img_scale_statule").attr("src", "../../static/images/icon-red.png");
+
+ $("#text-param").val(null);
}
function flushPage() {
@@ -473,7 +476,7 @@
data: JSON.stringify(recordData),
success: function (result) {
if (result.code != "0000") {
- notify(result.msg, result.data);
+ alertError(result.msg);
} else {
notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
}
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-handle.html b/igds-web/src/main/resources/templates/admin/inout/in-handle.html
index e5b6008..5c6c098 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-handle.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-handle.html
@@ -1,540 +1,570 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta name="viewport"
- content="width=device-width, initial-scale=1, maximum-scale=1">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="renderer" content="webkit">
- <title>鍑哄叆搴撶鐞�-鍊间粨绠＄悊</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
+ <title>鍑哄叆搴撶鐞�-鍊间粨绠＄悊</title>
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/plugins/layui/css/layui.css}">
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/admin/inout/style.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
- <link rel="stylesheet" type="text/css"
- th:href="@{../../static/admin/inout/style.css}">
+ <style>
+ .kccz-r-btnbox {
+ width: 86px !important;
+ }
- <style>
- .display-none {
- display: none;
- }
+ .kccz-r-btn {
+ width: 86px !important;
+ }
- .layui-select-disabled .layui-disabled {
- color: #000 !important;
- }
+ #text-param {
+ font-size: 14px;
+ color: red;
+ padding-left: 10px;
+ }
- .depot-food input {
- line-height: 34px;
- padding-right: 10px;
- font-size: 16px;
- color: #666;
- background: #eff4f6;
- }
+ .display-none {
+ display: none;
+ }
- .rk-step-wrap {
- padding: 0px;
- border-bottom: 0px;
- text-align: center;
- }
+ .cursor {
+ cursor: pointer;
+ }
- .qyzj-btnbox {
- margin-top: 10px;
- }
+ .kccz-czxx-dl dt {
+ width: 25px;
+ height: 24px;
+ color: #000;
+ font-size: 18px;
+ }
- .qyzj-btnbox .rkbk-quick {
- margin-top: 20px;
- }
+ .kccz-left-box2 {
+ height: 555px;
+ }
- .kccz-data-btnbox {
- min-height: 38px;
- padding-top: 2px;
- }
- .kccz-con {
- margin: 15px 0;
- }
- .rkbk-search-btn {
- width: 100px;
- }
- </style>
+ .color-red {
+ color: red !important;
+ }
+
+ .layui-table td {
+ font-weight: bold;
+ }
+
+ .layui-select-disabled .layui-disabled {
+ color: #000 !important;
+ }
+
+ .depot-food input {
+ line-height: 34px;
+ padding-right: 10px;
+ font-size: 16px;
+ color: #666;
+ background: #eff4f6;
+ }
+
+ .rk-step-wrap {
+ padding: 0px;
+ border-bottom: 0px;
+ text-align: center;
+ }
+
+ .rkbk-quick {
+ margin-top: 15px !important;
+ }
+
+ .kccz-con {
+ margin: 10px 0px;
+ }
+
+ .border-no {
+ border: 0px;
+ }
+
+ .qyzj-btnbox {
+ margin-top: 10px;
+ }
+
+ .kccz-data-btnbox {
+ min-height: 38px;
+ padding-top: 2px;
+ }
+
+ .layui-layer-title {
+ font-weight: bold;
+ }
+
+ .rkbk-search-btn {
+ width: 100px;
+ height: 30px;
+ line-height: 30px;
+ font-size: 16px;
+ }
+
+ .r-240 {
+ right: 240px;
+ }
+
+ .r-120 {
+ right: 120px;
+ }
+
+ .rkbk-search-input {
+ background: #FFF !important;
+ }
+
+ .rkbk-search-input.bg-date {
+ background: #FFF !important;
+ }
+
+ #scaleName {
+ width: 130px;
+ height: 28px;
+ }
+
+ </style>
</head>
<body>
<div class="l-container layui-clear">
- <div class="rk-main">
+ <div class="rk-main">
+ <div class="qyzj-btnbox layui-clear">
- <div class="qyzj-btnbox layui-clear">
- <div class="rkbk-quick fl">
- <button class="rkbk-quick-btn layui-btn btn-green btn-sm"
- onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i>鍊间粨瀹屾垚
- </button>
- </div>
-
- <!-- 娴佺▼寮曞-->
- <div class="rk-step-wrap fr">
- <ul class="rk-step">
- <li id="progress-register" class="active rk-step-first">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-dengji.png}"/>
- </span>
- <p>鍏ュ簱鐧昏</p>
- </li>
- <li id="progress-check" class="active">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-zhijian.png}"/>
- </span>
- <p>鎵︽牱璐ㄦ</p>
- </li>
- <li id="progress-fullWeight" class="active">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-chengzhong.png}"/>
- </span>
- <p>婊¤溅绉伴噸</p>
- </li>
- <li id="progress-hand" class="active">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-xiehuo.png}"/>
- </span>
- <p>鍏ュ簱鍊间粨</p>
- </li>
- <li id="progress-emptyWeight">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-chengzhong.png}"/>
- </span>
- <p>绌鸿溅绉伴噸</p>
- </li>
- <li id="progress-cardBack">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-banli.png}"/>
- </span>
- <p>绂诲簱纭</p>
- </li>
- </ul>
- </div>
- <!-- 娴佺▼寮曞 END -->
- </div>
- <!--qyzj-btnbox end-->
+ <div class="rkbk-quick fl">
+ <button id="btn-submit"
+ class="rkbk-quick-btn layui-btn btn-green" onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i>鍊间粨瀹屾垚
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-violet"
+ onclick="flushPage()">
+ <i><img th:src="@{../../static/images/icon-shuaxin2.png}"/></i>鍒锋柊椤甸潰
+ </button>
+ </div>
+ <!-- 娴佺▼寮曞 -->
+ <div class="rk-step-wrap fr">
+ <ul class="rk-step">
+ <li id="progress-register" class="active rk-step-first">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-dengji.png}"/>
+ </span>
+ <p>鍏ュ簱鐧昏</p>
+ </li>
+ <li id="progress-check" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-zhijian.png}"/>
+ </span>
+ <p>鎵︽牱璐ㄦ</p>
+ </li>
+ <li id="progress-fullWeight" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}"/>
+ </span>
+ <p>婊¤溅绉伴噸</p>
+ </li>
+ <li id="progress-hand" class="">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-xiehuo.png}"/>
+ </span>
+ <p>鍏ュ簱鍊间粨</p>
+ </li>
+ <li id="progress-emptyWeight" class="">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}"/>
+ </span>
+ <p>绌鸿溅绉伴噸</p>
+ </li>
+ <li id="progress-cardBack">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-banli.png}"/>
+ </span>
+ <p>绂诲簱纭</p>
+ </li>
+ </ul>
+ </div>
+ <!-- 娴佺▼寮曞EDN -->
+ </div>
+ <!--qyzj-btnbox end-->
- <div class="kccz-con">
- <div class="kccz-left radius-6 fl bg-ef">
+ <div class="kccz-con">
+ <div class="kccz-left fl">
+ <div class="kccz-left-box2 radius-6">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>涓氬姟鏁版嵁淇℃伅<span id="text-param"></span></h3>
+ <div>
+ <input type="button" value="璇绘櫤鎱у崱"
+ class="rkbk-search-btn layui-btn r-240"
+ onclick="flushICCard()">
+ <input type="button" value="璇昏韩浠借瘉"
+ class="rkbk-search-btn layui-btn r-120"
+ onclick="flushIdCard()">
+ <input type="button" value="鎵嬪姩鏌ヨ"
+ class="rkbk-search-btn layui-btn" onclick="flushByHand()">
+ </div>
+ </div>
- <div class="kccz-left-box2 ">
+ <div class="kccz-data-form layui-row">
+ <form class="layui-form" action="" id="form-data"
+ lay-filter="form-data">
+ <div class="layui-form-item display-none">
+ <input type="text" name="id">
+ </div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="progress">
+ </div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="type">
+ </div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="deptId">
+ </div>
+ <div class="layui-form-item display-none">
+ <input type="text" name="companyId">
+ </div>
- <div class="rkbk-tit">
- <i></i>
- <h3>鍏ュ簱淇℃伅</h3>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">鏅烘収鍗″彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="intelCard" id="intelCard"
+ placeholder="鍒峰崱/鎵嬪姩褰曞叆" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
- <div class="kccz-data-form layui-row">
- <form class="layui-form" action="" id="form-data"
- lay-filter="form-data">
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-ID</label>
- <div class="layui-input-block">
- <input type="text" name="id" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">杞︾墝鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" id="plateNum" placeholder="鑷姩甯﹀叆/鎵嬪姩褰曞叆"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-娴佺▼鑺傜偣</label>
- <div class="layui-input-block">
- <input type="text" name="progress" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">鎵胯繍浜�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userName" placeholder="涓嶅彲缂栬緫" class="layui-input"
+ disabled>
+ </div>
+ </div>
+ </div>
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-涓氬姟绫诲瀷</label>
- <div class="layui-input-block">
- <input type="text" name="type" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗昳d</label>
- <div class="layui-input-block">
- <input type="text" name="noticeId" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">韬唤璇佸彿</label>
- <div class="layui-input-block">
- <input type="text" name="userId" id="userId"
- placeholder="鎵胯繍浜鸿韩浠借瘉鍙�" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">姣涢噸(婊¤溅)</label>
+ <div class="layui-input-block">
+ <input type="text" name="fullWeight" autocomplete="off"
+ placeholder="涓嶅彲缂栬緫" class="layui-input rkbk-search-input" disabled>
+ <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">杞︾墝鍙�</label>
- <div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum"
- autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐨噸(绌鸿溅)</label>
+ <div class="layui-input-block">
+ <input type="text" name="emptyWeight" autocomplete="off"
+ placeholder="涓嶅彲缂栬緫" class="layui-input rkbk-search-input"
+ disabled>
+ <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <div class="layui-col-xs4 kccz-data-btnbox">
- <input type="button" value="璇昏韩浠借瘉"
- class="rkbk-search-btn layui-btn"
- onclick="flushIdCard()">
- </div>
- <div class="layui-col-xs4 kccz-data-btnbox">
- <input type="button" value="璇诲崱"
- class="rkbk-search-btn layui-btn"
- onclick="flushICCard()">
- </div>
- <div class="layui-col-xs4 kccz-data-btnbox">
- <input type="button" value="鏌� 璇�"
- class="rkbk-search-btn layui-btn" onclick="flushData()">
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑� 閲�</label>
+ <div class="layui-input-block">
+ <input type="text" name="netWeight" autocomplete="off"
+ placeholder="涓嶅彲缂栬緫" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鏅烘収鍗″彿</label>
- <div class="layui-input-block">
- <input type="text" name="intelCard" id="intelCard"
- placeholder="鏅烘収鍗″彿" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">瀹㈡埛淇℃伅</label>
+ <div class="layui-input-block">
+ <input type="text" name="customerName" placeholder="涓嶅彲缂栬緫"
+ autocomplete="off" class="layui-input" disabled="disabled">
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">绌鸿溅绉伴噸</label>
- <div class="layui-input-block">
- <input type="text" name="emptyWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">瑁呭嵏浠撳簱</label>
+ <div class="layui-input-block">
+ <select name="depotId" id="depotId" lay-filter="select_depotId">
+ <option value="">涓嶅彲缂栬緫</option>
+ <option th:each="depot,depotSet:${listDepot}"
+ th:value="${depot.id}" th:text="${depot.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">婊¤溅绉伴噸</label>
- <div class="layui-input-block">
- <input type="text" name="fullWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">瑁呭嵏浠撳簱</label>
- <div class="layui-input-block">
- <select name="depotId" id="depotId">
- <option value="">涓嶅彲鏀�</option>
- <option th:each="depot,depotSet:${listDepot}"
- th:value="${depot.id}" th:text="${depot.name}"></option>
- </select>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">绮浜у湴</label>
+ <div class="layui-input-block">
+ <input type="text" name="foodLocation" placeholder="涓嶅彲缂栬緫"
+ autocomplete="off" class="layui-input" disabled="disabled">
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍑� 閲�</label>
- <div class="layui-input-block">
- <input type="text" name="netWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐜板満鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input id="deHandle" type="text" name="deHandle" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input weight"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呰鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="dePackage" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">鏉傝川鎵ｉ噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input type="text" name="impurity" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">%</em>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input type="text" name="deImpurity" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">寰�鏉ュ崟浣�</label>
- <div class="layui-input-block">
- <input type="text" name="customerName" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled>
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">绮绛夌骇</label>
- <div class="layui-input-block">
- <select name="foodLevel" id="foodLevel">
- <option value="">涓嶅彲鏀�</option>
- <option th:each="dic,dicSet:${listFoodLevel}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
- </select>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">鍊间粨浜�</label>
+ <div class="layui-input-block">
+ <input type="text" name="handleUser" autocomplete="off"
+ placeholder="鎵嬪姩褰曞叆" class="layui-input">
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item kccz-data-group-md">
- <label class="layui-form-label">姘村垎鎵ｉ噸</label>
- <div class="posi-r kccz-data-bfb fr">
- <input type="text" name="wet" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">%</em>
- </div>
- <div class="layui-input-block">
- <div class="posi-r">
- <input type="text" name="deWet" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">绮鍝佺</label>
- <div class="layui-input-block">
- <select name="foodVariety" id="foodVariety">
- <option value="">涓嶅彲鏀�</option>
- <option th:each="dic,dicSet:${listFoodVariety}"
- th:value="${dic.code}" th:text="${dic.name}"></option>
- </select>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏朵粬鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input id="deOther" type="text" name="deOther" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍏朵粬鎵ｉ噸</label>
- <div class="layui-input-block">
- <input type="text" name="deOther" autocomplete="off" placeholder="涓嶅彲鏀�"
- class="layui-input rkbk-search-input" disabled> <em
- class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鎬绘墸閲�</label>
- <div class="layui-input-block">
- <input type="text" name="deSum" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs8">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏朵粬璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="deOtherInfo" autocomplete="off"
+ placeholder="鍏朵粬鎵ｉ噸璇存槑" class="layui-input">
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍊间粨寮�濮�</label>
- <div class="layui-input-block">
- <input type="text" name="handleStart" id="handleStart"
- placeholder="骞�-鏈�-鏃� 鏃�:鍒�" autocomplete="off"
- class="layui-input bg-date">
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鐜板満鎵ｉ噸</label>
- <div class="layui-input-block">
- <input type="text" name="deHandle" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呰鐗�</label>
+ <div class="layui-input-block">
+ <input type="radio" name="bzw" value="1" title="楹昏">
+ <input type="radio" name="bzw"
+ value="2" title="缂栫粐琚�">
+ <input type="radio" name="bzw"
+ value="3" title="鏁ｈ" checked>
+ </div>
+ </div>
+ </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鎵ｉ噸鍚庡噣閲�</label>
- <div class="layui-input-block">
- <input type="text" name="settleWeight" placeholder="涓嶅彲鏀�"
- autocomplete="off" class="layui-input rkbk-search-input"
- disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">鍊间粨缁撴潫</label>
- <div class="layui-input-block">
- <input type="text" name="handleEnd" id="handleEnd"
- placeholder="骞�-鏈�-鏃� 鏃�:鍒�" autocomplete="off"
- class="layui-input bg-date">
- </div>
- </div>
- </div>
- <div class="layui-col-xs12">
- <div class="layui-form-item">
- <label class="layui-form-label">澶� 娉�</label>
- <div class="layui-input-block">
- <textarea name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-textarea"></textarea>
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
- <!--kccz-left-box2 end-->
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囧噯鍖呴噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="dbz" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
- </div>
- <!--kccz-left end-->
- <div class="kccz-right fr bg-ef">
- <div class="kccz-r-item radius-6">
- <div class="kccz-r-box">
- <div class="rkbk-tit">
- <i></i>
- <h3>鍊间粨璁板綍1</h3>
- </div>
- <div class="kccz-r-con">
- <div class="kccz-r-vedio"><img id="kccz-r-img1"></div>
- <div class="kccz-r-btnbox">
- <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn1"> <span
- class="kccz-r-img"></span>
- <p>涓婁紶鍥剧墖</p>
- </a>
- </div>
- </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呬欢鎬绘暟</label>
+ <div class="layui-input-block">
+ <input type="text" name="bzbjs" autocomplete="off"
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
+ class="kccz-data-dw">浠�</em>
+ </div>
+ </div>
+ </div>
- </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
- </div>
- <!--kccz-r-item end-->
+ </form>
+ </div>
+ </div>
+ <!--kccz-left-box2 end-->
- <div class="kccz-r-item radius-6 mt-10">
- <div class="kccz-r-box">
- <div class="rkbk-tit">
- <i></i>
- <h3>鍊间粨璁板綍2</h3>
- </div>
- <div class="kccz-r-con">
- <div class="kccz-r-vedio"><img id="kccz-r-img2"></div>
- <div class="kccz-r-btnbox">
- <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn2"> <span
- class="kccz-r-img"></span>
- <p>涓婁紶鍥剧墖</p>
- </a>
- </div>
- </div>
+ </div>
+ <!--kccz-left end-->
+ <div class="kccz-right fr bg-ef">
+ <div class="kccz-r-item radius-6">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍1</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img1"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn1"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
- </div>
+ </div>
- </div>
- <!--kccz-r-item end-->
+ </div>
+ <!--kccz-r-item end-->
- <div class="kccz-r-item radius-6 mt-10">
- <div class="kccz-r-box">
- <div class="rkbk-tit">
- <i></i>
- <h3>鍊间粨璁板綍3</h3>
- </div>
- <div class="kccz-r-con">
- <div class="kccz-r-vedio"><img id="kccz-r-img3"></div>
- <div class="kccz-r-btnbox">
- <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn3"> <span
- class="kccz-r-img"></span>
- <p>涓婁紶鍥剧墖</p>
- </a>
- </div>
- </div>
+ <div class="kccz-r-item radius-6 mt-10">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍2</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img2"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn2"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
- </div>
+ </div>
- </div>
- <!--kccz-r-item end-->
+ </div>
+ <!--kccz-r-item end-->
- </div>
- </div>
- <!--kccz-con end-->
+ <div class="kccz-r-item radius-6 mt-10">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍3</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img3"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn3"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
- </div>
- <!--rk-main end-->
+ </div>
+
+ </div>
+ <!--kccz-r-item end-->
+ </div>
+ </div>
+ <!--kccz-con end-->
+
+ </div>
+ <!--rk-main end-->
</div>
<!--l-container end-->
-<script th:inline="javascript">
- var inoutProgress = [[${inoutProgress}]];
- var progress = [[${progress}]];
- var deptId = [[${deptId}]];
- var listDepot = [[${listDepot}]];
- //涓氬姟姝ラ
- var bizType = [[${bizType}]];
- //userId
- var userId = [[${loginUser.username}]];
- //鍑哄叆搴撶被鍨�
- var type = [[${type}]];
- var companyId = [[${loginUser.companyId}]];
- //鍝佺
- var listFoodVariety = [[${listFoodVariety}]];
-</script>
+<script th:inline="javascript">
+ //娴佺▼鐜妭
+ var inoutProgress = [[${inoutProgress}]];
+ var progress = [[${progress}]];
+ var deptId = [[${deptId}]];
+ var listDepot = [[${listDepot}]];
+ //涓氬姟姝ラ
+ var bizType = [[${bizType}]];
+ //userId
+ var userId = [[${loginUser.username}]];
+ //鍑哄叆搴撶被鍨�
+ var type = [[${type}]];
+ var companyId = [[${loginUser.companyId}]];
+ //鏅烘収鍗�
+ var cardDto = [[${cardDto}]];
+ var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
+</script>
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/inout-common.js}"></script>
<script th:src="@{../../static/admin/inout/in-handle.js}"></script>
+
</body>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
-<div class="layui-tab-content" id="dialog-from-notify"
- style="display: none;">
- <table class="layui-table">
- <colgroup>
- <col width="100">
- </colgroup>
- <tbody>
- <tr>
- <td>杩斿洖淇℃伅</td>
- <td id="resultMsg" style="color: red; font-weight: bold;"></td>
- </tr>
- <tr>
- <td>鎵胯繍浜�</td>
- <td id="resultUserName" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>杞︾墝鍙�</td>
- <td id="resultPlateNum" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>涓嬩竴姝�</td>
- <td id="resultType" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>鏅烘収鍗″彿</td>
- <td id="resultIntelCard" style="font-weight: bold;"></td>
- </tr>
- </tbody>
- </table>
+<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
+ <table class="layui-table">
+ <colgroup>
+ <col width="100">
+ </colgroup>
+ <tbody>
+ <tr>
+ <td>杩斿洖淇℃伅</td>
+ <td id="resultMsg" style="color: red;font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鎵胯繍浜�</td>
+ <td id="resultUserName" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>杞︾墝鍙�</td>
+ <td id="resultPlateNum" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>涓嬩竴姝�</td>
+ <td id="resultType" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鏅烘収鍗″彿</td>
+ <td id="resultIntelCard" style="font-weight: bold;"></td>
+ </tr>
+ </tbody>
+ </table>
</div>
-
</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-handle20230605.html b/igds-web/src/main/resources/templates/admin/inout/in-handle20230605.html
new file mode 100644
index 0000000..e5b6008
--- /dev/null
+++ b/igds-web/src/main/resources/templates/admin/inout/in-handle20230605.html
@@ -0,0 +1,540 @@
+<!DOCTYPE html>
+<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="renderer" content="webkit">
+ <title>鍑哄叆搴撶鐞�-鍊间粨绠＄悊</title>
+
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
+ <link rel="stylesheet" type="text/css"
+ th:href="@{../../static/admin/inout/style.css}">
+
+ <style>
+ .display-none {
+ display: none;
+ }
+
+ .layui-select-disabled .layui-disabled {
+ color: #000 !important;
+ }
+
+ .depot-food input {
+ line-height: 34px;
+ padding-right: 10px;
+ font-size: 16px;
+ color: #666;
+ background: #eff4f6;
+ }
+
+ .rk-step-wrap {
+ padding: 0px;
+ border-bottom: 0px;
+ text-align: center;
+ }
+
+ .qyzj-btnbox {
+ margin-top: 10px;
+ }
+
+ .qyzj-btnbox .rkbk-quick {
+ margin-top: 20px;
+ }
+
+ .kccz-data-btnbox {
+ min-height: 38px;
+ padding-top: 2px;
+ }
+ .kccz-con {
+ margin: 15px 0;
+ }
+ .rkbk-search-btn {
+ width: 100px;
+ }
+ </style>
+
+</head>
+
+<body>
+
+<div class="l-container layui-clear">
+ <div class="rk-main">
+
+ <div class="qyzj-btnbox layui-clear">
+ <div class="rkbk-quick fl">
+ <button class="rkbk-quick-btn layui-btn btn-green btn-sm"
+ onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}"/></i>鍊间粨瀹屾垚
+ </button>
+ </div>
+
+ <!-- 娴佺▼寮曞-->
+ <div class="rk-step-wrap fr">
+ <ul class="rk-step">
+ <li id="progress-register" class="active rk-step-first">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-dengji.png}"/>
+ </span>
+ <p>鍏ュ簱鐧昏</p>
+ </li>
+ <li id="progress-check" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-zhijian.png}"/>
+ </span>
+ <p>鎵︽牱璐ㄦ</p>
+ </li>
+ <li id="progress-fullWeight" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}"/>
+ </span>
+ <p>婊¤溅绉伴噸</p>
+ </li>
+ <li id="progress-hand" class="active">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-xiehuo.png}"/>
+ </span>
+ <p>鍏ュ簱鍊间粨</p>
+ </li>
+ <li id="progress-emptyWeight">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}"/>
+ </span>
+ <p>绌鸿溅绉伴噸</p>
+ </li>
+ <li id="progress-cardBack">
+ <span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-banli.png}"/>
+ </span>
+ <p>绂诲簱纭</p>
+ </li>
+ </ul>
+ </div>
+ <!-- 娴佺▼寮曞 END -->
+ </div>
+ <!--qyzj-btnbox end-->
+
+
+ <div class="kccz-con">
+ <div class="kccz-left radius-6 fl bg-ef">
+
+ <div class="kccz-left-box2 ">
+
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍏ュ簱淇℃伅</h3>
+ </div>
+
+ <div class="kccz-data-form layui-row">
+ <form class="layui-form" action="" id="form-data"
+ lay-filter="form-data">
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-ID</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-娴佺▼鑺傜偣</label>
+ <div class="layui-input-block">
+ <input type="text" name="progress" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-涓氬姟绫诲瀷</label>
+ <div class="layui-input-block">
+ <input type="text" name="type" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗昳d</label>
+ <div class="layui-input-block">
+ <input type="text" name="noticeId" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">韬唤璇佸彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="userId" id="userId"
+ placeholder="鎵胯繍浜鸿韩浠借瘉鍙�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">杞︾墝鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" id="plateNum"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <div class="layui-col-xs4 kccz-data-btnbox">
+ <input type="button" value="璇昏韩浠借瘉"
+ class="rkbk-search-btn layui-btn"
+ onclick="flushIdCard()">
+ </div>
+ <div class="layui-col-xs4 kccz-data-btnbox">
+ <input type="button" value="璇诲崱"
+ class="rkbk-search-btn layui-btn"
+ onclick="flushICCard()">
+ </div>
+ <div class="layui-col-xs4 kccz-data-btnbox">
+ <input type="button" value="鏌� 璇�"
+ class="rkbk-search-btn layui-btn" onclick="flushData()">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏅烘収鍗″彿</label>
+ <div class="layui-input-block">
+ <input type="text" name="intelCard" id="intelCard"
+ placeholder="鏅烘収鍗″彿" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">绌鸿溅绉伴噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="emptyWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
+ class="layui-input rkbk-search-input" disabled> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">婊¤溅绉伴噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="fullWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
+ class="layui-input rkbk-search-input" disabled> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑁呭嵏浠撳簱</label>
+ <div class="layui-input-block">
+ <select name="depotId" id="depotId">
+ <option value="">涓嶅彲鏀�</option>
+ <option th:each="depot,depotSet:${listDepot}"
+ th:value="${depot.id}" th:text="${depot.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑� 閲�</label>
+ <div class="layui-input-block">
+ <input type="text" name="netWeight" autocomplete="off" placeholder="涓嶅彲鏀�"
+ class="layui-input rkbk-search-input" disabled> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item kccz-data-group-md">
+ <label class="layui-form-label">鏉傝川鎵ｉ噸</label>
+ <div class="posi-r kccz-data-bfb fr">
+ <input type="text" name="impurity" placeholder="涓嶅彲鏀�"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">%</em>
+ </div>
+ <div class="layui-input-block">
+ <div class="posi-r">
+ <input type="text" name="deImpurity" placeholder="涓嶅彲鏀�"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+ <div class="layui-input-block">
+ <input type="text" name="customerName" placeholder="涓嶅彲鏀�"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮绛夌骇</label>
+ <div class="layui-input-block">
+ <select name="foodLevel" id="foodLevel">
+ <option value="">涓嶅彲鏀�</option>
+ <option th:each="dic,dicSet:${listFoodLevel}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item kccz-data-group-md">
+ <label class="layui-form-label">姘村垎鎵ｉ噸</label>
+ <div class="posi-r kccz-data-bfb fr">
+ <input type="text" name="wet" placeholder="涓嶅彲鏀�"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">%</em>
+ </div>
+ <div class="layui-input-block">
+ <div class="posi-r">
+ <input type="text" name="deWet" placeholder="涓嶅彲鏀�"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">绮鍝佺</label>
+ <div class="layui-input-block">
+ <select name="foodVariety" id="foodVariety">
+ <option value="">涓嶅彲鏀�</option>
+ <option th:each="dic,dicSet:${listFoodVariety}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏朵粬鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="deOther" autocomplete="off" placeholder="涓嶅彲鏀�"
+ class="layui-input rkbk-search-input" disabled> <em
+ class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎬绘墸閲�</label>
+ <div class="layui-input-block">
+ <input type="text" name="deSum" placeholder="涓嶅彲鏀�"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍊间粨寮�濮�</label>
+ <div class="layui-input-block">
+ <input type="text" name="handleStart" id="handleStart"
+ placeholder="骞�-鏈�-鏃� 鏃�:鍒�" autocomplete="off"
+ class="layui-input bg-date">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐜板満鎵ｉ噸</label>
+ <div class="layui-input-block">
+ <input type="text" name="deHandle" placeholder="璇疯緭鍏�"
+ autocomplete="off" class="layui-input"> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵ｉ噸鍚庡噣閲�</label>
+ <div class="layui-input-block">
+ <input type="text" name="settleWeight" placeholder="涓嶅彲鏀�"
+ autocomplete="off" class="layui-input rkbk-search-input"
+ disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍊间粨缁撴潫</label>
+ <div class="layui-input-block">
+ <input type="text" name="handleEnd" id="handleEnd"
+ placeholder="骞�-鏈�-鏃� 鏃�:鍒�" autocomplete="off"
+ class="layui-input bg-date">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶� 娉�</label>
+ <div class="layui-input-block">
+ <textarea name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-textarea"></textarea>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ <!--kccz-left-box2 end-->
+
+ </div>
+ <!--kccz-left end-->
+ <div class="kccz-right fr bg-ef">
+ <div class="kccz-r-item radius-6">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍1</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img1"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn1"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ <!--kccz-r-item end-->
+
+ <div class="kccz-r-item radius-6 mt-10">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍2</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img2"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn2"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ <!--kccz-r-item end-->
+
+ <div class="kccz-r-item radius-6 mt-10">
+ <div class="kccz-r-box">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鍊间粨璁板綍3</h3>
+ </div>
+ <div class="kccz-r-con">
+ <div class="kccz-r-vedio"><img id="kccz-r-img3"></div>
+ <div class="kccz-r-btnbox">
+ <a href="javascript:;" class="kccz-r-btn" id="kccz-r-btn3"> <span
+ class="kccz-r-img"></span>
+ <p>涓婁紶鍥剧墖</p>
+ </a>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ <!--kccz-r-item end-->
+
+ </div>
+ </div>
+ <!--kccz-con end-->
+
+ </div>
+ <!--rk-main end-->
+
+</div>
+<!--l-container end-->
+
+<script th:inline="javascript">
+ var inoutProgress = [[${inoutProgress}]];
+ var progress = [[${progress}]];
+ var deptId = [[${deptId}]];
+ var listDepot = [[${listDepot}]];
+ //涓氬姟姝ラ
+ var bizType = [[${bizType}]];
+ //userId
+ var userId = [[${loginUser.username}]];
+ //鍑哄叆搴撶被鍨�
+ var type = [[${type}]];
+ var companyId = [[${loginUser.companyId}]];
+ //鍝佺
+ var listFoodVariety = [[${listFoodVariety}]];
+</script>
+
+
+<script th:src="@{../../static/plugins/layui/layui.js}"></script>
+<script th:src="@{../../static/js/jquery.min.js}"></script>
+<script th:src="@{../../static/js/constant.js}"></script>
+<script th:src="@{../../static/js/igds-common.js}"></script>
+<script th:src="@{../../static/admin/inout/in-handle.js}"></script>
+</body>
+
+<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
+<div class="layui-tab-content" id="dialog-from-notify"
+ style="display: none;">
+ <table class="layui-table">
+ <colgroup>
+ <col width="100">
+ </colgroup>
+ <tbody>
+ <tr>
+ <td>杩斿洖淇℃伅</td>
+ <td id="resultMsg" style="color: red; font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鎵胯繍浜�</td>
+ <td id="resultUserName" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>杞︾墝鍙�</td>
+ <td id="resultPlateNum" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>涓嬩竴姝�</td>
+ <td id="resultType" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鏅烘収鍗″彿</td>
+ <td id="resultIntelCard" style="font-weight: bold;"></td>
+ </tr>
+ </tbody>
+ </table>
+</div>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.3