From 7a7ccfd74dbdff086d2aabe5117ec1dc6f804d91 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 31 五月 2023 18:48:41 +0800
Subject: [PATCH] 出入库优化-称重
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 1
igds-web/src/main/resources/static/admin/inout/weight.js | 65 ----
igds-web/src/main/resources/templates/admin/inout/in-weight.html | 52 +--
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java | 4
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 54 +---
igds-core/src/main/resources/mapper/DicDataMapper.xml | 19 -
igds-web/src/main/resources/static/admin/inout/in-weight.js | 217 ++++++-----------
igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java | 15 -
igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java | 48 ----
igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java | 12 -
igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerService.java | 4
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 4
igds-web/src/main/resources/static/admin/inout/inout-common.js | 2
igds-core/src/main/java/com/ld/igds/common/CoreDicService.java | 9
/dev/null | 55 ----
igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java | 19 -
igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java | 45 ---
igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java | 19 -
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java | 8
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 2
igds-core/src/main/java/com/ld/igds/common/mapper/DicDataMapper.java | 12 -
21 files changed, 138 insertions(+), 528 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 8acebed..e18d401 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,7 +11,6 @@
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.DicFoodOrigin;
import com.ld.igds.models.DicSysConf;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.FilesUtil;
@@ -129,20 +128,6 @@
return new PageResponse<>(RespCodeEnum.CODE_0000, listDepot);
}
-
- /**
- * 鍑哄叆搴撲腑-绮浜у湴
- *
- * @param param 鏌ヨ鍏抽敭瀛楀彲浠ユ槸ID涔熷彲鑳芥槸鍚嶇О
- * @return
- */
- @RequestMapping("/page-food-location")
- public PageResponse<Page<DicFoodOrigin>> pageFoodLocation(
- @RequestBody InoutParam param) {
-
- return commonManager.pageFoodLocation(param);
- }
-
/**
* 甯姪椤甸潰璺宠浆
*
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 c3aea26..6d72d05 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,7 +7,6 @@
import com.ld.igds.common.dto.PosDto;
import com.ld.igds.data.BaseParam;
import com.ld.igds.data.Page;
-import com.ld.igds.models.DicFoodOrigin;
import com.ld.igds.models.DicSlogan;
/**
@@ -57,13 +56,5 @@
* @param posDto
*/
void delPosByBizId(PosDto posDto);
-
- /**
- * 鍒嗛〉鏌ヨ绮浜у湴淇℃伅
- *
- * @param param
- * @return
- */
- Page<DicFoodOrigin> pageFoodLocation(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 1919dd7..20e1c5c 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,7 +5,6 @@
import com.ld.igds.common.mapper.DicDataMapper;
import com.ld.igds.data.BaseParam;
import com.ld.igds.data.Page;
-import com.ld.igds.models.DicFoodOrigin;
import com.ld.igds.models.DicSlogan;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,24 +52,6 @@
if (StringUtils.isEmpty(bizTag)) return null;
return dicDataMapper.getPosByBizTag(companyId, bizTag);
- }
-
- @Override
- public Page<DicFoodOrigin> pageFoodLocation(BaseParam param) {
-
- Page<DicFoodOrigin> page = new Page<DicFoodOrigin>(param.getPage(),
- param.getLimit());
-
- page.setSearchCount(false);
-
- if (StringUtils.isNoneEmpty(param.getKey())) {
- param.setKey("%" + param.getKey().toUpperCase() + "%");
- }
- List<DicFoodOrigin> records = dicDataMapper.pageFoodLocataion(page, param);
- page.setRecords(records);
-
- return page;
-
}
}
\ No newline at end of file
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 5f7193e..0eda84d 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
@@ -481,18 +481,6 @@
return new PageResponse<>(RespCodeEnum.CODE_0000, data);
}
- public PageResponse<Page<DicFoodOrigin>> pageFoodLocation(InoutParam param) {
-
- Page<DicFoodOrigin> result = coreDicService.pageFoodLocation(param);
-
- if (null == result.getRecords() || result.getRecords().isEmpty()) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "鑾峰彇鍒版暟鎹俊鎭负绌�");
- }
- return new PageResponse<Page<DicFoodOrigin>>(RespCodeEnum.CODE_0000,
- result);
- }
-
public DepotConf getDepotConf(String companyId, String depotId) {
return coreCommonService.getCacheDepotConf(companyId, depotId);
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 573988c..6958811 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,9 +1,6 @@
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.DicFoodOrigin;
import com.ld.igds.models.DicSlogan;
import org.apache.ibatis.annotations.Param;
@@ -41,15 +38,6 @@
DicSlogan getDicSlogan(@Param("param")Map<String,Object> parameter);
void delPosByBizId(@Param("dto") PosDto posDto);
-
- /**
- * 鍒嗛〉鑾峰彇绮浜у湴淇℃伅
- * @param page
- * @param param
- * @return
- */
- List<DicFoodOrigin> pageFoodLocataion(@Param("page") Page<DicFoodOrigin> page,
- @Param("param") BaseParam param);
/**
diff --git a/igds-core/src/main/java/com/ld/igds/models/DicFoodOrigin.java b/igds-core/src/main/java/com/ld/igds/models/DicFoodOrigin.java
deleted file mode 100644
index 02b4577..0000000
--- a/igds-core/src/main/java/com/ld/igds/models/DicFoodOrigin.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ld.igds.models;
-
-import com.bstek.dorado.annotation.PropertyDef;
-import com.ld.igds.constant.Constant;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import java.io.Serializable;
-
-/**
- * 瀛楀吀淇℃伅锛岀伯椋熶骇鍦�
- *
- *
- * @author Andy
- */
-@Data
-@Entity
-@Table(name = "D_DIC_FOOD_ORIGIN")
-public class DicFoodOrigin implements Serializable {
-
- private static final long serialVersionUID = 2988683387356674937L;
-
- @Id
- @Column(name = "ID_")
- @GeneratedValue(strategy = GenerationType.AUTO)
- private int id;
-
- @Column(name = "CODE_", length = 50)
- @PropertyDef(label = "浜у湴缂栫爜")
- private String code;
-
- @Column(name = "NAME_", length = 50)
- @PropertyDef(label = "浜у湴鍚嶇О")
- private String name;
-
- @Column(name = "SORT_")
- @PropertyDef(label = "鎺掑簭")
- private int sort = 1000;
-
- @PropertyDef(label = "浜у湴绠�鎷�")
- @Column(name = "SIMPLE_", length = 20)
- private String simple;
-
- @PropertyDef(label = "鏄惁绂佺敤")
- @Column(name = "DISABLED_TAG_", length = 1)
- private String disabledTag = Constant.YN_N;
-
-}
diff --git a/igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java b/igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java
index c45b277..8e937ea 100644
--- a/igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java
+++ b/igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java
@@ -8,7 +8,6 @@
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.ControlModel;
-import com.ld.igds.models.DicFoodOrigin;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.sys.service.DicTriggerService;
import com.ld.igds.util.ContextUtil;
@@ -211,22 +210,4 @@
public List<DicTrigger> queryDicByKey(Map<String, Object> param) {
return dicTriggerService.queryDicByKey(param);
}
-
- /**
- * dicTriggerPR#pagFoodLocationData
- *
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pagFoodLocationData(Page<DicFoodOrigin> page,
- Map<String, Object> param) throws Exception {
- if (null == param)
- param = new HashMap<String, Object>();
- param.put("disabledTag", Constant.YN_N);
- dicTriggerService.pagFoodLocationData(page, param);
- }
-
- ;
}
diff --git a/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerService.java b/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerService.java
index 8b72377..f821d64 100644
--- a/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerService.java
+++ b/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerService.java
@@ -1,7 +1,6 @@
package com.ld.igds.sys.service;
import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.models.DicFoodOrigin;
import com.ld.igds.models.DicTrigger;
import java.util.List;
@@ -96,9 +95,6 @@
* @return
*/
List<DicTrigger> queryDicByKey(Map<String, Object> parameter);
-
-
- void pagFoodLocationData(Page<DicFoodOrigin> page, Map<String, Object> param) throws Exception;
/**
* 澶嶅埗瀛楀吀鏁版嵁
diff --git a/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java b/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
index 63d2fcd..3ebf403 100644
--- a/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/sys/service/DicTriggerServiceImpl.java
@@ -5,7 +5,6 @@
import com.bstek.dorado.util.Assert;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.RedisConst;
-import com.ld.igds.models.DicFoodOrigin;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
@@ -206,53 +205,6 @@
hql += " order by code ";
return this.query(hql, args);
}
-
- @Override
- public void pagFoodLocationData(Page<DicFoodOrigin> page, Map<String, Object> param)
- throws Exception {
-
- String hql = " from " + DicFoodOrigin.class.getName() + " where 1=1";
-
- Map<String, Object> args = new HashMap<String, Object>();
-
- if (null != param) {
- String str = (String) param.get("code");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and code like :code";
- args.put("code", "%" + str + "%");
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and name like :name";
- args.put("name", "%" + str + "%");
- }
-
- str = (String) param.get("disabledTag");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and disabledTag = :disabledTag";
- args.put("disabledTag", str);
- }
-
- str = (String) param.get("key");
- if (StringUtils.isNoneEmpty(str)) {
- hql += " and (name like :name or code like:code or simple like:simple) ";
- args.put("name", "%" + str + "%");
- args.put("code", "%" + str + "%");
- args.put("simple", "%" + str.toUpperCase() + "%");
- }
- }
-
- String coutHql = "select count(*) " + hql;
-
- hql += " order by sort";
-
- if (args.isEmpty()) {
- this.pagingQuery(page, hql, coutHql);
- } else {
- this.pagingQuery(page, hql, coutHql, args);
- }
- }
-
@Override
public String copy2Target(String sourceId, String targetId) {
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
index 2179f9a..4bd94ef 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
@@ -1,9 +1,7 @@
package com.ld.igds.view.service;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
-import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.DicArea;
-import com.ld.igds.models.DicFoodOrigin;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
@@ -82,48 +80,5 @@
return null;
}
return list.get(0);
- }
-
- public void getDicArea(Page<DicFoodOrigin> page, Map<String,Object> param) throws Exception {
- String hql = " from " + DicArea.class.getName() + " where 1=1";
-
- Map<String, Object> args = new HashMap<String, Object>();
-
- if (null != param) {
- String str = (String) param.get("code");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and code like :code";
- args.put("code", "%" + str + "%");
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and name like :name";
- args.put("name", "%" + str + "%");
- }
-
- str = (String) param.get("disabledTag");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and disabledTag = :disabledTag";
- args.put("disabledTag", str);
- }
-
- str = (String) param.get("key");
- if (StringUtils.isNoneEmpty(str)) {
- hql += " and (name like :name or code like:code or simple like:simple) ";
- args.put("name", "%" + str + "%");
- args.put("code", "%" + str + "%");
- args.put("simple", "%" + str.toUpperCase() + "%");
- }
- }
-
- String coutHql = "select count(*) " + hql;
-
- hql += " order by code";
-
- if (args.isEmpty()) {
- this.pagingQuery(page, hql, coutHql);
- } else {
- this.pagingQuery(page, hql, coutHql, args);
- }
}
}
diff --git a/igds-core/src/main/resources/mapper/DicDataMapper.xml b/igds-core/src/main/resources/mapper/DicDataMapper.xml
index ab80ed6..9b2d443 100644
--- a/igds-core/src/main/resources/mapper/DicDataMapper.xml
+++ b/igds-core/src/main/resources/mapper/DicDataMapper.xml
@@ -84,23 +84,4 @@
</where>
</select>
-
- <select id="pageFoodLocataion" resultType="com.ld.igds.models.DicFoodOrigin" parameterType="com.ld.igds.data.BaseParam">
- select
- ID_ as id,
- CODE_ as code,
- NAME_ as name,
- SIMPLE_ as simple,
- SORT_ as SORT_,
- DISABLED_TAG_ as disabledTag
- from
- D_DIC_FOOD_ORIGIN
-
- <where>
- DISABLED_TAG_ ='N'
- <if test="param.key != null and ''!= param.key">AND (CODE_ like #{param.key} OR NAME_ like #{param.key} OR SIMPLE_ like #{param.key} )</if>
- </where>
-
- order by SORT_
- </select>
</mapper>
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
index f63d726..32498d0 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutApiController.java
@@ -61,8 +61,8 @@
* @return
*/
@ResponseBody
- @RequestMapping("/ic-card-num")
- public PageResponse<ApiInoutData> getIcCardNum(@RequestBody ApiInoutData param) {
+ @RequestMapping("/get-icCard")
+ public PageResponse<ApiInoutData> getIcCard(@RequestBody ApiInoutData param) {
if (StringUtils.isEmpty(param.getProtocol())) {
return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), "褰撳墠鏅烘収鍗℃湭閰嶇疆閫氳鍗忚锛屾棤娉曟墽琛�");
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 709beec..c888531 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
@@ -1,5 +1,6 @@
package com.ld.igds.inout.controller;
+import ch.qos.logback.classic.pattern.ClassNameOnlyAbbreviator;
import com.bstek.bdf2.core.business.IUser;
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.common.manager.CommonManager;
@@ -527,6 +528,7 @@
*/
@RequestMapping("/inout-query")
public PageResponse<InoutData> inoutQuery(@RequestBody InoutParam param) {
+ if(null == param.getCompanyId()) param.setCompanyId(ContextUtil.getCompanyId());
return inoutManager.inoutQuery(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 f1c5b38..da03cd4 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
@@ -1,5 +1,6 @@
package com.ld.igds.inout.manager;
+import com.ld.igds.constant.Constant;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.service.InoutService;
@@ -105,7 +106,7 @@
return result;
}
- public InoutConf getInoutConf(List<InoutConf> listInoutConf, String sort,String type) {
+ public InoutConf getInoutConf(List<InoutConf> listInoutConf, String sort, String type) {
if (null == listInoutConf) return new InoutConf(sort);
if (StringUtils.isEmpty(sort)) sort = "1";
@@ -143,13 +144,14 @@
public String getWeightEditTag(String companyId, String deptId) {
// 浠庣紦瀛樹腑鑾峰彇鍑哄叆搴撶郴缁熼厤缃俊鎭�
InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(companyId, deptId);
- String weightEditTag = null;
+ String weightEditTag = Constant.YN_N;
if (inoutSysConf != null) {
weightEditTag = inoutSysConf.getWeightEditTag();
}
+ if (null == weightEditTag) weightEditTag = Constant.YN_N;
+
return weightEditTag;
}
-
/**
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 f980613..0a0dac8 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
@@ -56,7 +56,7 @@
private InoutDeviceManager inoutDeviceManager;
/**
- * 褰撳墠鍏堜粠褰撴棩缂撳瓨涓幏鍙栨暟鎹紝濡傛灉缂撳瓨涓病鏈夊啀浠庢暟鎹簱鑾峰彇
+ * 棣栧厛浠庣紦瀛樹腑鑾峰彇锛岀紦瀛樹腑锛屼粠鏁版嵁搴撲腑鑾峰彇
*
* @param param
* @return
@@ -67,22 +67,17 @@
&& StringUtils.isEmpty(param.getUserId())) {
return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(),
- "鍙傛暟涓嶅畬鏁达紝鏃犳硶鑾峰彇淇℃伅锛�");
- }
-
- if (StringUtils.isEmpty(param.getCompanyId())) {
- param.setCompanyId(ContextUtil.getCompanyId());
+ "鏌ヨ鍙傛暟涓嶅畬鏁达紝鏌ヨ澶辫触锛�");
}
InoutData result;
String progress = param.getProgress();
try {
param.setProgress(null);
-
result = inoutService.inoutProgressQuery(param);
if (null == result) {
return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "鏈壘鍒版祦绋嬩腑鐨勮溅杈嗭紒", null);
+ "绯荤粺涓烘煡璇㈠埌鎵ц涓殑杞﹁締淇℃伅", null);
}
// 濡傛灉娌℃湁娴佺▼鏉′欢璇存槑涓嶉渶瑕佸仛鍒ゆ柇锛岀洿鎺ヨ繑鍥�
@@ -90,17 +85,16 @@
return new PageResponse<>(RespCodeEnum.CODE_0000, result);
}
+
+ //娴佺▼绫诲瀷楠岃瘉
if (!result.getType().equals(param.getType())) {
- if (InoutConstant.TYPE_IN.equals(result.getType())) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "绯荤粺锛氬綋鍓嶈溅杈嗕笟鍔′负銆愬叆搴撱��", result);
- } else {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "绯荤粺锛氬綋鍓嶈溅杈嗕笟鍔′负銆愬嚭搴撱��", result);
- }
+ String msg = "娴佺▼閿欒锛氬綋鍓嶈溅杈嗘祦绋嬩负銆愬叆搴撱��";
+ if (InoutConstant.TYPE_OUT.equals(result.getType())) msg = "娴佺▼閿欒锛氬綋鍓嶈溅杈嗘祦绋嬩负銆愬嚭搴撱��";
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(), msg, result);
}
- // 褰撳墠鏍囩鏍囩ず鏃㈠彲浠ユ槸绌鸿溅绉伴噸涔熷彲浠ユ槸婊¤溅
+
+ //娴佺▼鐜妭楠岃瘉
if (progress.equals(InoutConstant.PROGRESS_WEIGHT_TAG)) {
if (result.getProgress().equals(
InoutConstant.PROGRESS_WEIGHT_EMPTY)
@@ -109,7 +103,7 @@
// 琛ㄧず褰撳墠娴佺▼姝ｅ父
} else {
return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "闈炲綋鍓嶆祦绋嬶紝璇峰埌"
+ "鎻愮ず锛氶潪褰撳墠鐜妭锛岃鍒�"
+ InoutConstant.getProcessName(
param.getType(),
result.getProgress()), result);
@@ -117,33 +111,10 @@
} else {
if (!result.getProgress().equals(progress)) {
return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "闈炲綋鍓嶆祦绋嬶紝璇峰埌"
+ "鎻愮ず锛氶潪褰撳墠鐜妭锛岃鍒�"
+ InoutConstant.getProcessName(
param.getType(),
result.getProgress()), result);
- }
- }
-
- // 鏍规嵁褰撳墠鏁版嵁鍒ゆ柇鏄惁鎺ㄩ��
- inoutService.notifyWeb(result);
-
- //涓哄綋鍓嶆暟鎹坊鍔犲寲楠岄」鐩拰姘村垎鍜屾潅璐ㄧ殑鍖栭獙缁撴灉,鐢ㄤ簬鍑哄叆搴撳鎵ｉ噸璁＄畻
- if (InoutConstant.TYPE_IN.equals(result.getType())) {
- List<CheckItemData> checkItemDataList = inoutService.getCheckCache(result.getCompanyId(), result.getCheckId());
- result.setCheckItems(checkItemDataList);
- if (null != checkItemDataList && checkItemDataList.size() > 0) {
- for (CheckItemData checkItem : checkItemDataList) {
- if (StringUtils.isEmpty(checkItem.getValue())) {
- continue;
- }
-
-// if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
-// result.setWet(Double.valueOf(checkItem.getValue()));
-// }
-// if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
-// result.setImpurity(Double.valueOf(checkItem.getValue()));
-// }
- }
}
}
@@ -1106,6 +1077,7 @@
/**
* 鏍规嵁鏉′欢鑾峰彇鎵︽牱鏁版嵁
+ *
* @param param
* @return
*/
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 3cc0bcb..9a35a08 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
@@ -53,11 +53,14 @@
if (StringUtils.isEmpty(param.getCompanyId())) {
param.setCompanyId(ContextUtil.getCompanyId());
}
+
// 棣栧厛浠庣紦瀛樹腑鑾峰彇锛屽鏋滄病鏈夊垯浠庢暟鎹簱鑾峰彇
InoutData result = this.getFromInoutCache(param);
if (null != result) {
return result;
}
+
+
List<InoutData> list = inoutMapper.inoutProgressQuery(param);
if (null == list || list.size() == 0)
return null;
@@ -457,6 +460,7 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(ContextUtil.subDeptId(null));
}
+
List<InoutData> list = getListInoutCache(param.getDeptId());
if (null == list || list.isEmpty())
return null;
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 5d19ebb..43bf850 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -82,7 +82,6 @@
<if test="param.intelCard != null and param.intelCard != '' ">AND INTEL_CARD_ = #{param.intelCard}</if>
<if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
<if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
-
AND PROGRESS_ != 'RECORD'
AND RECORD_STATUS_ != 'ERROR'
AND RECORD_STATUS_ != 'DEL'
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 dc553ba..0f061eb 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
@@ -5,8 +5,8 @@
var recordData = null;// 涓氬姟鏁版嵁淇℃伅
var snapData;//绯荤粺鎶撴媿瀵硅薄淇℃伅
var timerWeight;
-var textParam;//璁惧璇嗗埆缁撴灉
-var curProgress;//褰撳墠璇︾粏娴佺▼
+var paramIntelCard;//璁惧璇嗗埆缁撴灉
+var paramIdCard;//璁惧璇嗗埆缁撴灉
$(function () {
layui.use(['layer', 'laydate', 'form', 'table', 'util'], function () {
@@ -85,76 +85,38 @@
//鏆傛棤
}
-// 鏍规嵁褰撳墠鎿嶄綔鐨勬寜閽甀D鏇存柊鍏朵粬鎸夐挳鐘舵��
-function flushBtn(btnId) {
- if ("btn-weight" == btnId) {// 绉伴噸鍚庡彲浠ョ偣鍑诲畬鎴愮О閲�
- $("#btn-submit").removeClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", false);
- }
- if ("btn-submit" == btnId) {
- $("#btn-submit").addClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", true);
- if (InoutProgress.WEIGHT_FULL == recordData.progress) {// 濡傛灉鏄弧杞︾О閲嶏紝鍒欑洿鎺ュ綋鍓嶈妭鐐瑰畬鎴�
- resetForm();
- } else {
- // 瀹屾垚绉伴噸鍚庢帶鍒舵寜閽�
- $("#btn-weight").addClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", true);
-
- $("#btn-printBill").removeClass("layui-btn-disabled");
- $("#btn-printBill").attr("disabled", false);
- }
- }
- if ("btn-printBill" == btnId) {// 鎵撳嵃杩囩鍗曪紝璇存槑涓氬姟瀹屾垚
- $("#btn-weight").removeClass("layui-btn-disabled");
- $("#btn-weight").attr("disabled", false);
-
- $("#btn-submit").addClass("layui-btn-disabled");
- $("#btn-submit").attr("disabled", true);
-
- $("#btn-printBill").addClass("layui-btn-disabled");
- $("#btn-printBill").attr("disabled", true);
-
- resetForm();
- }
-}
-
//鐐瑰嚮绉伴噸
function weight() {
// 娌℃湁涓氬姟鏁版嵁涓嶅彲鎵ц
if (!recordData) {
- alertError("娌℃湁鏌ヨ鍒颁笟鍔℃暟鎹紝鎵ц琚嫆缁濓紒锛�");
+ alertError("娌℃湁鏌ヨ鍒颁笟鍔℃暟鎹紝鎵ц琚嫆缁濓紒");
return;
}
-
// 濡傛灉鏄┖杞︾О閲�
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
form.val("form-data", {
emptyWeight: weightDto.weight
});
+ form.render();
}
-
// 濡傛灉鏄弧杞︾О閲�
if (InoutProgress.WEIGHT_FULL == recordData.progress) {
form.val("form-data", {
fullWeight: weightDto.weight
});
+ form.render();
}
- form.render();
- // 鐐瑰嚮绉伴噸鏃跺�欒嚜鍔ㄦ姄鎷嶆暟鎹�--澧炲姞閫氱煡淇℃伅
- layer.msg("绯荤粺鑷姩鎶撴媿淇濈暀璁板綍鈥︹��");
+ // 鐐瑰嚮绉伴噸鑷姩璋冪敤鎶撴媿
snapData = {
companyId: companyId,
deptId: deptId,
progress: recordData.progress,
bizType: bizType,
plateNum: recordData.plateNum,
-
- id1: (null != snapDto1) ? snapDto1.id : null,
- id2: (null != snapDto2) ? snapDto2.id : null,
- id3: (null != snapDto3) ? snapDto3.id : null,
-
+ id1: snapDto1.id,
+ id2: snapDto2.id,
+ id3: snapDto3.id,
sort: $("#scaleName").val(),
weight: weightDto.weight
};
@@ -171,62 +133,57 @@
success: function (result) {
layer.close(index);
if (result.code != "0000") {
- layer.alert(result.msg);
+ alertError(result.msg);
} else {
snapData = result.data;
}
},
error: function () {
layer.close(index);
- layer.msg("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ alertError("鍚庡彴璋冪敤鎴浘澶辫触锛岃閲嶆柊灏濊瘯");
}
});
- //鍏ュ簱绗簩娆＄О閲嶆椂璋冪敤璁＄畻鏂规硶
+ //濡傛灉鏄浜屾绉伴噸锛岄粯璁ゆ墽琛岃嚜鍔ㄨ绠�
if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
deAutoByIn("emptyWeight");
}
- flushBtn("btn-weight");
}
-//鏂扮殑璇诲崱鏂瑰紡
+//璇绘櫤鎱у崱
function flushICCard() {
- flushICCard1();
+ if (!cardDto.protocol) {
+ flushICCard1();
+ } else {
+ flushICCard2();
+ }
}
/**
* 鍗忚璇诲彇鏅烘収鍗�
*/
function flushICCard2() {
- var param = JSON.stringify(cardDto);
var index = layer.load();
+ var param = JSON.stringify(cardDto);
$.ajax({
type: "POST",
- url: "../../inout/api/ic-card-num",
+ url: "../../inout/api/get-icCard",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: param,
success: function (result) {
- if (result.code != "0000") {
- layer.alert(result.msg, {
- offset: ['300px', '300px']
- });
- } else {
- if (result.data.errorMsg) {
- layer.alert(result.data.errorMsg, {
- offset: ['300px', '300px']
- });
- } else {
- $("#intelCard").val(result.data.icCardNo);
- }
- }
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);
- layer.alert("IC鍗¤鍙栧け璐ワ紒", {
- offset: ['300px', '300px']
- });
+ alertError("IC鍗¤鍙栧け璐�");
}
});
}
@@ -235,6 +192,7 @@
* 鏈湴璇诲彇鏅烘収鍗�
*/
function flushICCard1() {
+ var index = layer.load();
$("#text-param").val(null);
$("#form-data")[0].reset();
form.render();
@@ -249,21 +207,23 @@
jsonpCallback: "jsonpCallback",
success: function (json) {
var data = json.no;
+ layer.close(index);
if (data === "not found") {
alertError("璇烽噸鏂拌鍗★紒");
} else {
- textParam = data;
- $("#text-param").text("璇嗗埆鍗″彿锛�" + textParam);
- flushData();
+ paramIntelCard = data;
+ $("#text-param").text("璇嗗埆鍗″彿锛�" + paramIntelCard);
+ flushData(paramIntelCard, null);
}
},
error: function () {
+ layer.close(index);
alertError("IC鍗¤鍙栧嚭閿欙紒");
}
});
}
-// 浣跨敤鎻掍欢鑾峰彇鐪佷唤璇�
+// 浣跨敤鎻掍欢鑾峰彇韬唤璇�
function flushIdCard() {
var index = layer.load();
$.ajax({
@@ -278,21 +238,22 @@
layer.close(index);
var data = json.content;
if (data === "not found") {
- layer.alert("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛岃鎵嬪姩褰曞叆锛�", {
- offset: ['300px', '300px']
- });
+ alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
return;
}
- $("#userId").val(data.idNum);
- flushData();
+ paramIdCard = data;
+ $("#text-param").text("璇嗗埆韬唤璇侊細" + paramIdCard);
+ flushData(null, paramIdCard);
},
error: function () {
- layer.alert("韬唤璇佽鍙栧け璐ワ紝璇锋墜鍔ㄥ綍鍏ワ紒", {
- offset: ['300px', '300px']
- });
+ alertError("娌℃湁璇诲彇鍒拌韩浠借瘉淇℃伅锛�");
layer.close(index);
}
});
+}
+
+function flushByHand() {
+ flushData(null, null);
}
function flushWeight() {
@@ -352,12 +313,9 @@
layer.msg("寮�濮嬫覆鏌撴墦鍗板崟鈥︹��");
if (companyId && companyId == "5016") {
print5016Weight(result.data);
- console.log("5016");
} else {
printWeight(result.data);
}
- // 鍒锋柊鎸夐挳
- flushBtn("btn-printBill");
}
},
error: function () {
@@ -380,12 +338,6 @@
//绉伴噸鍙互澶嶇敤
$("#btn-weight").removeClass("layui-btn-disabled");
$("#btn-weight").attr("disabled", false);
-
- //绌鸿溅鍜屾弧杞﹁閲嶇疆
- updateEditAndProgress();
-
- //鎵ｉ噸淇℃伅妗嗘仮澶嶄负鍙紪杈�
- delDisabled();
}
function flushPage() {
@@ -397,19 +349,18 @@
}
// --鏌ヨ鏂规硶,鑾峰彇韬唤璇佸彿銆佸崱鍙枫�佽溅鐗屽彿锛岃繘琛屾煡璇�
-function flushData() {
+function flushData(intelCard, userIdCard) {
var index = layer.load();
- var userId2 = $("#userId").val();
- var intelCard = $("#intelCard").val();
+ var userIdCard = userIdCard;
+ var intelCard = intelCard;
var plateNum = $("#plateNum").val();
var param = {
type: type,
progress: progress,
intelCard: intelCard,
- userId: userId2,
+ userId: userIdCard,
plateNum: plateNum
};
-
$.ajax({
type: "POST",
url: "../../basic/inout/inout-query",
@@ -417,66 +368,57 @@
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);
+ notifyProgress(result.msg, result.data);
} else {
recordData = result.data;
// 杩斿洖鐨勬暟鎹繘琛岃祴鍊�
form.val("form-data", recordData);
form.render();
+
updateEditAndProgress();
}
- layer.close(index);
},
error: function () {
layer.close(index);
- layer.alert("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯锛侊紒");
+ alertError("鏌ヨ澶辫触锛岃閲嶆柊灏濊瘯");
}
});
}
+
/**
- * 璺熸柊娴佺▼璇存槑鎻愬績淇℃伅
+ * 鏍规嵁涓氬姟鏁版嵁鏇存柊椤甸潰涓殑鐘舵��
*/
function updateEditAndProgress() {
- if (recordData) {
- if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
- $("#emptyWeight").removeClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", false);
+ if (!recordData) return true;
+ var curProgress = recordData.progress;
- $("#progress-hand").addClass("active");
- $("#progress-emptyWeight").addClass("active");
+ //绌鸿溅绉伴噸
+ if (InoutProgress.WEIGHT_EMPTY == curProgress) {
+ $("#progress-hand").addClass("active");
+ $("#progress-emptyWeight").addClass("active");
- $("#fullWeight").addClass("rkbk-search-input");
- $("#fullWeight").attr("disabled", true);
- }
- if (InoutProgress.WEIGHT_FULL == recordData.progress) {
- $("#fullWeight").removeClass("rkbk-search-input");
- $("#fullWeight").attr("disabled", false);
+ $("#depotIdLabel").removeClass("color-red");
+ }
- $("#progress-hand").removeClass("active");
- $("#progress-emptyWeight").removeClass("active");
-
- $("#emptyWeight").addClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", true);
- }
- } else {
- $("#fullWeight").addClass("rkbk-search-input");
- $("#fullWeight").attr("disabled", true);
-
- $("#emptyWeight").addClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", true);
-
+ //婊¤溅绉伴噸
+ if (InoutProgress.WEIGHT_FULL == curProgress) {
$("#progress-hand").removeClass("active");
$("#progress-emptyWeight").removeClass("active");
- }
- //鏍规嵁閰嶇疆淇℃伅璁剧疆鍦扮鏄惁鍙紪杈�
- if (weightEditTag && weightEditTag == 'N') {
- $("#fullWeight").addClass("rkbk-search-input");
- $("#fullWeight").attr("disabled", true);
- $("#emptyWeight").addClass("rkbk-search-input");
- $("#emptyWeight").attr("disabled", true);
+ //瑁呭嵏浠撳簱蹇呭～
+ $("#depotIdLabel").addClass("color-red");
+ }
+
+ //璁剧疆鍙紪杈�
+ if (weightEditTag == 'Y') {
+ $("#fullWeight").removeClass("rkbk-search-input");
+ $("#fullWeight").attr("disabled", false);
+
+ $("#emptyWeight").removeClass("rkbk-search-input");
+ $("#emptyWeight").attr("disabled", false);
}
}
@@ -541,8 +483,6 @@
notify(result.msg, result.data);
} else {
notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
- // 鏇存柊鎸夐挳鏄剧ず
- flushBtn("btn-submit");
}
layer.close(index);
},
@@ -572,6 +512,11 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(param)
});
+}
+
+//鏄剧ず璐ㄦ淇℃伅
+function showCheck() {
+ alertError("璋冩暣");
}
@@ -709,5 +654,3 @@
layer.msg("娌℃湁鑾峰彇鍒拌澶囷紒");
}
}
-
-//-------------------------閬撻椄鎿嶄綔--------------------------//
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/inout-common.js b/igds-web/src/main/resources/static/admin/inout/inout-common.js
index b7b5603..800de91 100644
--- a/igds-web/src/main/resources/static/admin/inout/inout-common.js
+++ b/igds-web/src/main/resources/static/admin/inout/inout-common.js
@@ -61,6 +61,6 @@
}
});
} else {
- layer.alert(msg, {offset: ['300px', '300px']});
+ alertError(msg);
}
}
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 b7c9acf..b5a4af5 100644
--- a/igds-web/src/main/resources/static/admin/inout/weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/weight.js
@@ -1,9 +1,5 @@
/**
* 鍏ュ簱-绉伴噸鑷姩璁＄畻
- * 1銆佸噣閲� = 姣涢噸 - 鐨噸 锛� 鎬绘墸閲� = 鎵ｆ按鏉� + 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸
- * 2銆佹按鍒嗘墸閲嶆牴鎹寲楠屾按鍒嗕俊鎭嚜鍔ㄨ绠楋紝姝ｆ暟=鎵ｉ噸锛岃礋鏁�=澧為噸
- * 3銆佺粨绠楅噸閲� = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛夛紱 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
- * 娉ㄦ剰锛氬鏋滄槸鎵嬪姩淇敼浜嗘按鍒嗗拰鏉傝川鐨勬墸閲嶏紝鍒欎笉鎸夌収閰嶇疆瑙勫垯杩涜澧炴墸閲嶈绠�
* @param name 瑙﹀彂浜嬩欢鐨勫睘鎬у悕绉�
*/
function deAutoByIn(name) {
@@ -11,66 +7,24 @@
if (curData.fullWeight == 0 || curData.emptyWeight == 0) {
return;
}
- //姹囨�荤粨鏋�
- var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
// 鍑�閲�
var netWeight = curData.fullWeight - curData.emptyWeight;
- //鎵ｆ按鏉�
- var deWet = curData.deWet, deImpurity = curData.deImpurity;
-
if (netWeight <= 0) {
- layer.alert("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+ alertError("鍑�閲�<=0锛屽綋鍓嶇幆鑺傚瓨鍦ㄩ�昏緫閿欒锛岃鏍稿");
return;
}
+ //鍏朵粬淇℃伅
+ var deHandle = curData.deHandle, dePackage = curData.dePackage, deOther = curData.deOther, settleWeight = 0,
+ recordWeight = 0, deCheck = curData.deCheck, addCheck = curData.addCheck;
+ recordWeight = Number(netWeight) - Number(deHandle) - Number(dePackage) - Number(deOther) - Number(deCheck);
+ settleWeight = Number(recordWeight) + Number(addCheck);
- var deBase = 0, multiple = 0;
- //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
- if ("emptyWeight" == name || null == deWet) {
- var checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C01, CHECK_ST.C020101);
- if (checkItem) {
- deBase = Number(curData.wet) - Number(checkItem.upperLimit);
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);//鍊嶆暟
- deWet = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
- //鏉傝川
- if ("emptyWeight" == name || null == deImpurity) {
- checkItem = this.getCheckItem(recordData.checkItems, CHECK_ST.C02, CHECK_ST.C01010301);
- if (checkItem) {
- deBase = Number(curData.impurity) - Number(checkItem.upperLimit);
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.ruleNum);
- deImpurity = (netWeight * multiple * checkItem.ruleReduce / 100.00).toFixed(0);
- }
- }
-
- /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
- deSum = Number(curData.deOther) + Number(curData.deHandle);
-
- if (Number(deWet) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deWet);
- } else {
- addSum = addSum + Number(deWet);
- }
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
- deSum = deSum.toFixed(0);
- /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
- addSum = Math.abs(addSum).toFixed(0);
- /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
- recordWeight = Number(netWeight) - Number(deSum);
- /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
- settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
+ netWeight = netWeight.toFixed(0);
+ recordWeight = recordWeight.toFixed(0);
+ settleWeight = recordWeight.toFixed(0);
form.val("form-data", {
netWeight: netWeight,
- deImpurity: deImpurity,
- deWet: deWet,
- deSum: deSum,
settleWeight: settleWeight,
recordWeight: recordWeight
});
@@ -336,4 +290,5 @@
}
});
}
+
// ---------------------------绮浜у湴 -缁撴潫 -------------------//
\ No newline at end of file
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 640a2c9..415352c 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
@@ -146,17 +146,14 @@
<i><img th:src="@{../../static/images/icon-chengzhong.png}"/></i>绉伴噸纭
</button>
<button id="btn-submit"
- class="rkbk-quick-btn layui-btn btn-green layui-btn-disabled"
+ class="rkbk-quick-btn layui-btn btn-green"
disabled=true onclick="submit()">
<i><img th:src="@{../../static/images/icon-ok.png}"/></i>瀹屾垚绉伴噸
</button>
<button id="btn-printBill"
- class="rkbk-quick-btn layui-btn btn-blue layui-btn-disabled"
+ class="rkbk-quick-btn layui-btn btn-blue"
disabled=true onclick="printBill()">
<i><img th:src="@{../../static/images/icon-dayin.png}"/></i>鎵撳嵃杩囩鍗�
- </button>
- <button class="rkbk-quick-btn layui-btn" onclick="gateCtrl()">
- <i><img th:src="@{../../static/images/icon-hyd.png}"/></i>閬撻椄鎿嶄綔
</button>
<button class="rkbk-quick-btn layui-btn btn-violet"
onclick="flushPage()">
@@ -264,7 +261,7 @@
class="rkbk-search-btn layui-btn r-120"
onclick="flushIdCard()">
<input type="button" value="鎵嬪姩鏌ヨ"
- class="rkbk-search-btn layui-btn" onclick="flushData()">
+ class="rkbk-search-btn layui-btn" onclick="flushByHand()">
</div>
</div>
@@ -272,30 +269,23 @@
<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>
<input type="text" name="id">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-娴佺▼鑺傜偣</label>
<input type="text" name="progress">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-涓氬姟绫诲瀷</label>
<input type="text" name="type">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛缂栫爜Id</label>
- <input type="text" name="customerId">
+ <input type="text" name="foodLocationId">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-閫氱煡鍗旾D</label>
<input type="text" name="noticeId">
</div>
<div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌瀛楁-绮鎬ц川</label>
<input type="text" name="foodType">
</div>
-
<div class="layui-col-xs4">
<div class="layui-form-item">
@@ -333,7 +323,7 @@
<label class="layui-form-label color-red">姣涢噸(婊¤溅)</label>
<div class="layui-input-block">
<input type="text" name="fullWeight" id="fullWeight" autocomplete="off"
- placeholder="鍦扮鑷姩甯﹀叆" class="layui-input weight rkbk-search-input" disabled>
+ placeholder="鍦扮鑷姩甯﹀叆" class="layui-input rkbk-search-input" disabled>
<em
class="kccz-data-dw">KG</em>
</div>
@@ -377,7 +367,7 @@
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">瑁呭嵏浠撳簱</label>
+ <label class="layui-form-label" id="depotIdLabel">瑁呭嵏浠撳簱</label>
<div class="layui-input-block">
<select name="depotId" id="depotId" lay-filter="select_depotId">
<option value=""></option>
@@ -399,7 +389,7 @@
<div class="layui-input-block">
<div class="posi-r">
<input id="deCheck" type="text" name="deCheck" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em
+ autocomplete="off" class="layui-input weight"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
@@ -442,7 +432,7 @@
<div class="layui-input-block">
<div class="posi-r">
<input id="addCheck" type="text" name="addCheck" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input"> <em
+ autocomplete="off" class="layui-input weight"> <em
class="kccz-data-dw">KG</em>
</div>
</div>
@@ -554,6 +544,17 @@
<label class="layui-form-label">鍖呰鎵ｉ噸</label>
<div class="layui-input-block">
<input type="text" name="dePackage" 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="dbz" autocomplete="off"
placeholder="璇疯緭鍏�" class="layui-input"> <em
class="kccz-data-dw">KG</em>
</div>
@@ -562,21 +563,10 @@
<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 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>
+ <label class="layui-form-label">鍖呬欢鎬绘暟</label>
<div class="layui-input-block">
<input type="text" name="bzbjs" autocomplete="off"
- placeholder="璇疯緭鍏�" class="layui-input weight"> <em
+ placeholder="璇疯緭鍏�" class="layui-input"> <em
class="kccz-data-dw">浠�</em>
</div>
</div>
--
Gitblit v1.9.3