From aa963091956e9d3f9a4a0f1a19809f56344ba988 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 31 五月 2023 22:37:26 +0800
Subject: [PATCH] 出入库优化-称重实现粮食产地
---
igds-inout/src/main/java/com/ld/igds/m/dto/NoticeParam.java | 6
igds-web/src/main/resources/static/admin/inout/weight.js | 132 ++++++++++----
igds-web/src/main/resources/templates/admin/inout/in-weight.html | 23 --
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java | 1
igds-core/src/main/resources/mapper/DicDataMapper.xml | 19 +
igds-web/src/main/resources/static/admin/inout/in-weight.js | 138 ---------------
igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java | 14 +
igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java | 10 +
igds-web/src/main/resources/static/admin/inout/style.css | 11
igds-core/src/main/java/com/ld/igds/common/CoreDicService.java | 9 +
igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java | 3
igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java | 6
igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java | 4
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 1
igds-core/src/main/java/com/ld/igds/common/mapper/DicDataMapper.java | 68 ++++---
igds-core/src/main/java/models/igds.model.xml | 38 +--
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java | 30 ---
17 files changed, 223 insertions(+), 290 deletions(-)
diff --git a/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java b/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
index e18d401..5184293 100644
--- a/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
+++ b/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
@@ -11,6 +11,7 @@
import com.ld.igds.grain.dto.GrainData;
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.models.Depot;
+import com.ld.igds.models.DicArea;
import com.ld.igds.models.DicSysConf;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.FilesUtil;
@@ -128,6 +129,19 @@
return new PageResponse<>(RespCodeEnum.CODE_0000, listDepot);
}
+
+ /**
+ * 鑾峰彇琛屾斂鍖哄煙
+ *
+ * @return
+ */
+ @RequestMapping("/page-dicArea")
+ public PageResponse<Page<DicArea>> pageDicArea(@RequestBody BaseParam param) {
+
+ Page<DicArea> list = commonManager.pageDicArea(param);
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, list);
+ }
/**
* 甯姪椤甸潰璺宠浆
*
diff --git a/igds-core/src/main/java/com/ld/igds/common/CoreDicService.java b/igds-core/src/main/java/com/ld/igds/common/CoreDicService.java
index 6d72d05..e52ccbc 100644
--- a/igds-core/src/main/java/com/ld/igds/common/CoreDicService.java
+++ b/igds-core/src/main/java/com/ld/igds/common/CoreDicService.java
@@ -7,6 +7,7 @@
import com.ld.igds.common.dto.PosDto;
import com.ld.igds.data.BaseParam;
import com.ld.igds.data.Page;
+import com.ld.igds.models.DicArea;
import com.ld.igds.models.DicSlogan;
/**
@@ -57,4 +58,12 @@
*/
void delPosByBizId(PosDto posDto);
+
+ /**
+ * 鑾峰彇琛屾斂鍖哄垝
+ * @param param
+ * @return
+ */
+ List<DicArea> listDicArea(Page<DicArea> page,BaseParam param);
+
}
\ No newline at end of file
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java
index 20e1c5c..a2af67b 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java
@@ -5,6 +5,7 @@
import com.ld.igds.common.mapper.DicDataMapper;
import com.ld.igds.data.BaseParam;
import com.ld.igds.data.Page;
+import com.ld.igds.models.DicArea;
import com.ld.igds.models.DicSlogan;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,11 @@
dicDataMapper.delPosByBizId(posDto);
}
+ @Override
+ public List<DicArea> listDicArea(Page<DicArea> page,BaseParam param) {
+ return dicDataMapper.listDicArea(page,param);
+ }
+
@Override
public List<PosDto> getPosByBizTag(String companyId, String bizTag) {
diff --git a/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java b/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java
index 0eda84d..54c1018 100644
--- a/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java
+++ b/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java
@@ -605,5 +605,15 @@
return (String) redisUtil.get(key);
}
+ public Page<DicArea> pageDicArea(BaseParam param) {
+
+ Page<DicArea> page = new Page<>(param.getPage(), param.getLimit());
+
+ List<DicArea> list = coreDicService.listDicArea(page, param);
+ page.setRecords(list);
+
+ return page;
+ }
+
}
diff --git a/igds-core/src/main/java/com/ld/igds/common/mapper/DicDataMapper.java b/igds-core/src/main/java/com/ld/igds/common/mapper/DicDataMapper.java
index 6958811..e4c9467 100644
--- a/igds-core/src/main/java/com/ld/igds/common/mapper/DicDataMapper.java
+++ b/igds-core/src/main/java/com/ld/igds/common/mapper/DicDataMapper.java
@@ -1,6 +1,9 @@
package com.ld.igds.common.mapper;
import com.ld.igds.common.dto.PosDto;
+import com.ld.igds.data.BaseParam;
+import com.ld.igds.data.Page;
+import com.ld.igds.models.DicArea;
import com.ld.igds.models.DicSlogan;
import org.apache.ibatis.annotations.Param;
@@ -11,41 +14,50 @@
/**
* 瀛楀吀鐩稿叧鐨勬牳蹇冨鐞�
- *
- * @author jiazx
*
+ * @author jiazx
*/
public interface DicDataMapper {
- /**
- * 鏍规嵁DTO涓殑淇℃伅锛屾壒閲忕浉鍏虫暟鎹�
- *
- * @param dto
- */
- void batchDelPos(@Param("dto") PosDto dto);
+ /**
+ * 鏍规嵁DTO涓殑淇℃伅锛屾壒閲忕浉鍏虫暟鎹�
+ *
+ * @param dto
+ */
+ void batchDelPos(@Param("dto") PosDto dto);
- /**
- * 鏂板鍧愭爣淇℃伅
- * @param posDto
- */
- void addPos(@Param("dto") PosDto posDto);
+ /**
+ * 鏂板鍧愭爣淇℃伅
+ *
+ * @param posDto
+ */
+ void addPos(@Param("dto") PosDto posDto);
- /**
- * 鏌ヨ褰撳墠缁勭粐鐨勬爣璇�
- * @param parameter
- * @return
- */
- DicSlogan getDicSlogan(@Param("param")Map<String,Object> parameter);
+ /**
+ * 鏌ヨ褰撳墠缁勭粐鐨勬爣璇�
+ *
+ * @param parameter
+ * @return
+ */
+ DicSlogan getDicSlogan(@Param("param") Map<String, Object> parameter);
- void delPosByBizId(@Param("dto") PosDto posDto);
+ void delPosByBizId(@Param("dto") PosDto posDto);
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜� 涓氬姟鏍囩鑾峰彇璁惧浣嶇疆淇℃伅
- *
- * @param companyId
- * @param bizTag
- * @return
- */
- List<PosDto> getPosByBizTag(@Param("companyId") String companyId, @Param("bizTag") String bizTag);
+ /**
+ * 鏍规嵁缁勭粐缂栫爜鍜� 涓氬姟鏍囩鑾峰彇璁惧浣嶇疆淇℃伅
+ *
+ * @param companyId
+ * @param bizTag
+ * @return
+ */
+ List<PosDto> getPosByBizTag(@Param("companyId") String companyId, @Param("bizTag") String bizTag);
+
+ /**
+ * 鑾峰彇琛屾斂鍖哄煙
+ *
+ * @param param
+ * @return
+ */
+ List<DicArea> listDicArea(@Param("page") Page<DicArea> page, @Param("param") BaseParam param);
}
diff --git a/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java b/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java
index 82d8614..de009e3 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java
@@ -71,4 +71,7 @@
*/
String noticeLed(ApiInoutData param);
+
+
+
}
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index c2e1770..ad7405b 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -1095,32 +1095,6 @@
<Property name="label">椤甸潰涓殑鍧愭爣</Property>
</PropertyDef>
</DataType>
- <DataType name="dtFoodOrigin">
- <Property name="creationType">com.ld.igds.models.DicFoodOrigin</Property>
- <PropertyDef name="id">
- <Property name="dataType">int</Property>
- </PropertyDef>
- <PropertyDef name="code">
- <Property></Property>
- <Property name="label">浜у湴缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="name">
- <Property></Property>
- <Property name="label">浜у湴鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="sort">
- <Property name="dataType">int</Property>
- <Property name="label">鎺掑簭</Property>
- </PropertyDef>
- <PropertyDef name="simple">
- <Property></Property>
- <Property name="label">浜у湴绠�鎷�</Property>
- </PropertyDef>
- <PropertyDef name="disabledTag">
- <Property></Property>
- <Property name="label">鏄惁绂佺敤</Property>
- </PropertyDef>
- </DataType>
<DataType name="dtSecFire">
<Property name="creationType">com.ld.igds.models.SecFire</Property>
<PropertyDef name="id">
@@ -1288,6 +1262,18 @@
<PropertyDef name="type">
<Property name="label">绫诲瀷</Property>
</PropertyDef>
+ <PropertyDef name="simple">
+ <Property/>
+ <Property name="label">绠�鎷�</Property>
+ </PropertyDef>
+ <PropertyDef name="disabledTag">
+ <Property/>
+ <Property name="label">鏄惁绂佺敤</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property/>
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtFileData">
<Property name="creationType">com.ld.igds.file.dto.FileData</Property>
diff --git a/igds-core/src/main/resources/mapper/DicDataMapper.xml b/igds-core/src/main/resources/mapper/DicDataMapper.xml
index 9b2d443..1d9428e 100644
--- a/igds-core/src/main/resources/mapper/DicDataMapper.xml
+++ b/igds-core/src/main/resources/mapper/DicDataMapper.xml
@@ -69,7 +69,7 @@
<!-- 鏌ヨ鏍囪 -->
<select id="getDicSlogan" resultType="com.ld.igds.models.DicSlogan"
- parameterType="java.util.Map">
+ parameterType="java.util.Map">
select
*
from D_DIC_SLOGAN g
@@ -82,6 +82,21 @@
limit 1
</where>
-
</select>
+
+ <!-- 鑾峰彇鍖哄煙鍒楄〃 -->
+ <select id="listDicArea" resultType="com.ld.igds.models.DicArea"
+ parameterType="com.ld.igds.data.BaseParam">
+ select
+ CODE_ as code,
+ NAME_ as name,
+ TYPE_ as type,
+ SIMPLE_ as simple
+ from D_DIC_AREA
+ <where>
+ <if test="param.key != null">AND (NAME_ like "%"#{param.key}"%" OR SIMPLE_ like "%"#{param.key}"%" )</if>
+ </where>
+ order by CODE_
+ </select>
+
</mapper>
\ No newline at end of file
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 c888531..7dec757 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
@@ -321,7 +321,6 @@
/**
* 鍑哄簱鐧昏
- *
* @param sort 琛ㄧず浣跨敤鐨勫嚭鍏ュ簱璁惧閰嶅鍙凤紝涓嶄紶閫掗粯璁や负1
* @return
*/
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
index 386c5de..956f9d5 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController2.java
@@ -272,50 +272,24 @@
return inoutManager2.pageInoutData(param);
}
- /**
- * 2022骞�11鏈�15鏃� 鏆傚仠浣跨敤
- * 鍏ュ簱鐨勫線鏉ュ崟浣嶄笅鎷夋 -- 浠庡叆搴撻�氱煡鍗曟垨寰�鏉ュ崟浣嶈〃涓煡璇�
- *
- * @param param 鏌ヨ鍏抽敭瀛楀彲浠ユ槸ID涔熷彲鑳芥槸鍚嶇О
- * @return
-
- @RequestMapping("/list-in-customer") public PageResponse<List<InoutCustomer>> listInCustomer(@RequestBody InoutParam param) {
-
- return inoutManager2.listCustomerIn(param);
- }
- */
-
/**
* 鍏ュ簱閫氱煡鍗�-鑾峰彇娌℃湁瀹屾垚鐨勯�氱煡鍗曞垪琛�
*
* @return
*/
- @RequestMapping("/list-notice鈥攊n")
+ @RequestMapping("/list-notice-in")
public PageResponse<List<InoutNoticeIn>> listNoticeIn(@RequestBody NoticeParam param) {
return inoutManager2.listNoticeIn(param);
}
- /**
- *
- * 2022骞�11鏈�15鏃� 鏆傚仠浣跨敤
- * 鍑哄簱鐨勫線鏉ュ崟浣嶄笅鎷夋 -- 浠庡嚭搴撻�氱煡鍗曟垨寰�鏉ュ崟浣嶈〃涓煡璇�
- *
- * @param param
- * @return
- @RequestMapping("/list-out-customer") public PageResponse<List<InoutCustomer>> listOutCustomer(
- @RequestBody InoutParam param) {
-
- return inoutManager2.listCustomerOut(param);
- }
- */
/**
* 鍑哄簱閫氱煡鍗�-鑾峰彇娌℃湁瀹屾垚鐨勯�氱煡鍗曞垪琛�
*
* @return
*/
- @RequestMapping("/list-notice鈥攐ut")
+ @RequestMapping("/list-notice-out")
public PageResponse<List<InoutNoticeOut>> listNoticeOut(@RequestBody NoticeParam param) {
return inoutManager2.listNoticeOut(param);
}
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 cff4ca8..c90ac15 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
@@ -637,7 +637,6 @@
param.setCompanyId(user.getCompanyId());
}
param.setDeptId(ContextUtil.subDeptId(user));
-
param.setCompleteStatus(InoutConstant.COMPLETE_STATUS_NONE);
List<InoutNoticeIn> list = inoutManagerService.listNoticeIn(param);
diff --git a/igds-inout/src/main/java/com/ld/igds/m/dto/NoticeParam.java b/igds-inout/src/main/java/com/ld/igds/m/dto/NoticeParam.java
index 34c854d..b343f0b 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/dto/NoticeParam.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/dto/NoticeParam.java
@@ -1,6 +1,9 @@
package com.ld.igds.m.dto;
+import com.ld.igds.data.BaseParam;
+
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.Date;
@@ -10,7 +13,8 @@
* @author
*/
@Data
-public class NoticeParam {
+@EqualsAndHashCode(callSuper=false)
+public class NoticeParam extends BaseParam {
private String id;
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
index 84a122c..8607980 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java
@@ -50,10 +50,6 @@
@PropertyDef(label = "鍚堝悓鍚嶇О", description = "閽堝杞崲绮蹇呭～")
private String contractName;
-// @Column(name = "PLAN_NAME_", length = 50)
-// @PropertyDef(label = "璁″垝鍚嶇О")
-// private String planName;
-
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "鐩爣浠撳簱")
private String depotId;
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 0f061eb..86e82ee 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
@@ -517,140 +517,4 @@
//鏄剧ず璐ㄦ淇℃伅
function showCheck() {
alertError("璋冩暣");
-}
-
-
-// ---------------------------閫氱煡鍗�-寮�濮� -------------------//
-// 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
-function showNotice() {
- var index = layer.load();
- var param = {
- type: type
- };
- // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
- table.render({
- elem: '#tableNotice',
- url: '../../basic/inout/list-notice鈥攊n',
- page: false,
- // skin : "nob",
- // size : 'sm',
- even: true,
- method: 'POST',
- contentType: "application/json;charset=UTF-8",
- cols: [[{
- field: 'name',
- title: '閫氱煡鍗曞悕绉�',
- width: '15%'
- }, {
- field: 'customerName',
- title: '閫佽揣鍗曚綅'
- }, {
- field: 'foodVarietyName',
- title: '绮鍝佺',
- width: '10%'
- }, {
- field: 'year',
- title: '骞翠唤',
- width: '8%'
- }, {
- field: 'unitName',
- title: '鏀惰揣鍗曚綅'
- }, {
- field: 'contractName',
- title: '鎵�灞炲悎鍚�'
- }]],
- where: param,
- parseData: function (res) {
- if ("0000" == res.code) {
- return {
- "code": "0",
- "msg": res.msg,
- "data": res.data
- }
- } else {
- return {
- "code": "1",
- "msg": res.msg
- }
- }
- },
- done: function (res) {
- layer.close(index);
- }
- });
-
- //鍙屽嚮鏄剧ず閫変腑鏁版嵁
- table.on('rowDouble(tableNotice)', function (obj) {
- var data = obj.data;
- form.val("form-data", {
- customerId: data.customerId,
- customerName: data.customerName,
- noticeId: data.id
- });
- // 鍏抽棴
- layer.closeAll();
- });
-
- // 寮瑰嚭瀵硅瘽妗�
- layer.open({
- type: 1,
- offset: ['100px', '250px'],
- title: "鍏ュ簱閫氱煡鍗�",
- area: ['900px', '600px'],
- shade: 0,
- content: $('#listNotice'),
- btn: 0,
- btn: ['鍙栨秷'],
- yes: function () {
- layer.closeAll();
- },
- closeBtn: 0
- });
-}
-
-// ---------------------------閫氱煡鍗� -缁撴潫 -------------------//
-//-------------------------閬撻椄鎿嶄綔--------------------------//
-
-function gateCtrl() {
- layer.open({
- type: 1,
- title: '璁惧鎿嶄綔-' + domSelectDevice.attr("name"),
- area: ['450px', '210px'],
- shade: 0,
- content: $('#control-gate'),
- btn: 0,
- closeBtn: 2
- });
-}
-
-function controlGate(targetStatus) {
- if (gateDto) {
- var data = {
- "companyId": companyId
- , "deptId": deptId
- , "bizType": type
- , "confId": gateDto.id
- , "targetStatus": targetStatus
- , "sort": gateDto.sort
- };
- $.ajax({
- type: "POST",
- url: "../../basic/inout/gate-ctrl",
- dataType: "json",
- contentType: "application/json;charset=UTF-8",
- data: JSON.stringify(data),
- success: function (result) {
- if (result.code != "0000") {
- layer.msg("鎿嶄綔澶辫触锛�" + result.msg);
- } else {
- layer.msg("鎿嶄綔鎴愬姛");
- }
- },
- error: function () {
- layer.alert("鎿嶄綔澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
- }
- });
- } else {
- layer.msg("娌℃湁鑾峰彇鍒拌澶囷紒");
- }
-}
+}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/style.css b/igds-web/src/main/resources/static/admin/inout/style.css
index 1a775da..99b680c 100644
--- a/igds-web/src/main/resources/static/admin/inout/style.css
+++ b/igds-web/src/main/resources/static/admin/inout/style.css
@@ -647,7 +647,7 @@
.kccz-czxx-wrap {
padding-left: 24px;
- margin-top: 20px;
+ /*margin-top: 20px;*/
}
.kccz-czxx-left .layui-form-item {
@@ -944,9 +944,14 @@
.line {
flex: 1;
height: 1px;
- background-color: #2ab5ad;
+ background-color: #0e9aef;
}
.line-text {
padding: 0 10px;
- color: #2ab5ad;
+ color: #0e9aef;
+}
+
+.layui-layer-title{
+ color: #FFF !important;
+ background-color: #0e9aef !important;
}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/weight.js b/igds-web/src/main/resources/static/admin/inout/weight.js
index b5a4af5..9f0f528 100644
--- a/igds-web/src/main/resources/static/admin/inout/weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/weight.js
@@ -161,54 +161,103 @@
});
}
-/**
- * 寮瑰嚭鎻愰啋妗�
- * @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']});
+// ---------------------------閫氱煡鍗�-寮�濮� -------------------//
+// 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
+function showNotice() {
+ var titleCustomer = "閫佽揣鍗曚綅";
+ var url = "../../basic/inout/list-notice-in";
+ if ("OUT" == type) {
+ titleCustomer = "鏀惰揣鍗曚綅";
+ url = "../../basic/inout/list-notice-out"
}
+ var index = layer.load();
+ var param = {
+ type: type
+ };
+
+ console.log(url);
+
+ table.render({
+ elem: '#tableNotice',
+ url: url,
+ page: false,
+ even: true,
+ method: 'POST',
+ contentType: "application/json;charset=UTF-8",
+ cols: [[{
+ field: 'name',
+ title: '閫氱煡鍗曞悕绉�',
+ width: '15%'
+ }, {
+ field: 'customerName',
+ title: titleCustomer
+ }, {
+ field: 'foodVarietyName',
+ title: '绮鍝佺',
+ width: '10%'
+ }, {
+ field: 'year',
+ title: '骞翠唤',
+ width: '8%'
+ }, {
+ field: 'depotName',
+ title: "鎵�娑変粨搴�"
+ }, {
+ field: 'contractName',
+ title: '鎵�灞炲悎鍚�'
+ }]],
+ where: param,
+ parseData: function (res) {
+ if ("0000" == res.code) {
+ return {
+ "code": "0",
+ "msg": res.msg,
+ "data": res.data
+ }
+ } else {
+ return {
+ "code": "1",
+ "msg": res.msg
+ }
+ }
+ },
+ done: function (res) {
+ layer.close(index);
+ }
+ });
+ //鍙屽嚮鏄剧ず閫変腑鏁版嵁
+ table.on('rowDouble(tableNotice)', function (obj) {
+ var data = obj.data;
+ form.val("form-data", {
+ customerName: data.customerName,
+ noticeId: data.id
+ });
+ layer.closeAll();
+ });
+ // 寮瑰嚭瀵硅瘽妗�
+ layer.open({
+ type: 1,
+ offset: ['100px', '250px'],
+ title: "閫氱煡鍗曞垪琛紙鍙屽嚮閫変腑锛�",
+ area: ['900px', '600px'],
+ shade: 0,
+ content: $('#listNotice'),
+ btn: 0,
+ btn: ['鍙栨秷'],
+ yes: function () {
+ layer.closeAll();
+ },
+ closeBtn: 0
+ });
}
-
-// ---------------------------绮浜у湴 -寮�濮� -------------------//
-// 寮瑰嚭寰�鏉ュ崟浣嶄笅鎷夋
+// ---------------------------绮浜у湴-寮�濮� -------------------//
function showFoodLocation() {
var index = layer.load();
- // 娓叉煋寰�鏉ュ崟浣嶅垪琛�
table.render({
elem: '#tableFoodLoaction',
- url: '../../basic/common/page-food-location',
+ url: '../../basic/common/page-dicArea',
page: false,
- // limit : limit,
- // skin : "nob",
- // size : 'sm',
toolbar: '#toolbarFoodLocaton',
even: true,
method: 'POST',
@@ -254,6 +303,7 @@
// 璧嬪��
form.val("form-data", {
foodLocation: data.name,
+ foodLocationId: data.code
});
// 鍏抽棴
layer.closeAll();
@@ -279,7 +329,7 @@
function flushFoodLocation() {
var key = $("#key2").val();
table.reload('tableFoodLoaction', {
- url: "../../basic/common/page-food-location",
+ url: "../../basic/common/page-dicArea",
where: {
key: key
},
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-weight.html b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
index 415352c..01d2c2c 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-weight.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-weight.html
@@ -335,7 +335,8 @@
<label class="layui-form-label color-red">鐨噸(绌鸿溅)</label>
<div class="layui-input-block">
<input type="text" name="emptyWeight" id="emptyWeight" autocomplete="off"
- placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input" disabled>
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input"
+ disabled>
<em
class="kccz-data-dw">KG</em>
</div>
@@ -360,7 +361,7 @@
<div class="layui-input-block">
<input type="text" name="customerName" placeholder="璇烽�夋嫨"
autocomplete="off" class="layui-input" disabled="disabled"> <em
- class="kccz-data-dw cursor" onclick="showNotice()">鈥�</em>
+ class="kccz-data-dw cursor" onclick="showNotice()">鈥︹��</em>
</div>
</div>
</div>
@@ -444,7 +445,8 @@
<label class="layui-form-label color-red">绮浜у湴</label>
<div class="layui-input-block">
<input type="text" name="foodLocation" placeholder="璇烽�夋嫨"
- autocomplete="off" class="layui-input">
+ autocomplete="off" class="layui-input" disabled="disabled"> <em
+ class="kccz-data-dw cursor" onclick="showFoodLocation()">鈥︹��</em>
</div>
</div>
</div>
@@ -767,21 +769,6 @@
</tr>
</tbody>
</table>
-</div>
-<!-- 寮瑰嚭妗�-閬撻椄鎿嶄綔-->
-<div class="layui-tab-content areation-center" id="control-gate"
- style="display: none;">
- <div class="layui-btn-container m10">
- <button class="rkbk-quick-btn layui-btn btn-violet"
- onClick="controlGate('OPEN')">
- <i><img th:src="@{../../static/images/icon-sm-fc.png}"/></i>寮�閬撻椄
- </button>
- <button class="rkbk-quick-btn layui-btn btn-red"
- onClick="controlGate('CLOSE')">
- <i><img th:src="@{../../static/images/icon-sm-fc.png}"/></i>鍏抽亾闂�
- </button>
- </div>
-
</div>
<script type="text/html" id="toolbarFoodLocaton">
--
Gitblit v1.9.3