From 723f54708d7c2b71f916e40952ebc818629e66ab Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 19 十月 2023 19:50:34 +0800
Subject: [PATCH] 船运问题修改2
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java | 12 +++
igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml | 117 ++++++++++++++++++++++++++++++++++++++
igds-core/src/main/java/com/ld/igds/models/SecCamera.java | 8 ++
3 files changed, 135 insertions(+), 2 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
index 844213c..e80df65 100644
--- a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
+++ b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
@@ -116,6 +116,14 @@
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date updateTime;
+ @Column(name = "spjklx", length = 1)
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ @Column(name = "spdwlx", length = 2)
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spdwlx;
+
public int getChanNum() {
return chanNum;
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
index ca1f629..ad0ae3a 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
@@ -15,6 +15,7 @@
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.dto.InoutRecordItemData;
import com.ld.igds.inout.dto.InoutRecordItemParam;
+import com.ld.igds.inout.mapper.InoutRecordMapper;
import com.ld.igds.inout.service.InoutRecordItemService;
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.m.dto.NoticeParam;
@@ -59,6 +60,8 @@
private InoutCommonService inoutManagerService;
@Resource
private HInoutCarConfService carConfService;
+ @Autowired
+ private InoutRecordMapper inoutMapper;
/**
* 鍑哄叆搴撴祦绋嬩腑鐨勫疄鏃舵暟鎹紝鐩存帴浠庣紦瀛樹腑鑾峰彇
@@ -478,6 +481,12 @@
if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
//璇存槑娴佺▼宸茬粨鏉燂紝閲嶆柊缁熻鏁伴噺
inoutRecordItemService.updateNumByInoutItem(data.getRecordId());
+ InoutParam param = new InoutParam();
+ param.setId(data.getRecordId());
+ param.setType(data.getType());
+ param.setCompanyId(data.getCompanyId());
+ InoutData completeData = inoutMapper.inoutQueryById(param);
+ inoutService.updateInoutCache(completeData);
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
} else {
@@ -594,7 +603,8 @@
// }
}
}
-
+ InoutData completeData = inoutMapper.inoutQueryById(inoutParam);
+ inoutService.updateInoutCache(completeData);
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
}
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
index 1fb7fdf..2535004 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
+++ b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
@@ -198,7 +198,7 @@
</Property>
</PropertyDef>
<PropertyDef name="azwzlx">
- <Property/>
+ <Property></Property>
<Property name="label">瀹夎浣嶇疆</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
@@ -256,6 +256,110 @@
<Entity>
<Property name="key">99</Property>
<Property name="value">鍏朵粬</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="spjklx">
+ <Property/>
+ <Property name="label">鐩戞帶绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氫粨鍐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氫笟鍔＄被</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬畨闃茬被</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="spdwlx">
+ <Property/>
+ <Property name="label">鐐逛綅绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氬嚭鍏ュ彛</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氭墻鏍锋満</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬寲楠屽</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氱粨绠楀</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">5锛氬湴纾呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">6</Property>
+ <Property name="value">6锛氬簱鍖轰富骞查亾</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">7</Property>
+ <Property name="value">7锛氫粨闂寸洃鎺�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">8</Property>
+ <Property name="value">8锛氫粨鍐�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氳嵂鍝佹埧鍐呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10锛氬櫒鏉愬鍐呭</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11锛氬埗楂樼偣</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12锛氭补搴撶綈鍖�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13锛氭敹鍙戞补璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14锛氭车鎴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15锛氭补搴撲富瑕佽緭閫佺閬�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16锛氬懆鐣�</Property>
</Entity>
</Collection>
</Property>
@@ -527,6 +631,7 @@
<Property name="caption">鐩戞帶璁惧淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
+ <Property name="height">100%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -595,6 +700,16 @@
<Property name="property">azwzlx</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spjklx</Property>
+ <Property name="property">spjklx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spdwlx</Property>
+ <Property name="property">spdwlx</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
--
Gitblit v1.9.3