From b9ab518f6ede8ff871d1554c199e7ce4b5117dac Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 01 十二月 2025 18:25:52 +0800
Subject: [PATCH] 出库通知单
---
fzzy-igdss-web/src/main/resources/templates/inout/inout-weight.html | 7
/dev/null | 53 -
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java | 266 --------
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 1191 ++++++++++----------------------------
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 204 ++++-
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java | 10
fzzy-igdss-web/src/main/resources/templates/inout/inout-register.html | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java | 15
8 files changed, 502 insertions(+), 1,246 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
index ef221ed..6352058 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
@@ -46,17 +46,13 @@
@TableField("type")
private String type;
- @Column(name = "contract_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲悎鍚�'")
- @TableField("contract_id")
- private String contractId;
+ @Column(name = "contract", columnDefinition = "varchar(40) COMMENT '鍏宠仈鍚堝悓'")
+ @TableField("contract")
+ private String contract;
@Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鍑哄簱浠撳簱'")
@TableField("depot_id")
private String depotId;
-
- @Column(name = "customer_id", columnDefinition = "varchar(40) COMMENT '鍙戣揣瀹㈡埛'")
- @TableField("customer_id")
- private String customerId;
@Column(name = "customer_name", columnDefinition = "varchar(40) COMMENT '鍙戣揣鍗曚綅'")
@TableField("customer_name")
@@ -82,7 +78,7 @@
@TableField("complete_number")
private Double completeNumber = 0.0;
- @Column(name = "audit_status", columnDefinition = "varchar(2) COMMENT '瀹℃牳鐘舵��(10=鐩戠瀹℃牳锛�20=閾惰瀹℃牳锛�30=閫氳繃)'")
+ @Column(name = "audit_status", columnDefinition = "varchar(10) COMMENT '瀹℃牳鐘舵��(10=鐩戠瀹℃牳锛�20=閾惰瀹℃牳锛�30=閫氳繃)'")
@TableField("audit_status")
private String auditStatus = "10";
@@ -108,7 +104,4 @@
@TableField("remark")
private String remark;
- @Transient
- @PropertyDef(label = "鏍囪", description = "鐢ㄤ簬鍒ゆ柇閫氱煡鍗曟槸鍚︿负鏂板")
- private String tag;
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeMapper.java
deleted file mode 100644
index 50850e2..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeMapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.fzzy.igds.mapper;
-
-import com.fzzy.igds.data.NoticeParam;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/29 16:39
- */
-public interface InoutNoticeMapper {
-
- /**
- * 鍏ュ簱閫氱煡鍗� - 鏍规嵁鍙傛暟閲嶆柊璁＄畻瀹屾垚閲�
- *
- * @param param
- * @return
- */
- int reSumNoticeInComplete(@Param("param") NoticeParam param);
-
- /**
- * 鍑哄簱閫氱煡鍗� - 鏍规嵁鍙傛暟閲嶆柊璁＄畻瀹屾垚閲�
- *
- * @param param
- * @return
- */
- int reSumNoticeOutComplete(@Param("param") NoticeParam param);
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java
new file mode 100644
index 0000000..a90c7ee
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java
@@ -0,0 +1,10 @@
+package com.fzzy.igds.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fzzy.igds.domain.InoutNoticeOut;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InoutNoticeOutMapper extends BaseMapper<InoutNoticeOut> {
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutNoticeInRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutNoticeInRepository.java
deleted file mode 100644
index 24eb543..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutNoticeInRepository.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.InoutNoticeIn;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/29 16:33
- */
-@Service
-public interface InoutNoticeInRepository extends JpaRepository<InoutNoticeIn, String> , JpaSpecificationExecutor<InoutNoticeIn> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param deptId
- * @param id
- * @return
- */
- @Query("from InoutNoticeIn where companyId =:companyId and deptId =:deptId and id =:id")
- InoutNoticeIn getDataById(@Param("companyId") String companyId, @Param("deptId") String deptId, @Param("id") String id);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param deptId
- * @param completeStatus
- * @return
- */
- @Query("from InoutNoticeIn where companyId =:companyId and deptId =:deptId and completeStatus =:completeStatus")
- List<InoutNoticeIn> listNoticeIn(@Param("companyId") String companyId, @Param("deptId") String deptId, @Param("completeStatus") String completeStatus);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param completeStatus
- * @return
- */
- @Query("from InoutNoticeIn where companyId =:companyId and completeStatus =:completeStatus")
- List<InoutNoticeIn> listNoticeIn(@Param("companyId") String companyId, @Param("completeStatus") String completeStatus);
-
-
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutNoticeOutRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutNoticeOutRepository.java
deleted file mode 100644
index d1dacde..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/InoutNoticeOutRepository.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.fzzy.igds.repository;
-
-import com.fzzy.igds.domain.InoutNoticeOut;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description
- * @Author CZT
- * @Date 2025/11/29 16:34
- */
-@Service
-public interface InoutNoticeOutRepository extends JpaRepository<InoutNoticeOut, String> , JpaSpecificationExecutor<InoutNoticeOut> {
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param deptId
- * @param id
- * @return
- */
- @Query("from InoutNoticeOut where companyId =:companyId and deptId =:deptId and id =:id")
- InoutNoticeOut getDataById(@Param("companyId") String companyId, @Param("deptId") String deptId, @Param("id") String id);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param deptId
- * @param completeStatus
- * @return
- */
- @Query("from InoutNoticeOut where companyId =:companyId and deptId =:deptId and completeStatus =:completeStatus")
- List<InoutNoticeOut> listNoticeOut(@Param("companyId") String companyId, @Param("deptId") String deptId, @Param("completeStatus") String completeStatus);
-
- /**
- * 鏍规嵁缁勭粐缂栫爜鍜屽簱鍖虹紪鐮佽幏鍙栦俊鎭�
- *
- * @param companyId
- * @param completeStatus
- * @return
- */
- @Query("from InoutNoticeOut where companyId =:companyId and completeStatus =:completeStatus")
- List<InoutNoticeOut> listNoticeOut(@Param("companyId") String companyId, @Param("completeStatus") String completeStatus);
-
-
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index 9f157ce..7aba052 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -5,26 +5,18 @@
import com.fzzy.igds.data.NoticeDto;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.mapper.InoutNoticeInMapper;
-import com.fzzy.igds.mapper.InoutNoticeMapper;
-import com.fzzy.igds.repository.InoutNoticeInRepository;
-import com.fzzy.igds.repository.InoutNoticeOutRepository;
+import com.fzzy.igds.mapper.InoutNoticeOutMapper;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
-
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* @Description 鍑哄叆搴撻�氱煡鍗晄ervice灞傦紝鍖呭惈鍏ュ簱閫氱煡鍗曞拰鍑哄簱閫氱煡鍗�
@@ -36,47 +28,86 @@
public class InoutNoticeService {
@Resource
- private InoutNoticeInRepository noticeInRepository;
- @Resource
- private InoutNoticeOutRepository noticeOutRepository;
- @Resource
- private InoutNoticeMapper noticeMapper;
-
- @Resource
private InoutNoticeInMapper noticeInMapper;
+ @Resource
+ private InoutNoticeOutMapper noticeOutMapper;
-
-/* *//**
- * JPA鍒嗛〉鏌ヨ鏁版嵁
- *
- *//*
- public Page<InoutNoticeIn> queryAllNoticeIn(Specification<InoutNoticeIn> specification, Pageable pageable) {
- return noticeInRepository.findAll(specification, pageable);
- }*/
-
+ /*----------------------鍏ュ簱閫氱煡鍗曚俊鎭�-------------------------*/
+ /**
+ * 鍒嗛〉鏌ヨ鏁版嵁
+ * @param page
+ * @param param
+ */
public void pageQueryIn(Page<InoutNoticeIn> page, NoticeParam param) {
QueryWrapper<InoutNoticeIn> queryWrapper = new QueryWrapper<>();
- if(null == param) param = new NoticeParam();
+ if(null == param) {
+ param = new NoticeParam();
+ }
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
+ if(StringUtils.isNotBlank(param.getCustomerName())){
+ queryWrapper.like("customer_name", param.getCustomerName());
+ }
+ if(StringUtils.isNotBlank(param.getFoodVariety())){
+ queryWrapper.like("food_variety", param.getFoodVariety());
+ }
+ if(StringUtils.isNotBlank(param.getCompleteStatus())){
+ queryWrapper.like("complete_status", param.getCompleteStatus());
+ }
noticeInMapper.selectPage(page, queryWrapper);
}
/**
- * JPA鏌ヨ鏁版嵁
+ * 鏍规嵁鏉′欢鏌ヨ
+ * @param companyId
+ * @param deptId
+ * @param completeStatus
+ * @return
+ */
+ public List<InoutNoticeIn> getNoticeIn(String companyId, String deptId, String completeStatus) {
+
+ QueryWrapper<InoutNoticeIn> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(companyId)){
+ queryWrapper.eq("company_id", companyId);
+ }
+ if(StringUtils.isNotBlank(deptId)){
+ queryWrapper.eq("dept_id", deptId);
+ }
+ if(StringUtils.isNotBlank(completeStatus)){
+ queryWrapper.eq("complete_status", completeStatus);
+ }
+ queryWrapper.orderByDesc("create_time");
+
+ return noticeInMapper.selectList(queryWrapper);
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鏌ヨ
+ * @param id
+ * @return
+ */
+ public InoutNoticeIn getNoticeInOne(String id) {
+
+ QueryWrapper<InoutNoticeIn> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("id", id);
+ return noticeInMapper.selectOne(queryWrapper);
+ }
+
+ /**
+ * 鏌ヨ鏁版嵁
* @param companyId
* @param deptId
* @return
*/
public List<InoutNoticeIn> listNoticeIn(String companyId, String deptId) {
- return noticeInRepository.listNoticeIn(companyId, deptId, Constant.COMPLETE_STATUS_NONE);
+ return this.getNoticeIn(companyId, deptId, Constant.COMPLETE_STATUS_NONE);
}
/**
- * jpa 鑾峰彇淇℃伅
+ * 鏌ヨ鏁版嵁
* @param companyId
* @return
*/
@@ -84,11 +115,11 @@
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
- return noticeInRepository.listNoticeIn(companyId, Constant.COMPLETE_STATUS_NONE);
+ return this.getNoticeIn(companyId, null, Constant.COMPLETE_STATUS_NONE);
}
/**
- * JPA - 淇濆瓨鏇存柊鏁版嵁
+ * - 淇濆瓨鏇存柊鏁版嵁
*
* @param data
* @return
@@ -101,47 +132,99 @@
data.setCreateTime(new Date());
data.setAuditStatus(Constant.COMPLETE_STATUS_NONE);
data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
- noticeInRepository.save(data);
+ noticeInMapper.insert(data);
} else {
data.setUpdateBy(ContextUtil.getLoginUserName());
data.setUpdateTime(new Date());
- noticeInRepository.save(data);
+ noticeInMapper.updateById(data);
}
return null;
}
/**
- * JPA - 鍒犻櫎鏁版嵁
+ * - 鍒犻櫎鏁版嵁
*
* @param data
* @return
*/
public String delDataIn(InoutNoticeIn data) {
- noticeInRepository.delete(data);
+ noticeInMapper.deleteById(data);
return null;
}
+ /*----------------------鍑哄簱閫氱煡鍗曚俊鎭�-------------------------*/
/**
- * JPA鍒嗛〉鏌ヨ鏁版嵁
- *
- * @param specification
- * @param pageable
+ * 鍒嗛〉鏌ヨ鏁版嵁
+ * @param page
+ * @param param
+ */
+ public void pageQueryOut(Page<InoutNoticeOut> page, NoticeParam param) {
+ QueryWrapper<InoutNoticeOut> queryWrapper = new QueryWrapper<>();
+
+ if(null == param) {
+ param = new NoticeParam();
+ }
+ param.setCompanyId(ContextUtil.getCompanyId());
+
+ queryWrapper.eq("company_id", param.getCompanyId());
+ if(StringUtils.isNotBlank(param.getCustomerName())){
+ queryWrapper.like("customer_name", param.getCustomerName());
+ }
+ if(StringUtils.isNotBlank(param.getFoodVariety())){
+ queryWrapper.like("food_variety", param.getFoodVariety());
+ }
+ if(StringUtils.isNotBlank(param.getCompleteStatus())){
+ queryWrapper.like("complete_status", param.getCompleteStatus());
+ }
+
+ noticeOutMapper.selectPage(page, queryWrapper);
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鏌ヨ
+ * @param companyId
+ * @param deptId
+ * @param completeStatus
* @return
*/
- public Page<InoutNoticeOut> queryAllNoticeOut(Specification<InoutNoticeOut> specification, Pageable pageable) {
- //return noticeOutRepository.findAll(specification, pageable);
- return null;
+ public List<InoutNoticeOut> getNoticeOut(String companyId, String deptId, String completeStatus) {
+
+ QueryWrapper<InoutNoticeOut> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(companyId)){
+ queryWrapper.eq("company_id", companyId);
+ }
+ if(StringUtils.isNotBlank(deptId)){
+ queryWrapper.eq("dept_id", deptId);
+ }
+ if(StringUtils.isNotBlank(completeStatus)){
+ queryWrapper.eq("complete_status", completeStatus);
+ }
+ queryWrapper.orderByDesc("create_time");
+
+ return noticeOutMapper.selectList(queryWrapper);
}
/**
- * JPA鏌ヨ鏁版嵁
+ * 鏍规嵁鏉′欢鏌ヨ
+ * @param id
+ * @return
+ */
+ public InoutNoticeOut getNoticeOutOne(String id) {
+
+ QueryWrapper<InoutNoticeOut> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("id", id);
+ return noticeOutMapper.selectOne(queryWrapper);
+ }
+
+ /**
+ * 鏌ヨ鏁版嵁
* @param companyId
* @param deptId
* @return
*/
public List<InoutNoticeOut> listNoticeOut(String companyId, String deptId) {
- return noticeOutRepository.listNoticeOut(companyId, deptId, Constant.COMPLETE_STATUS_NONE);
+ return this.getNoticeOut(companyId, deptId, Constant.COMPLETE_STATUS_NONE);
}
/**
@@ -153,41 +236,45 @@
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
}
- return noticeOutRepository.listNoticeOut(companyId, Constant.COMPLETE_STATUS_NONE);
+ return this.getNoticeOut(companyId, null,Constant.COMPLETE_STATUS_NONE);
}
/**
- * JPA - 淇濆瓨鏇存柊鏁版嵁
+ * - 淇濆瓨鏇存柊鏁版嵁
*
* @param data
* @return
*/
public String saveOrUpdateOut(InoutNoticeOut data) {
- if (Constant.YN_Y.equals(data.getTag())) {
+ if (null == data.getUpdateBy()) {
+ data.setUpdateBy(ContextUtil.getLoginUserName());
+ data.setUpdateTime(new Date());
data.setCreateBy(ContextUtil.getLoginUserName());
data.setCreateTime(new Date());
data.setAuditStatus(Constant.COMPLETE_STATUS_NONE);
data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+ noticeOutMapper.insert(data);
+ } else {
+ data.setUpdateBy(ContextUtil.getLoginUserName());
+ data.setUpdateTime(new Date());
+ noticeOutMapper.updateById(data);
}
- data.setUpdateBy(ContextUtil.getLoginUserName());
- data.setUpdateTime(new Date());
- noticeOutRepository.save(data);
return null;
}
/**
- * JPA - 鍒犻櫎鏁版嵁
+ * 鍒犻櫎鏁版嵁
*
* @param data
* @return
*/
public String delDataOut(InoutNoticeOut data) {
- noticeOutRepository.delete(data);
+ noticeOutMapper.deleteById(data);
return null;
}
/**
- * JPA - 鏍规嵁ID鑾峰彇閫氱煡鍗曚俊鎭�
+ * 鏍规嵁ID鑾峰彇閫氱煡鍗曚俊鎭�
* @param id
* @param type
* @return
@@ -198,10 +285,10 @@
}
NoticeDto noticeDto = new NoticeDto();
if (Constant.TYPE_IN.equals(type)) {
- InoutNoticeIn noticeIn = noticeInRepository.getDataById(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), id);
+ InoutNoticeIn noticeIn = this.getNoticeInOne(id);
BeanUtils.copyProperties(noticeIn, noticeDto);
} else {
- InoutNoticeOut noticeOut = noticeOutRepository.getDataById(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), id);
+ InoutNoticeOut noticeOut = this.getNoticeOutOne(id);
BeanUtils.copyProperties(noticeOut, noticeDto);
}
return noticeDto;
@@ -240,6 +327,7 @@
* @return
*/
public String reSumNoticeInComplete(NoticeParam param) {
+ //TODO 寰呭疄鐜帮紝鍚庣画鏍规嵁闇�姹傝繘琛屽疄鐜�
if (StringUtils.isEmpty(param.getCustomerName())) {
return "瀹㈡埛缂栫爜涓虹┖锛�";
}
@@ -252,7 +340,6 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(ContextUtil.subDeptId(null));
}
- noticeMapper.reSumNoticeInComplete(param);
return null;
}
@@ -272,7 +359,7 @@
for (InoutNoticeOut noticeOut : noticeOutList) {
param = new NoticeParam(noticeOut.getCompanyId(), noticeOut.getDeptId(), noticeOut.getDepotId(),
- noticeOut.getCustomerId(), noticeOut.getFoodVariety(), noticeOut.getId());
+ noticeOut.getCustomerName(), noticeOut.getFoodVariety(), noticeOut.getId());
log.info("寮�濮嬫洿鏂板嚭搴撻�氱煡鍗�={}", param.toString());
@@ -289,6 +376,7 @@
* @return
*/
public String reSumNoticeOutComplete(NoticeParam param) {
+ //TODO 寰呭疄鐜帮紝鍚庣画鏍规嵁闇�姹傝繘琛屽疄鐜�
if (StringUtils.isEmpty(param.getCustomerName())) {
return "瀹㈡埛缂栫爜涓虹┖锛�";
}
@@ -304,9 +392,7 @@
if (StringUtils.isEmpty(param.getDeptId())) {
param.setDeptId(ContextUtil.subDeptId(null));
}
- noticeMapper.reSumNoticeOutComplete(param);
return null;
}
-
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index 5f8af8a..63df160 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -4,10 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
-}</ClientEvent>
- <Property name="creationType">com.fzzy.igds.models.InoutNoticeOut</Property>
+ <Property name="creationType">com.fzzy.igds.domain.InoutNoticeOut</Property>
<PropertyDef name="id">
<Property></Property>
<Property name="label">閫氱煡鍗曞彿</Property>
@@ -19,37 +16,37 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">deptId</Property>
- <Property name="valueProperty">deptName</Property>
- </Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <PropertyDef name="planId">
- <Property></Property>
- <Property name="label">鎵�灞炶鍒�</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <PropertyDef name="planName">
- <Property></Property>
- <Property name="label">鎵�灞炶鍒�</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <PropertyDef name="contractId">
- <Property></Property>
- <Property name="label">鎵�灞炲悎鍚�</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <PropertyDef name="contractName">
- <Property></Property>
- <Property name="label">鎵�灞炲悎鍚�</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
- <Property name="label">閫氱煡鍗曞悕绉�</Property>
+ <Property name="label">鍗曟嵁鍚嶇О</Property>
<Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">鍗曟嵁绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">搴撳尯閫氱煡鍗�</Property>
+ <Property name="code">10</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">鐩戠閫氱煡鍗�</Property>
+ <Property name="code">20</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="contract">
+ <Property></Property>
+ <Property name="label">鍏宠仈鍚堝悓</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
@@ -59,11 +56,6 @@
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="customerId">
- <Property></Property>
- <Property name="label">鏀惰揣瀹㈡埛</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="customerName">
@@ -76,9 +68,9 @@
<Property name="label">鍙戣揣鍗曚綅</Property>
<Property name="required">false</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">deptId</Property>
- <Property name="valueProperty">deptName</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
@@ -93,27 +85,50 @@
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
- <Property name="label">绮骞翠唤</Property>
- <Property name="required">true</Property>
+ <Property name="label">骞翠唤</Property>
</PropertyDef>
<PropertyDef name="targetNumber">
<Property name="dataType">double</Property>
- <Property name="displayFormat">#,## kG</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
<Property name="required">true</Property>
<Property name="label">璁″垝鏁伴噺</Property>
</PropertyDef>
<PropertyDef name="completeNumber">
<Property name="dataType">double</Property>
<Property name="label">瀹屾垚鏁伴噺</Property>
- <Property name="displayFormat">#,## kG</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
</PropertyDef>
<PropertyDef name="auditStatus">
<Property></Property>
<Property name="label">瀹℃牳鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">鐩戠瀹℃牳</Property>
+ <Property name="code">10</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">閾惰瀹℃牳</Property>
+ <Property name="code">20</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">宸插鏍�</Property>
+ <Property name="code">30</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="auditUser">
<Property></Property>
<Property name="label">瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditDate">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">瀹℃壒鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="completeStatus">
<Property></Property>
@@ -135,339 +150,33 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="createTime">
- <Property name="dataType">DateTime</Property>
- <Property name="label">鍒涘缓鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="createUser">
- <Property></Property>
- <Property name="label">鍒涘缓浜�</Property>
- </PropertyDef>
<PropertyDef name="completeTime">
- <Property name="dataType">DateTime</Property>
+ <Property name="dataType">Date</Property>
<Property name="label">瀹屾垚鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞淇℃伅</Property>
</PropertyDef>
- <PropertyDef name="tag">
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒跺崟鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
<Property></Property>
- <Property name="label">鏍囪</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtQuery">
- <PropertyDef name="id">
- <Property></Property>
- <Property name="label">閫氱煡鍗曞彿</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鍙戣揣鍗曚綅</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">deptId</Property>
- <Property name="valueProperty">deptName</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">绮鍝佺</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="year">
- <Property></Property>
- <Property name="label">骞翠唤</Property>
- </PropertyDef>
- <PropertyDef name="completeStatus">
- <Property></Property>
- <Property name="label">瀹屾垚鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="name">鏈畬鎴�</Property>
- <Property name="code">NONE</Property>
- </Entity>
- <Entity>
- <Property name="name">宸插畬鎴�</Property>
- <Property name="code">COMPLETE</Property>
- </Entity>
- </Collection>
- </Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">鍑哄簱浠撳簱</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="required">true</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtQueryTitle">
- <PropertyDef name="title">
- <Property name="label">title</Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtPlan">
- <Property name="creationType">com.fzzy.igds.models.InoutPlanDetail</Property>
- <PropertyDef name="id">
- <Property></Property>
- <Property name="label">璁″垝鏄庣粏鍙�</Property>
- </PropertyDef>
- <PropertyDef name="planId">
- <Property name="label">璁″垝缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">绮鍝佺</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="foodType">
- <Property></Property>
- <Property name="label">绮鎬ц川</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("FOOD_TYPE_")}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="foodLevel">
- <Property></Property>
- <Property name="label">绮绛夌骇</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerFoodLevel").getResult()}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="year">
- <Property></Property>
- <Property name="label">鏀惰幏骞村害</Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">浠撳簱</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="planNum">
- <Property name="dataType">Double</Property>
- <Property name="label">璁″垝鏁伴噺</Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property name="label">璁″垝绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerPlanType").getResult()}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</Property>
- </Property>
+ <Property name="label">鍒跺崟浜�</Property>
</PropertyDef>
<PropertyDef name="updateTime">
- <Property></Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
- </DataType>
- <DataType name="dtContract">
- <Property name="creationType">com.fzzy.igds.models.InoutContract</Property>
- <PropertyDef name="id">
+ <PropertyDef name="updateBy">
<Property></Property>
- <Property name="label">ID_</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
- <Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鎵�灞炲簱鍖�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">deptId</Property>
- <Property name="valueProperty">deptName</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="planId">
- <Property></Property>
- <Property name="label">鎵�灞炶鍒�</Property>
- </PropertyDef>
- <PropertyDef name="planName">
- <Property></Property>
- <Property name="label">鎵�灞炶鍒�</Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property></Property>
- <Property name="label">鍚堝悓绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerContractType").getResult()}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="name">
- <Property></Property>
- <Property name="label">鍚堝悓鍚嶇О</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="year">
- <Property></Property>
- <Property name="label">骞翠唤</Property>
- </PropertyDef>
- <PropertyDef name="customerId">
- <Property></Property>
- <Property name="label">瀹㈡埛缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="customerName">
- <Property></Property>
- <Property name="label">瀹㈡埛鍚嶇О</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="customerType">
- <Property></Property>
- <Property name="label">瀹㈡埛绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="code">1</Property>
- <Property name="name">1-浼佷笟</Property>
- </Entity>
- <Entity>
- <Property name="code">2</Property>
- <Property name="name">2-涓汉</Property>
- </Entity>
- </Collection>
- </Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="customerBank">
- <Property></Property>
- <Property name="label">瀹㈡埛寮�鎴疯</Property>
- </PropertyDef>
- <PropertyDef name="customerBankAccount">
- <Property></Property>
- <Property name="label">瀹㈡埛寮�鎴疯璐﹀彿</Property>
- </PropertyDef>
- <PropertyDef name="customerSignUser">
- <Property></Property>
- <Property name="label">瀹㈡埛绛剧害浜�</Property>
- </PropertyDef>
- <PropertyDef name="bank">
- <Property></Property>
- <Property name="label">鏈柟寮�鎴疯</Property>
- </PropertyDef>
- <PropertyDef name="bankAccount">
- <Property></Property>
- <Property name="label">鏈柟寮�鎴疯璐﹀彿</Property>
- </PropertyDef>
- <PropertyDef name="signUser">
- <Property></Property>
- <Property name="label">鏈柟绛剧害浜�</Property>
- </PropertyDef>
- <PropertyDef name="signAddress">
- <Property></Property>
- <Property name="label">绛剧害鍦板潃</Property>
- </PropertyDef>
- <PropertyDef name="price">
- <Property name="dataType">Double</Property>
- <Property name="label">鍗曚环</Property>
- <Property name="displayFormat">#,###0.000 鍏�/鍏枻</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="money">
- <Property name="dataType">Double</Property>
- <Property name="label">鎬婚噾棰�</Property>
- <Property name="displayFormat">#,###0.000 鍏�</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="contactAmount">
- <Property name="dataType">Double</Property>
- <Property name="label">鍚堝悓鏁伴噺</Property>
- <Property name="displayFormat">#,##0.00 KG</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="completeNum">
- <Property name="dataType">Double</Property>
- <Property name="label">鍚堝悓瀹屾垚鏁伴噺</Property>
- <Property name="displayFormat">#,##0.00 KG</Property>
- </PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">绮鍝佺</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</Property>
- </Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="foodType">
- <Property></Property>
- <Property name="label">绮鎬ц川</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("FOOD_TYPE_")}</Property>
- <Property name="keyProperty">dictValue</Property>
- <Property name="valueProperty">dictLabel</Property>
- </Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="payType">
- <Property></Property>
- <Property name="label">鏀粯鏂瑰紡</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("PAY_TYPE")}</Property>
- <Property name="valueProperty">dictLabel</Property>
- <Property name="keyProperty">dictValue</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="createUser">
- <Property></Property>
- <Property name="label">鍒涘缓浜�</Property>
- </PropertyDef>
- <PropertyDef name="createTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍒涘缓鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="signingTime">
- <Property name="dataType">Date</Property>
- <Property name="label">绛捐鏃堕棿</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="beginTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鏈夋晥寮�濮嬫椂闂�</Property>
- </PropertyDef>
- <PropertyDef name="endTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鏈夋晥鎴鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="remark">
- <Property></Property>
- <Property name="label">澶囨敞璇存槑</Property>
+ <Property name="label">鏇存柊浜�</Property>
</PropertyDef>
</DataType>
</Model>
- <View layout="padding:5;regionPadding:5">
+ <View layout="padding:10">
<ClientEvent name="onReady">var deptId = window.parent.deptId;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
var TYPE = "NOTICE_OUT";
query = function(){
@@ -475,29 +184,14 @@
};
query();

-queryTitle = function(){
- view.get("#dsQueryTitle").set("parameter",{type:TYPE,deptId:deptId}).flushAsync();
-};
-queryTitle();
- 
//鏂板
add = function(){
- view.get("#ajaxInitAdd").set("parameter", TYPE).execute(function(data){
+ view.get("#ajaxInitAdd").execute(function(data){
view.get("#dsMain").insert(data);
view.get("#dialogMain").show();
});
};
-
-//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀瓑绾э紝浜у湴鏂�
-autoByDepot = function(depotId){
- view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
- if(result){
- var data = view.get("#dataGridMain.currentEntity");
- data.set("foodVariety",result.foodVariety);
- 
- }
- });
-};</ClientEvent>
+
</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
@@ -505,40 +199,38 @@
<Property name="pageSize">15</Property>
<Property name="loadMode">lazy</Property>
</DataSet>
- <DataSet id="dsQueryTitle">
- <Property name="dataType">dtQueryTitle</Property>
- <Property name="dataProvider">inoutNoticePR#getTitle</Property>
- <Property name="loadMode">manual</Property>
- </DataSet>
<DataSet id="dsQuery">
- <Property name="dataType">dtQuery</Property>
+ <Property name="dataType">dtNoticeParam</Property>
<Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
<Property name="loadMode">manual</Property>
</DataSet>
- <AutoForm layoutConstraint="top">
- <Property name="cols">*,*,*,*</Property>
- <Property name="dataSet">dsQuery</Property>
- <Property name="exClassName">bg-color</Property>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Property name="editable">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">year</Property>
- <Property name="property">year</Property>
- <Property name="trigger">defaultYearDropDown</Property>
- <Property name="editable">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeStatus</Property>
- <Property name="property">completeStatus</Property>
- <Property name="editable">false</Property>
- <Editor/>
- </AutoFormElement>
- <Container layout="hbox regionPadding:15">
+ <Container>
+ <Property name="className">c-param</Property>
+ <AutoForm>
+ <Property name="cols">*,*,*,*,90,90</Property>
+ <Property name="dataSet">dsQuery</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">customerName</Property>
+ <Property name="property">customerName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">completeStatus</Property>
+ <Property name="property">completeStatus</Property>
+ <Editor/>
+ </AutoFormElement>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsQuery.data");
if(data){
@@ -546,106 +238,81 @@
}else{
view.get("#dsMain").flushAsync();
}</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="exClassName">btn1</Property>
+ <Property name="caption">鎼滅储</Property>
<Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-q1</Property>
</Button>
<Button>
<ClientEvent name="onClick">view.get("#dsQuery").flushAsync();</ClientEvent>
- <Property name="exClassName">btn2</Property>
- <Property name="iconClass">fa fa-refresh</Property>
<Property name="caption">閲嶇疆</Property>
+ <Property name="exClassName">btn-q2</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
</Button>
- </Container>
- <Container layout="regionPadding:10" layoutConstraint="type:top;colSpan:2">
- <Property name="exClassName">bg-color</Property>
- <Property name="contentOverflow">hidden</Property>
- <Property name="height">55</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">add();
- //view.get("#dsMain").insert({
- // name:"鍑哄簱閫氱煡鍗�"
- // });
- // view.get("#dialogMain").show();</ClientEvent>
+ </AutoForm>
+ </Container>
+ <Container>
+ <Property name="className">c-data</Property>
+ <ToolBar>
+ <ToolBarButton layoutConstraint="left">
+ <ClientEvent name="onClick">add();
</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn1</Property>
+ <Property name="width">100</Property>
<Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button layoutConstraint="left">
+ </ToolBarButton>
+ <ToolBarButton layoutConstraint="left">
<ClientEvent name="onClick">
-var select = view.get("#dataGridMain").get("selection");
-if(select){
- view.get("#dialogMain").show();
-}else{
- $notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑鏁版嵁鈥︹��");
-}</ClientEvent>
- <Property name="caption">缂栬緫</Property>
+ var select = view.get("#dataGridMain").get("selection");
+ if(select){
+ view.get("#dialogMain").show();
+ }else{
+ $notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑鏁版嵁鈥︹��");
+ }</ClientEvent>
+ <Property name="caption">淇敼</Property>
<Property name="exClassName">btn2</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- </Button>
- <Button layoutConstraint="left">
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-pencil-square-o</Property>
+ </ToolBarButton>
+ <ToolBarButton layoutConstraint="left">
<ClientEvent name="onClick">
-var select = view.get("#dataGridMain").get("selection");
-if(select){
- view.get("#ajaxDel").set("parameter",select).execute(function(result){
- select.remove();
- });
-}else{
- $notify("璇烽�夋嫨闇�瑕佸垹闄ょ殑浠撳簱鈥︹��");
-}
- </ClientEvent>
+ var select = view.get("#dataGridMain").get("selection");
+ if(select){
+ view.get("#ajaxDel").set("parameter",select).execute(function(result){
+ select.remove();
+ });
+ }else{
+ $notify("璇烽�夋嫨闇�瑕佸垹闄ょ殑浠撳簱鈥︹��");
+ }
+ </ClientEvent>
<Property name="caption">鍒犻櫎</Property>
<Property name="exClassName">btn3</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
-var page = view.get("#dsMain");
-var param = {
- "pageSize":page.get("pageSize"),
- "pageNo":page.get("pageNo"),
- "foodVariety":data.get("foodVariety"),
- "year":data.get("year"),
- "completeStatus":data.get("completeStatus")
-}
-console.log(param);
-window.parent.$.table.exportExcelDorado("./export/noticeOut-excel", "鍑哄簱閫氱煡鍗曟暟鎹�", param);</ClientEvent>
- <Property name="caption">瀵煎嚭EXCEL</Property>
- <Property name="exClassName">btn4</Property>
- <Property name="iconClass">fa fa-file-excel-o</Property>
- <Property name="action">exportExcel</Property>
- </Button>
- <Button layoutConstraint="left">
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </ToolBarButton>
+ <ToolBarButton layoutConstraint="left">
<ClientEvent name="onClick">view.get("#recalculate").execute(function(result){
- if(result == 'success'){
- $notify("鏁版嵁鏇存柊瀹屾垚锛侊紒");
- 
- var data = view.get("#dsQuery.data");
- view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
- }else{
- $notify("鏁版嵁鏇存柊澶辫触锛侊紒");
- }
-});</ClientEvent>
+ if(result == 'success'){
+ $notify("鏁版嵁鏇存柊瀹屾垚锛侊紒");
+ 
+ var data = view.get("#dsQuery.data");
+ view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
+ }else{
+ $notify("鏁版嵁鏇存柊澶辫触锛侊紒");
+ }
+ });</ClientEvent>
<Property name="caption">瀹炴椂鏍哥畻</Property>
- <Property name="exClassName">btn2</Property>
+ <Property name="exClassName">btn4</Property>
<Property name="iconClass">fa fa-refresh</Property>
+ <Property name="width">100</Property>
<Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
- </Button>
- </Container>
- </AutoForm>
- <Container layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <DataGrid id="dataGridMain" layoutConstraint="center">
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
- if(data){
- view.get("#dialogMain").show();
- }</ClientEvent>
+ </ToolBarButton>
+ </ToolBar>
+ <DataGrid id="dataGridMain" layoutConstraint="padding:8">
+ <ClientEvent name="onDataRowDoubleClick">view.get("#dataGridMain").set("selection",arg.data);</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<Property name="selectionMode">singleRow</Property>
+ <Property name="readOnly">true</Property>
<RowSelectorColumn/>
<RowNumColumn>
<Property name="width">50</Property>
@@ -661,16 +328,14 @@
<Property name="align">center</Property>
<Property name="width">120</Property>
</DataColumn>
- <DataColumn>
+ <DataColumn name="customerName">
<Property name="property">customerName</Property>
- <Property name="name">customerName</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn>
+ <DataColumn name="depotId">
<Property name="property">depotId</Property>
- <Property name="name">depotId</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
+ <Property name="width">150</Property>
</DataColumn>
<DataColumn name="foodVariety">
<Property name="property">foodVariety</Property>
@@ -681,12 +346,6 @@
<Property name="property">targetNumber</Property>
<Property name="name">targetNumber</Property>
<Property name="align">center</Property>
- <Property name="width">200</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">completeNumber</Property>
- <Property name="align">center</Property>
- <Property name="name">completeNumber</Property>
<Property name="width">200</Property>
</DataColumn>
<DataColumn>
@@ -701,28 +360,35 @@
<Property name="name">createTime</Property>
<Property name="width">200</Property>
</DataColumn>
+ <DataColumn>
+ <Property name="property">updateBy</Property>
+ <Property name="align">center</Property>
+ <Property name="name">updateBy</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ <Property name="name">updateTime</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
</DataGrid>
- </Container>
- <Container layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot layoutConstraint="right">
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </ToolBar>
</Container>
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
- <Property name="caption">鍑哄簱鍗�</Property>
- <Property name="width">60%</Property>
+ <Property name="caption">鍑哄簱閫氱煡鍗�</Property>
+ <Property name="width">1200</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
<Button id="btnOk">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
- if(data.validate() != 'ok'){
- $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
- return;
- }
- view.get("#ajaxSave").set("parameter",data).execute(function(result){
+ <ClientEvent name="onClick">view.get("#updateSave").execute(function(result){
if(result){
$alert(result);
return;
@@ -730,146 +396,175 @@
$notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
self.get("parent").hide();
});</ClientEvent>
- <Property name="caption">纭畾</Property>
- <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
<Property name="exClassName">btn1</Property>
+ <Property name="width">120</Property>
</Button>
<Button>
<ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
self.get("parent").hide();</ClientEvent>
<Property name="caption">鍙栨秷</Property>
- <Property name="iconClass">fa fa-times</Property>
<Property name="exClassName">btn3</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ <Property name="width">120</Property>
</Button>
</Buttons>
<Children>
<Container>
- <AutoForm id="autoForm1" layoutConstraint="top padding:10">
- <Property name="cols">*,*,*,*,*,*,*</Property>
- <Property name="dataSet">dsQueryTitle</Property>
- <Property name="labelAlign">right</Property>
+ <AutoForm layoutConstraint="top ">
+ <Property name="dataSet">dsMain</Property>
<Property name="showHint">false</Property>
- <AutoFormElement layoutConstraint="colSpan:7">
- <Property name="name">title</Property>
- <Property name="property">title</Property>
- <Property name="showLabel">false</Property>
+ <Property name="cols">210,*,210</Property>
+ <Control/>
+ <AutoFormElement>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
<Property name="editorType">Label</Property>
- <Property name="style">
- <Property name="font">bold 30px Georgia, serif;</Property>
- <Property name="text-align">center</Property>
- </Property>
+ <Property name="showLabel">false</Property>
+ <Property name="showHint">false</Property>
+ <Property name="className">f-title</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Property name="editorType">Label</Property>
+ <Property name="showHint">false</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
- <Container layout="padding:15">
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">110</Property>
- <AutoFormElement>
- <Property name="name">name</Property>
- <Property name="property">name</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
- <Property name="trigger">ddCustomer</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">unitName</Property>
- <Property name="property">unitName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">year</Property>
- <Property name="property">year</Property>
- <Property name="trigger">defaultYearDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:1"/>
- <AutoFormElement>
- <Property name="name">targetNumber</Property>
- <Property name="property">targetNumber</Property>
- <Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeNumber</Property>
- <Property name="property">completeNumber</Property>
- <Property name="readOnly">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">planName</Property>
- <Property name="property">planName</Property>
- <Property name="trigger">ddPlan</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:1">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">娉細褰撳墠閫氱煡鍗曞叧鑱旂殑搴撳尯璁″垝</Property>
- </Label>
- <AutoFormElement>
- <Property name="name">contractName</Property>
- <Property name="property">contractName</Property>
- <Property name="trigger">ddContract</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:1">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">娉細褰撳墠閫氱煡鍗曞叧鑱旂殑閿�鍞悎鍚�</Property>
- </Label>
- <AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">completeStatus</Property>
- <Property name="property">completeStatus</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Container>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</Property>
+ <Property name="editorType">RadioGroup</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">year</Property>
+ <Property name="property">year</Property>
+ <Property name="trigger">defaultYearDropDown</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">customerName</Property>
+ <Property name="property">customerName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">unitName</Property>
+ <Property name="property">unitName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">targetNumber</Property>
+ <Property name="property">targetNumber</Property>
+ <Property name="readOnly">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">completeNumber</Property>
+ <Property name="property">completeNumber</Property>
+ <Property name="readOnly">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">completeStatus</Property>
+ <Property name="property">completeStatus</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</Property>
+ <Property name="readOnly">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createBy</Property>
+ <Property name="property">createBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditStatus</Property>
+ <Property name="property">auditStatus</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">contract</Property>
+ <Property name="property">contract</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ <Property name="text">娉細鐩戠閫氱煡鍗曪紝鍙～鍐欒川鎶煎悎鍚屽悕绉�</Property>
+ </Label>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditUser</Property>
+ <Property name="property">auditUser</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">auditDate</Property>
+ <Property name="property">auditDate</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <HtmlContainer layoutConstraint="colSpan:3">
+ <Property name="content">1.鍑哄簱閫氱煡鍗曚綔涓哄嚭搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
+ 2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��</Property>
+ <Property name="exClassName">h-tip</Property>
+ <Property name="contentOverflow">hidden</Property>
+ </HtmlContainer>
+ </AutoForm>
</Container>
</Children>
<Tools/>
</Dialog>
- <AjaxAction id="ajaxGetDepot">
- <Property name="service">depotPR#getDepot</Property>
- </AjaxAction>
- <AjaxAction id="ajaxSave">
- <Property name="service">inoutNoticePR#saveOut</Property>
- </AjaxAction>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">inoutNoticePR#saveOut</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="service">inoutNoticePR#delDataOut</Property>
<Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
@@ -877,240 +572,8 @@
<AjaxAction id="ajaxInitAdd">
<Property name="service">inoutNoticePR#initAddOut</Property>
</AjaxAction>
- <CustomDropDown id="ddCustomer">
- <Property name="minHeight">400</Property>
- <Property name="assignmentMap">customerId=id,customerName=name</Property>
- <Property name="minWidth">500</Property>
- <Property name="autoOpen">true</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsCustomer">
- <Property name="dataProvider">inoutCustomerPR#queryListByKey</Property>
- <Property name="dataType">[dtInoutCustomer]</Property>
- <Property name="parameter">
- <Entity>
- <Property name="type">OUT</Property>
- </Entity>
- </Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key.value");
-var type = "${request.getParameter('type')}";
-view.get("#dsCustomer").set("parameter",{key:key,type:type}).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsCustomer.data:#");
-if(data){
- view.get("#ddCustomer").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
- </Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsCustomer.data:#");
-if(data){
- view.get("#ddCustomer").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsCustomer</Property>
- <Property name="readOnly">true</Property>
- <DataColumn name="id">
- <Property name="property">id</Property>
- <Property name="width">100</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="name">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">name</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- </CustomDropDown>
<AjaxAction id="recalculate">
<Property name="service">inoutNoticePR#updateSumNoticeOut</Property>
</AjaxAction>
- <CustomDropDown id="ddPlan">
- <Property name="minHeight">325</Property>
- <Property name="assignmentMap">planId=id,planName=planId</Property>
- <Property name="minWidth">900</Property>
- <Property name="autoOpen">false</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsPlan">
- <Property name="dataProvider">planManagePR#pagePlanDetail</Property>
- <Property name="dataType">[dtPlan]</Property>
- <Property name="parameter"></Property>
- <Property name="pageSize">5</Property>
- </DataSet>
- <AutoForm layoutConstraint="top">
- <Property name="cols">*,*,*</Property>
- <Property name="dataSet">dsQuery</Property>
- <Property name="exClassName">bg-color</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">:</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Property name="editable">false</Property>
- <Property name="label">璁″垝浠撳簱</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">year</Property>
- <Property name="property">year</Property>
- <Property name="trigger">defaultYearDropDown</Property>
- <Property name="editable">false</Property>
- <Property name="label">鏀惰幏骞翠唤</Property>
- <Editor/>
- </AutoFormElement>
- <Container layout="hbox regionPadding:15">
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsQuery.data");
-if(data){
- view.get("#dsPlan").set("parameter",data.toJSON()).flushAsync();
-}else{
- view.get("#dsPlan").flushAsync();
-}
-</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsPlan.data:#");
-if(data){
- view.get("#ddPlan").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
- </Container>
- </AutoForm>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsPlan.data:#");
-if(data){
- view.get("#ddPlan").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsPlan</Property>
- <Property name="readOnly">true</Property>
- <DataColumn>
- <Property name="property">planId</Property>
- <Property name="width">100</Property>
- <Property name="align">center</Property>
- <Property name="name">planId</Property>
- <Property name="visible">false</Property>
- </DataColumn>
- <DataColumn name="depotId">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">depotId</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">year</Property>
- <Property name="width">200</Property>
- <Property name="align">center</Property>
- <Property name="name">year</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">planNum</Property>
- <Property name="width">80</Property>
- <Property name="align">center</Property>
- <Property name="name">planNum</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">foodVariety</Property>
- <Property name="width">80</Property>
- <Property name="align">center</Property>
- <Property name="name">foodVariety</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">type</Property>
- <Property name="align">center</Property>
- <Property name="name">type</Property>
- </DataColumn>
- </DataGrid>
- <DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsPlan</Property>
- </DataPilot>
- </Container>
- </CustomDropDown>
- <CustomDropDown id="ddContract">
- <Property name="minHeight">317</Property>
- <Property name="assignmentMap">contractId=id,contractName=name</Property>
- <Property name="minWidth">550</Property>
- <Property name="autoOpen">false</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsContract">
- <Property name="dataProvider">contractManagePR#pageContract</Property>
- <Property name="dataType">[dtContract]</Property>
- <Property name="parameter"></Property>
- <Property name="pageSize">5</Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key3">
- <Property name="blankText"> -- 鍚堝悓鍚嶇О鎴栬�呮墍灞炶鍒� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key3.value");
-view.get("#dsContract").set("parameter",{key:key}).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsContract.data:#");
-if(data){
- view.get("#ddContract").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
- </Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsContract.data:#");
-if(data){
- view.get("#ddContract").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsContract</Property>
- <Property name="readOnly">true</Property>
- <DataColumn>
- <Property name="property">id</Property>
- <Property name="width">100</Property>
- <Property name="align">center</Property>
- <Property name="name">id</Property>
- <Property name="visible">false</Property>
- </DataColumn>
- <DataColumn name="name">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">name</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">planName</Property>
- <Property name="align">center</Property>
- <Property name="name">planName</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">year</Property>
- <Property name="width">80</Property>
- <Property name="align">center</Property>
- <Property name="name">year</Property>
- </DataColumn>
- </DataGrid>
- <DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsContract</Property>
- </DataPilot>
- </Container>
- </CustomDropDown>
</View>
</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
index 35a3da4..2091463 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
@@ -5,76 +5,28 @@
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.fzzy.igds.constant.Constant;
-import com.fzzy.igds.data.NoticeDto;
import com.fzzy.igds.data.NoticeParam;
import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
-import com.fzzy.igds.service.SysDeptService;
import com.fzzy.igds.utils.ContextUtil;
-import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import java.util.*;
/**
* @Description 閫氱煡鍗曠鐞�
* @Author CZT
- * @Date 2024/12/16 10:10
+ * @Date 2025/11/29 16:42
*/
@Component
public class InoutNoticePR {
@Resource
private InoutNoticeService inoutNoticeService;
- @Resource
- private SysDeptService sysDeptService;
-
-/* *//**
- * inoutNoticePR#getTitle 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
- *
- * @param
- * @return
- *//*
- @DataProvider
- public Map<String, Object> getTitle(Map<String, Object> param) {
- Map<String, Object> result = new HashMap<String, Object>();
- //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
- String type = (String)param.get("type");
-
- //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
- if ("NOTICE_IN".equals(type)) {
- result.put("title", "鍏ュ簱閫氱煡鍗�");
- if (StringUtils.isNotEmpty(deptName)) {
- result.put("title", deptName + "鍏ュ簱閫氱煡鍗�");
- }
- }
- if ("NOTICE_OUT".equals(type)) {
- result.put("title", "鍑哄簱閫氱煡鍗�");
- if (StringUtils.isNotEmpty(deptName)) {
- result.put("title", deptName + "鍑哄簱閫氱煡鍗�");
- }
- }
- return result;
- }*/
/**
* inoutNoticePR#getYearQuery 榛樿骞翠唤
@@ -92,47 +44,6 @@
result.put("deptId", deptId);
return result;
}
-
- /**
- * inoutNoticePR#queryNoticeByKey 鏍规嵁鍙傛暟鏌ヨ鍑哄叆搴撻�氱煡鍗曪紝鐢ㄤ簬鎵嬪姩琛ュ崟鏃讹紝閫夋嫨閫氱煡鍗�
- *
- * @param
- * @return
- */
- @DataProvider
- public List<NoticeDto> queryNoticeByKey(Map<String, Object> param) {
- if (param == null) {
- return null;
- }
- String type = (String) param.get("type");
- if (StringUtils.isEmpty(type)) {
- return null;
- }
- List<NoticeDto> list = new ArrayList<>();
- NoticeDto dto;
- if (Constant.TYPE_IN.equals(type)) {
- List<InoutNoticeIn> listIn = this.queryNoticeIn(param);
- if (null != listIn && listIn.size() > 0) {
- for (InoutNoticeIn inoutNoticeIn : listIn) {
- dto = new NoticeDto();
- BeanUtils.copyProperties(inoutNoticeIn, dto);
- list.add(dto);
- }
- }
- }
- if (Constant.TYPE_OUT.equals(type)) {
- List<InoutNoticeOut> listOut = this.queryNoticeOut(param);
- if (null != listOut && listOut.size() > 0) {
- for (InoutNoticeOut inoutNoticeOut : listOut) {
- dto = new NoticeDto();
- BeanUtils.copyProperties(inoutNoticeOut, dto);
- list.add(dto);
- }
- }
- }
- return list;
- }
-
/*==================== 鍏ュ簱閫氱煡鍗曠浉鍏充笟鍔� ====================*/
@@ -193,61 +104,6 @@
}
/**
- * 鏍规嵁涓嶅悓鏉′欢鏌ヨ
- * @param param
- * @return
- */
- public List<InoutNoticeIn> queryNoticeIn(Map<String, Object> param) {
- if (null == param) {
- param = new HashMap<>();
- }
- Map<String, Object> finalParam = param;
-
- //澶氬弬鏁板垎椤垫煡璇�
- Pageable pageable = PageRequest.of(0, 10000, Sort.Direction.ASC, InoutNoticeIn.SORT_PROP);
- Specification<InoutNoticeIn> specification = new Specification<InoutNoticeIn>() {
- private static final long serialVersionUID = 1L;
-
- public Predicate toPredicate(Root<InoutNoticeIn> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
- List<Predicate> predicates = new ArrayList<Predicate>(); //鎵�鏈夌殑鏂█
-
- Predicate predicate1 = cb.equal(root.get("companyId"), ContextUtil.getCompanyId());
- predicates.add(predicate1);
- Predicate predicate2 = cb.equal(root.get("deptId"), ContextUtil.subDeptId(null));
- predicates.add(predicate2);
- Predicate predicate3 = cb.equal(root.get("completeStatus"), "NONE");
- predicates.add(predicate3);
-
- String key = (String) finalParam.get("customerId");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate4 = cb.equal(root.get("customerId"), key);
- predicates.add(predicate4);
- }
- key = (String) finalParam.get("foodVariety");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate5 = cb.equal(root.get("foodVariety"), key);
- predicates.add(predicate5);
- }
- key = (String) finalParam.get("depotId");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate6 = cb.equal(root.get("depotId"), key);
- predicates.add(predicate6);
- }
- key = (String) finalParam.get("key");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate7 = cb.like(root.get("name"), "%" + key + "%");
- predicates.add(predicate7);
- }
- return cb.and(predicates.toArray(new Predicate[0]));
- }
- };
- //org.springframework.data.domain.Page<InoutNoticeIn> japPage = inoutNoticeService.queryAllNoticeIn(specification, pageable);
-
- //return japPage.getContent();
- return null;
- }
-
- /**
* 閲嶆柊鏍哥畻鍏ュ簱閫氱煡鍗曞畬鎴愰噺
*
* inoutNoticePR#updateSumNoticeIn
@@ -259,7 +115,6 @@
//鑾峰彇鎵�鏈夋湭瀹屾垚鐘舵�佺殑鍏ュ簱閫氱煡鍗�
String companyId = ContextUtil.getCompanyId();
- String deptId = ContextUtil.subDeptId(null);
List<InoutNoticeIn> noticeInList = inoutNoticeService.getUnComNoticeIn(companyId);
@@ -267,8 +122,6 @@
inoutNoticeService.updateSumNoticeIn(noticeInList);
return "success";
}
-
-
return "fail";
}
@@ -283,11 +136,13 @@
public InoutNoticeOut initAddOut() {
SysUser user = ContextUtil.getLoginUser();
InoutNoticeOut data = new InoutNoticeOut();
- data.setId("CKTZD_" + ContextUtil.generateId());
+ data.setId(ContextUtil.generateOrderId("CK"));
data.setName("鍑哄簱閫氱煡鍗�");
data.setCompanyId(user.getCompanyId());
data.setDeptId(ContextUtil.subDeptId(user));
- data.setTag(Constant.YN_Y);
+ data.setYear(DateFormatUtils.format(new Date(), "yyyy"));
+ data.setCreateBy(ContextUtil.getLoginUserName());
+ data.setCreateTime(new Date());
return data;
}
@@ -297,57 +152,15 @@
* @param param
*/
@DataProvider
- public void pageQueryOut(Page<InoutNoticeOut> page, Map<String, Object> param) {
+ public void pageQueryOut(Page<InoutNoticeOut> page, NoticeParam param) {
- if (null == param) {
- param = new HashMap<>();
- }
- Map<String, Object> finalParam = param;
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutNoticeOut> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
- //澶氬弬鏁板垎椤垫煡璇�
- Pageable pageable = PageRequest.of(0, 10000, Sort.Direction.ASC, InoutNoticeOut.SORT_PROP);
- Specification<InoutNoticeOut> specification = new Specification<InoutNoticeOut>() {
- private static final long serialVersionUID = 1L;
+ inoutNoticeService.pageQueryOut(corePage, param);
- public Predicate toPredicate(Root<InoutNoticeOut> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
- List<Predicate> predicates = new ArrayList<Predicate>(); //鎵�鏈夌殑鏂█
-
- Predicate predicate1 = cb.equal(root.get("companyId"), ContextUtil.getCompanyId());
- predicates.add(predicate1);
- Predicate predicate2 = cb.equal(root.get("deptId"), ContextUtil.subDeptId(null));
- predicates.add(predicate2);
-
- String key = String.valueOf(finalParam.get("year"));
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate3 = cb.equal(root.get("year"), key);
- predicates.add(predicate3);
- }
- key = (String) finalParam.get("id");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate4 = cb.equal(root.get("id"), key);
- predicates.add(predicate4);
- }
- key = (String) finalParam.get("customerId");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate5 = cb.equal(root.get("customerId"), key);
- predicates.add(predicate5);
- }
- key = (String) finalParam.get("completeStatus");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate6 = cb.equal(root.get("completeStatus"), key);
- predicates.add(predicate6);
- }
- key = (String) finalParam.get("foodVariety");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate7 = cb.equal(root.get("foodVariety"), key);
- predicates.add(predicate7);
- }
- return cb.and(predicates.toArray(new Predicate[0]));
- }
- };
- //org.springframework.data.domain.Page<InoutNoticeOut> japPage = inoutNoticeService.queryAllNoticeOut(specification, pageable);
- //page.setEntityCount((int) japPage.getTotalElements());
- //page.setEntities(japPage.getContent());
+ // 閲嶆柊灏佽
+ page.setEntities(corePage.getRecords());
+ page.setEntityCount(Integer.parseInt(String.valueOf(corePage.getTotal())));
}
/**
@@ -355,7 +168,7 @@
* @param data
* @return
*/
- @Expose
+ @DataResolver
public String saveOut(InoutNoticeOut data) {
InoutNoticeOut inoutNoticeOut = new InoutNoticeOut();
BeanUtils.copyProperties(data, inoutNoticeOut);
@@ -372,60 +185,6 @@
return inoutNoticeService.delDataOut(inoutNoticeOut);
}
- /**
- * 鏍规嵁涓嶅悓鏉′欢鏌ヨ
- * @param param
- * @return
- */
- public List<InoutNoticeOut> queryNoticeOut(Map<String, Object> param) {
- if (null == param) {
- param = new HashMap<>();
- }
- Map<String, Object> finalParam = param;
-
- //澶氬弬鏁板垎椤垫煡璇�
- Pageable pageable = PageRequest.of(0, 10000, Sort.Direction.ASC, InoutNoticeOut.SORT_PROP);
- Specification<InoutNoticeOut> specification = new Specification<InoutNoticeOut>() {
- private static final long serialVersionUID = 1L;
-
- public Predicate toPredicate(Root<InoutNoticeOut> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
- List<Predicate> predicates = new ArrayList<Predicate>(); //鎵�鏈夌殑鏂█
-
- Predicate predicate1 = cb.equal(root.get("companyId"), ContextUtil.getCompanyId());
- predicates.add(predicate1);
- Predicate predicate2 = cb.equal(root.get("deptId"), ContextUtil.subDeptId(null));
- predicates.add(predicate2);
- Predicate predicate3 = cb.equal(root.get("completeStatus"), "NONE");
- predicates.add(predicate3);
-
- String key = (String) finalParam.get("customerId");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate4 = cb.equal(root.get("customerId"), key);
- predicates.add(predicate4);
- }
- key = (String) finalParam.get("foodVariety");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate5 = cb.equal(root.get("foodVariety"), key);
- predicates.add(predicate5);
- }
- key = (String) finalParam.get("depotId");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate6 = cb.equal(root.get("depotId"), key);
- predicates.add(predicate6);
- }
- key = (String) finalParam.get("key");
- if (StringUtils.isNotEmpty(key)) {
- Predicate predicate7 = cb.like(root.get("name"), "%" + key + "%");
- predicates.add(predicate7);
- }
- return cb.and(predicates.toArray(new Predicate[0]));
- }
- };
- //org.springframework.data.domain.Page<InoutNoticeOut> japPage = inoutNoticeService.queryAllNoticeOut(specification, pageable);
-
- //return japPage.getContent();
- return null;
- }
/**
* 閲嶆柊鏍哥畻鍑哄簱閫氱煡鍗曞畬鎴愰噺
@@ -439,7 +198,6 @@
//鑾峰彇鎵�鏈夋湭瀹屾垚鐘舵�佺殑鍏ュ簱閫氱煡鍗�
String companyId = ContextUtil.getCompanyId();
- String deptId = ContextUtil.subDeptId(null);
List<InoutNoticeOut> noticeOutList = inoutNoticeService.getUnComNoticeOut(companyId);
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/inout-register.html b/fzzy-igdss-web/src/main/resources/templates/inout/inout-register.html
index 5eebf37..e479495 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/inout-register.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/inout-register.html
@@ -295,7 +295,7 @@
<h3>绉伴噸鏁版嵁<span id="text-param"></span></h3>
<div style="float: right;margin-top: -35px">
<button class="rkbk-quick-btn layui-btn" onclick="selectByHand()">
- <i><img th:src="@{/img/web/inout/icon-hyd.png}"/></i>閫夋嫨杞﹁締
+ <i><img th:src="@{/img/web/inout/icon-hyd.png}"/></i>閫夋嫨杞﹁締绉伴噸
</button>
<button class="rkbk-quick-btn layui-btn btn-blue" onclick="weight()">
<i><img th:src="@{/img/web/inout/icon-chengzhong.png}"/></i>姝ラ1锛氱О閲嶅強鎶撴媿
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/inout-weight.html b/fzzy-igdss-web/src/main/resources/templates/inout/inout-weight.html
index b7abdb7..30c2c38 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/inout-weight.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/inout-weight.html
@@ -174,7 +174,9 @@
<div class="qyzj-btnbox layui-clear">
<div class="rkbk-quick fl">
-
+ <button class="rkbk-quick-btn layui-btn" onclick="selectByHand()">
+ <i><img th:src="@{/img/web/inout/icon-hyd.png}"/></i>閫夋嫨杞﹁締绉伴噸
+ </button>
<button class="rkbk-quick-btn layui-btn btn-blue"
onclick="weight()">
<i><img th:src="@{/img/web/inout/icon-chengzhong.png}"/></i>姝ラ1锛氱О閲嶇‘璁ゅ強鎶撴媿
@@ -184,9 +186,6 @@
</button>
<button class="rkbk-quick-btn layui-btn btn-blue" onclick="printBill()">
<i><img th:src="@{/img/web/inout/icon-dayin.png}"/></i>姝ラ3锛氭墦鍗拌繃纾呭崟
- </button>
- <button class="rkbk-quick-btn layui-btn" onclick="showCheck()">
- <i><img th:src="@{/img/web/inout/icon-hyd.png}"/></i>璐ㄦ璇︾粏
</button>
<button class="rkbk-quick-btn layui-btn btn-violet" onclick="flushPage()">
<i><img th:src="@{/img/web/inout/icon-shuaxin2.png}"/></i>鍒锋柊椤甸潰
--
Gitblit v1.9.3