From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoOrder.java | 33 +
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java | 33 +
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoDevice.java | 17
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java | 34 +
igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35OrderCommonParam.java | 19 +
igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java | 163 +++++---
igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java | 115 +++--
igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java | 37 +
igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java | 40 ++
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml | 416 +++++++++++++++++-----
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml | 28 +
igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java | 41 +
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java | 8
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml | 92 ++++
14 files changed, 844 insertions(+), 232 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoDevice.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoDevice.java
new file mode 100644
index 0000000..61f39be
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoDevice.java
@@ -0,0 +1,17 @@
+package com.ld.igds.phone35.dto;
+
+import lombok.Data;
+
+/**
+ * @Author:YAN
+ */
+@Data
+public class DtoDevice {
+ private String name;
+ private String status;
+ private String statusName;
+ private String passCode;
+ private String location;
+ private String serId;
+ private String type;
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoOrder.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoOrder.java
new file mode 100644
index 0000000..ce221fa
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoOrder.java
@@ -0,0 +1,33 @@
+package com.ld.igds.phone35.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 宸ュ崟鍒楄〃
+ *
+ * @Author:YAN
+ */
+@Data
+public class DtoOrder {
+
+ private String id;
+ private String type;
+ private String depotId;
+ private String depotName;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date startTime;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date endTime;
+
+ private String status;
+ private String statusName;
+ private String info;
+
+ private String applyUser;
+ private String applyUserName;
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
index d98a70b..b0c0957 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
@@ -92,4 +92,12 @@
* @return
*/
List<DtoVideo> getCamera(@Param("param") Phone35VideoCommonParam param);
+
+ /**
+ * 宸ュ崟鍒楄〃
+ *
+ * @param param
+ * @return
+ */
+ List<DtoOrder> getOrderList(@Param("param") Phone35OrderCommonParam param);
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35OrderCommonParam.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35OrderCommonParam.java
new file mode 100644
index 0000000..b32bbbb
--- /dev/null
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35OrderCommonParam.java
@@ -0,0 +1,19 @@
+package com.ld.igds.phone35.param;
+
+import lombok.Data;
+
+/**
+ * @Author:YAN
+ */
+@Data
+public class Phone35OrderCommonParam extends Phone35CommonParam {
+
+ private String userName;
+
+ private String type;
+ private String depotId;
+ private String info;
+
+ private String status;
+
+}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
index 716bc06..b003421 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
@@ -1,12 +1,23 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.DtoOrder;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.mapper.Phone35Mapper;
+import com.ld.igds.phone35.param.Phone35OrderCommonParam;
+import com.ld.igds.phone35.param.Phone35PatrolCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
+import com.ld.igds.phone35.util.Phone35Util;
+import com.ld.igds.phone35.util.PhoneRespUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 宸ュ崟璁板綍
@@ -15,6 +26,12 @@
*/
@Service
public class Phone35ServiceImpl5702 implements Phone35Service {
+
+ @Autowired
+ private Phone35Util phone35Util;
+ @Autowired
+ private Phone35Mapper phone35Mapper;
+
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5702;
@@ -22,7 +39,21 @@
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //杞寲瀵硅薄
+ Phone35OrderCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35OrderCommonParam.class);
+ if (null == param) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getUserName())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ param.setCompanyId(phone35AuthUser.getCompanyId());
+ List<DtoOrder> list = phone35Mapper.getOrderList(param);
+ for (DtoOrder dtoOrder : list) {
+ dtoOrder.setDepotName(phone35Util.getDepotName(phone35AuthUser.getCompanyId(), dtoOrder.getDepotId()));
+ }
//todo 宸ュ崟璁板綍
- return null;
+ return PhoneRespUtil.success(list, req);
}
}
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java
index efcf3c9..02ed4c2 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java
@@ -1,12 +1,23 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.constant.OrderStatus;
+import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.DtoOrder;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.mapper.Phone35Mapper;
+import com.ld.igds.phone35.param.Phone35OrderCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
+import com.ld.igds.phone35.util.Phone35Util;
+import com.ld.igds.phone35.util.PhoneRespUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 宸ュ崟瀹℃牳鍒楄〃
@@ -15,6 +26,12 @@
*/
@Service
public class Phone35ServiceImpl5703 implements Phone35Service {
+
+ @Autowired
+ private Phone35Util phone35Util;
+ @Autowired
+ private Phone35Mapper phone35Mapper;
+
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5703;
@@ -22,7 +39,22 @@
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //杞寲瀵硅薄
+ Phone35OrderCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35OrderCommonParam.class);
+ if (null == param) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getDeptId())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ param.setStatus(OrderStatus.Status_10.getCode());
+ param.setCompanyId(phone35AuthUser.getCompanyId());
+ List<DtoOrder> list = phone35Mapper.getOrderList(param);
+ for (DtoOrder dtoOrder : list) {
+ dtoOrder.setDepotName(phone35Util.getDepotName(phone35AuthUser.getCompanyId(), dtoOrder.getDepotId()));
+ }
//todo 宸ュ崟瀹℃牳鍒楄〃
- return null;
+ return PhoneRespUtil.success(list, req);
}
}
diff --git a/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml b/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
index 0c98dde..67047c7 100644
--- a/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
+++ b/igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
@@ -181,4 +181,32 @@
WHERE COMPANY_ID_ = #{param.companyId}
AND DEPT_ID_ = #{param.deptId}
</select>
+ <select id="getOrderList" resultType="com.ld.igds.phone35.dto.DtoOrder">
+ SELECT
+ ID_ as id,
+ COMPANY_ID_ as companyId,
+ DEPT_ID_ as deptId,
+ TYPE_ as type,
+ DEPOT_ID_ as depotId,
+ APPLY_USER_ as applyUser,
+ APPLY_USER_NAME_ as applyUserName,
+ APPLY_TIME_ as applyTime,
+ AUDIT_USER_ as auditUser,
+ AUDIT_USER_NAME_ as auditUserName,
+ CONDUCT_USER_ as conductUser,
+ AUDIT_TIME_ as auditTime,
+ STATUS_ as status,
+ RECORD_ as record,
+ START_ as startTime,
+ END_ as endTime
+ FROM
+ D_APPLY_ORDER
+ <where>
+ <if test="param.companyId != null and param.companyId != ''">and COMPANY_ID_ = #{param.companyId}</if>
+ <if test="param.deptId != null and param.deptId != ''">and DEPT_ID_ = #{param.deptId}</if>
+ <if test="param.userName != null and param.userName != ''">and APPLY_USER_ = #{param.userName}</if>
+ <if test="param.status != null and param.status != ''">and STATUS_ = #{param.status}</if>
+ </where>
+ order by APPLY_TIME_ DESC
+ </select>
</mapper>
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
index e24e7c7..9206fc1 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
@@ -4,11 +4,16 @@
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.InoutStockChange;
import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
+
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service
@@ -47,10 +52,24 @@
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getCzbz()) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("dateTime", data.getChangeDate());
+ List<InoutStockChange> list = queryAll(param);
+ int max = 0;
+ if (list.size() != 0) {
+ int num;
+ for (InoutStockChange stockChange : list) {
+ num = Integer.parseInt(stockChange.getId().substring(stockChange.getId().length() - 4));
+ max = Math.max(max, num);
+ }
+ }
+ String date = DateFormatUtils.format(new Date(), "yyyyMMdd");
+ data.setId(date + String.format("%04d", max + 1));
+ data.setCzbz("i");
session.save(data);
} else {
+ data.setCzbz("u");
session.update(data);
}
} catch (Exception e) {
@@ -60,6 +79,7 @@
session.close();
}
}
+
public String delData(InoutStockChange data) {
Session session = this.getSessionFactory().openSession();
try {
@@ -74,4 +94,20 @@
}
return null;
}
+
+
+ public List<InoutStockChange> queryAll(Map<String, Object> param) {
+
+ String hql = "from " + InoutStockChange.class.getName() + " where 1 = 1 ";
+ Map<String, Object> args = new HashMap<String, Object>();
+ Date date = (Date) param.get("dateTime");
+ if (null != date) {
+ hql += " and updateTime >= :startTime and updateTime < :endTime";
+ args.put("startTime", DateUtil.getCurZero(date));
+ args.put("endTime", DateUtil.getNextZero(date));
+ }
+ hql += " order by updateTime desc";
+ return this.query(hql, args);
+ }
+
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
index cbc2d81..22610d9 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
@@ -2,9 +2,13 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import com.ld.igds.models.InoutStockChange;
+import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
@@ -16,80 +20,111 @@
@Component
public class HVarietyChangeService extends HibernateDao {
- public void pageData(Page<InoutVarietyChange> page, Map<String, Object> param)
- throws Exception {
- String hql = " from " + InoutVarietyChange.class.getName()
- + " where companyId=:companyId";
+ public void pageData(Page<InoutVarietyChange> page, Map<String, Object> param)
+ throws Exception {
+ String hql = " from " + InoutVarietyChange.class.getName()
+ + " where companyId=:companyId";
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", ContextUtil.getCompanyId());
- if (null != param) {
+ if (null != param) {
- String str = (String) param.get("depotId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and depotId =:depotId";
- args.put("depotId", str);
- }
+ String str = (String) param.get("depotId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and depotId =:depotId";
+ args.put("depotId", str);
+ }
- str = (String) param.get("foodVariety");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and foodVariety =:foodVariety";
- args.put("foodVariety", str);
- }
+ str = (String) param.get("foodVariety");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and foodVariety =:foodVariety";
+ args.put("foodVariety", str);
+ }
- str = (String) param.get("type");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and type =:type";
- args.put("type", str);
- }
- }
+ str = (String) param.get("type");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and type =:type";
+ args.put("type", str);
+ }
+ }
- String count = "select count(*) " + hql;
+ String count = "select count(*) " + hql;
- hql += " order by changeTime desc";
+ hql += " order by changeTime desc";
- this.pagingQuery(page, hql, count, args);
+ this.pagingQuery(page, hql, count, args);
- }
+ }
- public void saveData(InoutVarietyChange data) {
- if (null == data.getCompanyId()) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if (null == data.getDeptId()) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- Session session = this.getSessionFactory().openSession();
- data.setUpdateTime(new Date());
- try {
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
- session.save(data);
- } else {
- session.update(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
+ public void saveData(InoutVarietyChange data) {
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ Session session = this.getSessionFactory().openSession();
+ data.setUpdateTime(new Date());
- public String delData(InoutVarietyChange data) {
- Session session = this.getSessionFactory().openSession();
- try {
- if (null != data.getId()) {
- session.delete(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
+ try {
+ if (null == data.getId()) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("dateTime", data.getChangeTime());
+ List<InoutVarietyChange> list = queryAll(param);
+ int max = 0;
+ if (list.size() != 0) {
+ int num;
+ for (InoutVarietyChange varietyChange : list) {
+ num = Integer.parseInt(varietyChange.getId().substring(varietyChange.getId().length() - 3));
+ max = Math.max(max, num);
+ }
+ }
+ String date = DateFormatUtils.format(new Date(), "yyyyMMdd");
+ data.setId(data.getHwdm() + date + String.format("%03d", max + 1));
+ data.setCzbz("i");
+ session.save(data);
+ } else {
+ data.setCzbz("u");
+ session.update(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
+
+ public String delData(InoutVarietyChange data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ public List<InoutVarietyChange> queryAll(Map<String, Object> param) {
+
+ String hql = "from " + InoutVarietyChange.class.getName() +
+ " where 1=1 ";
+ Map<String, Object> args = new HashMap<String, Object>();
+ Date date = (Date) param.get("dateTime");
+ if (null != date) {
+ hql += " and updateTime >= :startTime and updateTime < :endTime";
+ args.put("startTime", DateUtil.getCurZero(date));
+ args.put("endTime", DateUtil.getNextZero(date));
+ }
+
+ hql += " order by updateTime desc";
+ return this.query(hql, args);
+ }
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
index 71dc161..e56f1c5 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -7,11 +7,13 @@
<Property name="creationType">com.ld.igds.models.InoutStockChange</Property>
<PropertyDef name="id">
<Property></Property>
- <Property name="label">ID</Property>
+ <Property name="label">鍊掍粨鍗曞彿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
@@ -75,15 +77,45 @@
<PropertyDef name="number">
<Property name="dataType">Double</Property>
<Property name="label">鍊掍粨鏁伴噺</Property>
- <Property name="displayFormat">#.00KG</Property>
+ <Property name="displayFormat">#.00</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
- <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="updateUser">
<Property></Property>
<Property name="label">鏇存柊浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="dchwdm">
+ <Property/>
+ <Property name="label">鍊掑嚭璐т綅浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="drhwdm">
+ <Property/>
+ <Property name="label">鍊掑叆璐т綅浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="bzw">
+ <Property/>
+ <Property name="label">鍖呰鐗�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("stockChangePR#triggerBzw").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property/>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="bzbjs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鏍囧噯鍖呬欢鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="zxzydw">
+ <Property/>
+ <Property name="label">瑁呭嵏浣滀笟鍗曚綅</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -174,6 +206,7 @@
<Property name="caption">鍒锋柊</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-refresh</Property>
+ <Property name="visible">false</Property>
</Button>
</Container>
<Container layout="regionPadding:10" layoutConstraint="center">
@@ -277,6 +310,7 @@
<Property name="caption">璇︾粏淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
+ <Property name="height">80%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -307,6 +341,16 @@
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">companyId</Property>
+ <Property name="property">companyId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">depotIdIn</Property>
<Property name="property">depotIdIn</Property>
<Editor/>
@@ -317,8 +361,29 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dchwdm</Property>
+ <Property name="property">dchwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">drhwdm</Property>
+ <Property name="property">drhwdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -347,9 +412,18 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
- <Property name="readOnly">true</Property>
+ <Property name="name">bzw</Property>
+ <Property name="property">bzw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzbjs</Property>
+ <Property name="property">bzbjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zxzydw</Property>
+ <Property name="property">zxzydw</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -358,6 +432,12 @@
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
index 71c45c9..6cc104d 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
@@ -15,69 +15,86 @@
import java.util.Map;
/**
- * 缁煎悎涓氬姟-绮鍝佺鍙樻洿璁板綍
- *
+ * 缁煎悎涓氬姟-鍊掍粨璁板綍
+ *
* @author: andy.jia
* @description:
* @version:
* @data:2020骞�5鏈�28鏃�
- *
*/
@Component
public class StockChangePR {
- @Autowired
- private HMAtockChangeService service;
+ @Autowired
+ private HMAtockChangeService service;
- /**
- * 鍊掍粨绫诲瀷
- * ${dorado.getDataProvider("stockChangePR#triggerType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
+ /**
+ * 鍊掍粨绫诲瀷
+ * ${dorado.getDataProvider("stockChangePR#triggerType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger("0", "鍊掍粨"));
- list.add(new DicTrigger("1", "绉诲簱"));
+ list.add(new DicTrigger("0", "鍊掍粨"));
+ list.add(new DicTrigger("1", "绉诲簱"));
- return list;
- }
+ return list;
+ }
- /**
- * stockChangePR#pageData
- *
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pageData(Page<InoutStockChange> page, Map<String, Object> param)
- throws Exception {
- service.pageData(page, param);
- }
+ /**
+ * 鍖呰鐗�
+ * ${dorado.getDataProvider("stockChangePR#triggerBzw").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerBzw() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- /**
- * stockChangePR#saveData
- *
- * @param data
- */
- @DataResolver
- public void saveData(InoutStockChange data) {
- service.saveData(data);
- }
+ list.add(new DicTrigger("1", "楹昏"));
+ list.add(new DicTrigger("2", "缂栫粐琚�"));
+ list.add(new DicTrigger("3", "鏁ｈ"));
+ list.add(new DicTrigger("9", "鍏朵粬"));
- /**
- * stockChangePR#delData
- *
- * @param data
- * @return
- */
- @Expose
- public String delData(InoutStockChange data) {
- return service.delData(data);
- }
+ return list;
+ }
+
+ /**
+ * stockChangePR#pageData
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageData(Page<InoutStockChange> page, Map<String, Object> param)
+ throws Exception {
+ service.pageData(page, param);
+ }
+
+ /**
+ * stockChangePR#saveData
+ *
+ * @param data
+ */
+ @DataResolver
+ public void saveData(InoutStockChange data) {
+ service.saveData(data);
+ }
+
+ /**
+ * stockChangePR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(InoutStockChange data) {
+ return service.delData(data);
+ }
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
index 38d7c30..83fcfa6 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
@@ -7,11 +7,13 @@
<Property name="creationType">com.ld.igds.models.InoutVarietyChange</Property>
<PropertyDef name="id">
<Property></Property>
- <Property name="label">ID</Property>
+ <Property name="label">绮鎬ц川杞彉鍗曞彿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="approvalId">
<Property></Property>
@@ -46,16 +48,6 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="newFoodVariety">
- <Property></Property>
- <Property name="label">鍙樻洿鍚庡搧绉�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="foodType">
<Property></Property>
@@ -98,13 +90,77 @@
<Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
- <PropertyDef name="updateUser">
- <Property></Property>
- <Property name="label">鏇存柊浜�</Property>
- </PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="hwdm">
+ <Property/>
+ <Property name="label">璐т綅浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="ccshr">
+ <Property/>
+ <Property name="label">浠撳偍瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditCcsh">
+ <Property/>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="InfoCcsh">
+ <Property/>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="zjshr">
+ <Property/>
+ <Property name="label">璐ㄦ瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditZjsh">
+ <Property/>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoZjsh">
+ <Property/>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="tjshr">
+ <Property/>
+ <Property name="label">缁熻瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditTjsh">
+ <Property/>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoTjsh">
+ <Property/>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="kjshr">
+ <Property/>
+ <Property name="label">浼氳瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditKjsh">
+ <Property/>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoKjsh">
+ <Property/>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="ldshr">
+ <Property/>
+ <Property name="label">棰嗗瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditLdsh">
+ <Property/>
+ <Property name="label">瀹℃壒鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="infoLdsh">
+ <Property/>
+ <Property name="label">瀹℃牳璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property/>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -204,6 +260,7 @@
<Property name="caption">鍒锋柊</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-refresh</Property>
+ <Property name="visible">false</Property>
</Button>
</Container>
<Container layout="regionPadding:10" layoutConstraint="center">
@@ -250,20 +307,12 @@
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="newFoodVariety">
- <Property name="property">newFoodVariety</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="changeTime">
<Property name="property">changeTime</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="updateTime">
<Property name="property">updateTime</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="updateUser">
- <Property name="property">updateUser</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="remark">
@@ -279,10 +328,11 @@
</DataPilot>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:10">
- <Property name="width">800</Property>
+ <Property name="width">60%</Property>
<Property name="caption">绮鍝佺鍙樻洿淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
+ <Property name="height">80%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -306,75 +356,255 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelWidth">120</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">approvalId</Property>
- <Property name="property">approvalId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">newFoodVariety</Property>
- <Property name="property">newFoodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodType</Property>
- <Property name="property">foodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">newFoodType</Property>
- <Property name="property">newFoodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">number</Property>
- <Property name="property">number</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">changeNumber</Property>
- <Property name="property">changeNumber</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">changeTime</Property>
- <Property name="property">changeTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateUser</Property>
- <Property name="property">updateUser</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <FieldSet>
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">140</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">companyId</Property>
+ <Property name="property">companyId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">approvalId</Property>
+ <Property name="property">approvalId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodType</Property>
+ <Property name="property">foodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">newFoodType</Property>
+ <Property name="property">newFoodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">number</Property>
+ <Property name="property">number</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">changeNumber</Property>
+ <Property name="property">changeNumber</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">changeTime</Property>
+ <Property name="property">changeTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">瀹℃壒淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <FieldSet>
+ <Property name="caption">浠撳偍瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">ccshr</Property>
+ <Property name="property">ccshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditCcsh</Property>
+ <Property name="property">auditCcsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">InfoCcsh</Property>
+ <Property name="property">InfoCcsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">璐ㄦ瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">zjshr</Property>
+ <Property name="property">zjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditZjsh</Property>
+ <Property name="property">auditZjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoZjsh</Property>
+ <Property name="property">infoZjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">缁熻瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelWidth">120</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">right</Property>
+ <AutoFormElement>
+ <Property name="name">tjshr</Property>
+ <Property name="property">tjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditTjsh</Property>
+ <Property name="property">auditTjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2;rowSpan:2">
+ <Property name="name">infoTjsh</Property>
+ <Property name="property">infoTjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">浼氳瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">kjshr</Property>
+ <Property name="property">kjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditKjsh</Property>
+ <Property name="property">auditKjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoKjsh</Property>
+ <Property name="property">infoKjsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">棰嗗瀹℃壒</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">140</Property>
+ <AutoFormElement>
+ <Property name="name">ldshr</Property>
+ <Property name="property">ldshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditLdsh</Property>
+ <Property name="property">auditLdsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+ <Property name="name">infoLdsh</Property>
+ <Property name="property">infoLdsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ </Children>
+ </FieldSet>
+ <FieldSet>
+ <Property name="caption">澶囨敞淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
</Children>
<Tools/>
</Dialog>
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java b/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
index a3a8283..bba89f9 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
@@ -19,10 +19,12 @@
@Table(name = "D_INOUT_STOCK_CHANGE")
public class InoutStockChange {
-
+ /**
+ * 鍊掍粨鍗曞彿
+ */
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "涓婚敭")
+ @Column(name = "ID_", length = 32)
+ @PropertyDef(label = "鍊掍粨鍗曞彿", description = "鐢卞�掍粨鏃ユ湡(yyyyMMdd)+4浣嶉『搴忓彿缁勬垚")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -46,7 +48,7 @@
private String noticeId;
@Column(name = "FOOD_VARIETY_", length = 10)
- @PropertyDef(label = "绮鍝佺")
+ @PropertyDef(label = "绮鍝佺", description = "浠ｇ爜涓嶈冻7浣嶉渶鍦ㄦ湯浣嶈ˉ0")
private String foodVariety;
@Column(name = "DEPOT_ID_IN", length = 50)
@@ -58,18 +60,43 @@
private String depotIdOut;
@Column(name = "CHANGE_DATE_")
- @PropertyDef(label = "鍊掍粨鏃ユ湡")
+ @PropertyDef(label = "鍊掍粨鏃ユ湡", description = "yyyy-MM-dd")
private Date changeDate;
@Column(name = "NUMBER_")
- @PropertyDef(label = "鍊掍粨鏁伴噺")
+ @PropertyDef(label = "鍊掍粨鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
private Double number = 0.0;
+ @Column(name = "czbz", length = 1)
+ @PropertyDef(label = "鎿嶄綔鏍囧織", description = "i:鏂板鏁版嵁锛堥粯璁わ級u:鏇存柊鏁版嵁 d:鍒犻櫎鏁版嵁")
+ private String czbz;
+
@Column(name = "UPDATE_TIME_")
- @PropertyDef(label = "鏇存柊鏃堕棿")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date updateTime;
@Column(name = "UPDATE_USER_", length = 50)
@PropertyDef(label = "鏇存柊浜�")
private String updateUser;
+
+ @Column(name = "dchwdm", length = 30)
+ @PropertyDef(label = "鍊掑嚭璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
+ private String dchwdm;
+
+ @Column(name = "drhwdm", length = 30)
+ @PropertyDef(label = "鍊掑叆璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
+ private String drhwdm;
+
+ @Column(name = "bzw", length = 1)
+ @PropertyDef(label = "鍖呰鐗�", description = "1锛氶夯琚� 2锛氱紪缁囪 3锛氭暎瑁� 9锛氬叾浠�")
+ private String bzw;
+
+ @Column(name = "bzbjs")
+ @PropertyDef(label = "鏍囧噯鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
+ private Integer bzbjs = 0;
+
+ @Column(name = "zxzydw", length = 256)
+ @PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅", description = "瑁呭嵏浣滀笟鐨勪汉鍛樺鍚嶆垨鍗曚綅鍚嶇О锛岀敤鍗婅閫楀彿鍒嗛殧")
+ private String zxzydw;
+
}
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
index 7c4e7ad..37f168b 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
@@ -23,13 +23,17 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "涓婚敭")
+ @Column(name = "ID_", length = 41)
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿", description = "鐢辫揣浣嶄唬鐮�+鍒掕浆鏃ユ湡锛坹yyyMMdd锛�+3浣嶉『搴忓彿缁勬垚")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
+
+ @Column(name = "hwdm", length = 30)
+ @PropertyDef(label = "璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
+ private String hwdm;
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鍒嗗簱缂栫爜")
@@ -40,11 +44,11 @@
private String depotId;
@Column(name = "NUMBER_")
- @PropertyDef(label = "绮鏁伴噺")
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
private Double number = 0.0;
@Column(name = "CHANGE_NUMBER_")
- @PropertyDef(label = "鍒掕浆鏁伴噺")
+ @PropertyDef(label = "鍒掕浆鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
private Double changeNumber = 0.0;
@Column(name = "APPROVAL_ID_", length = 40)
@@ -52,19 +56,29 @@
private String approvalId;
@Column(name = "FOOD_VARIETY_", length = 10)
- @PropertyDef(label = "绮鍝佺")
+ @PropertyDef(label = "绮鍝佺", description = "浠ｇ爜涓嶈冻7浣嶉渶鍦ㄦ湯浣嶈ˉ0")
private String foodVariety;
+ /**
+ * 100銆佸偍澶囩伯 110銆佷腑澶偍澶囩伯 120銆佸湴鏂瑰偍澶囩伯
+ * 121銆佺渷(鑷不鍖恒�佺洿杈栧競)绾у湴鏂瑰偍澶囩伯
+ * 122銆佸競(鍦板尯銆佽嚜娌诲窞銆佺洘)绾у湴鏂瑰偍澶囩伯
+ * 123銆佸幙(鑷不鍘裤�佸幙绾у競銆佹棗銆佽嚜娌绘棗銆佸競杈栧尯銆佹灄鍖恒�佺壒鍖�)绾у湴鏂瑰偍澶囩伯
+ * 129銆佸叾浠栧偍澶囩伯 200銆佸晢鍝佺伯 270銆佷腑鍌ㄧ伯绯荤粺鍟嗗搧绮�
+ * 280銆佽繘鍙ｅ晢鍝佺伯 290銆佸叾浠栧晢鍝佺伯 300銆佹斂绛栨�х伯椋�
+ * 310銆佹渶浣庢敹璐环绮� 320銆佸浗瀹朵复鏃跺瓨鍌ㄧ伯 330銆佸浗瀹朵复鍌ㄨ繘鍙ｇ伯
+ * 340銆佸湴鏂逛复鏃跺瓨鍌ㄧ伯
+ */
@Column(name = "FOOD_TYPE_", length = 10)
- @PropertyDef(label = "鍘熺伯椋熸�ц川")
+ @PropertyDef(label = "鍒掕浆鍓嶇伯椋熸�ц川浠ｇ爜")
private String foodType;
@Column(name = "NEW_FOOD_TYPE_", length = 10)
- @PropertyDef(label = "鍙樻洿鍚庢�ц川")
+ @PropertyDef(label = "鍒掕浆鍚庣伯椋熸�ц川浠ｇ爜")
private String newFoodType;
@Column(name = "CHANGE_TIME_")
- @PropertyDef(label = "鍙樻洿鏃堕棿")
+ @PropertyDef(label = "鍒掕浆鏃ユ湡")
private Date changeTime;
@PropertyDef(label = "浠撳偍瀹℃牳浜�")
@@ -127,8 +141,13 @@
@PropertyDef(label = "瀹℃牳璇存槑")
private String infoLdsh;
+ @Column(name = "czbz", length = 1)
+ @PropertyDef(label = "鎿嶄綔鏍囧織", description = "i:鏂板鏁版嵁锛堥粯璁わ級u:鏇存柊鏁版嵁 d:鍒犻櫎鏁版嵁")
+ private String czbz;
+
+
@Column(name = "UPDATE_TIME_")
- @PropertyDef(label = "鏇存柊鏃堕棿")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date updateTime;
@Column(name = "REMARK_", length = 200)
--
Gitblit v1.9.3