Skip to content

H
hp-smart
Commit 604a1bfb by YG8429
Options

Merge remote-tracking branch 'origin/dev' into dev

parents c17dbb72 7e9a44e4
Showing with 895 additions and 206 deletions
src/main/java/com/baosight/hpjx/hp/bg/domain/HPBG002.java
...@@ -37,6 +37,7 @@ public class HPBG002 extends DaoEPBase { ...@@ -37,6 +37,7 @@ public class HPBG002 extends DaoEPBase {
public static final String FIELD_WH_CODE = "whCode"; /* 仓库编码*/ public static final String FIELD_WH_CODE = "whCode"; /* 仓库编码*/
public static final String FIELD_WH_NAME = "whName"; /* 仓库名称*/ public static final String FIELD_WH_NAME = "whName"; /* 仓库名称*/
public static final String FIELD_DEPOSIT_USER = "depositUser"; /* 入库人员*/ public static final String FIELD_DEPOSIT_USER = "depositUser"; /* 入库人员*/
public static final String FIELD_STATUS = "status"; /* 审批状态0.未审核1.已审核*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码*/ public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码*/
...@@ -58,6 +59,7 @@ public class HPBG002 extends DaoEPBase { ...@@ -58,6 +59,7 @@ public class HPBG002 extends DaoEPBase {
public static final String COUNT = "HPBG002.count"; public static final String COUNT = "HPBG002.count";
public static final String INSERT = "HPBG002.insert"; public static final String INSERT = "HPBG002.insert";
public static final String UPDATE = "HPBG002.update"; public static final String UPDATE = "HPBG002.update";
public static final String UPDATE_BY_STATUS = "HPBG002.updateBystatus";
public static final String DELETE = "HPBG002.delete"; public static final String DELETE = "HPBG002.delete";
public static final String DELETE_FLAG = "HPBG002.deleteFlag"; public static final String DELETE_FLAG = "HPBG002.deleteFlag";
...@@ -76,6 +78,7 @@ public class HPBG002 extends DaoEPBase { ...@@ -76,6 +78,7 @@ public class HPBG002 extends DaoEPBase {
private String whCode = " "; /* 仓库编码*/ private String whCode = " "; /* 仓库编码*/
private String whName = " "; /* 仓库名称*/ private String whName = " "; /* 仓库名称*/
private String depositUser = " "; /* 入库人员*/ private String depositUser = " "; /* 入库人员*/
private Integer status = 2; /* 审批状态0.未审核1.已审核*/
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -144,6 +147,9 @@ public class HPBG002 extends DaoEPBase { ...@@ -144,6 +147,9 @@ public class HPBG002 extends DaoEPBase {
eiColumn.setDescName("入库人员"); eiColumn.setDescName("入库人员");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("审批状态0.未审核1.已审核");
eiMetadata.addMeta(eiColumn);
} }
...@@ -394,6 +400,15 @@ public class HPBG002 extends DaoEPBase { ...@@ -394,6 +400,15 @@ public class HPBG002 extends DaoEPBase {
public void setDepositUser(String depositUser) { public void setDepositUser(String depositUser) {
this.depositUser = depositUser; this.depositUser = depositUser;
} }
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -417,6 +432,7 @@ public class HPBG002 extends DaoEPBase { ...@@ -417,6 +432,7 @@ public class HPBG002 extends DaoEPBase {
setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode)); setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName)); setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
setDepositUser(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_USER)), depositUser)); setDepositUser(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEPOSIT_USER)), depositUser));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
} }
/** /**
...@@ -441,6 +457,7 @@ public class HPBG002 extends DaoEPBase { ...@@ -441,6 +457,7 @@ public class HPBG002 extends DaoEPBase {
map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE))); map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME))); map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME)));
map.put(FIELD_DEPOSIT_USER, StringUtils.toString(depositUser, eiMetadata.getMeta(FIELD_DEPOSIT_USER))); map.put(FIELD_DEPOSIT_USER, StringUtils.toString(depositUser, eiMetadata.getMeta(FIELD_DEPOSIT_USER)));
map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/bg/domain/HPBG003.java
...@@ -37,6 +37,7 @@ public class HPBG003 extends DaoEPBase { ...@@ -37,6 +37,7 @@ public class HPBG003 extends DaoEPBase {
public static final String FIELD_WH_CODE = "whCode"; /* 仓库编码*/ public static final String FIELD_WH_CODE = "whCode"; /* 仓库编码*/
public static final String FIELD_WH_NAME = "whName"; /* 仓库名称*/ public static final String FIELD_WH_NAME = "whName"; /* 仓库名称*/
public static final String FIELD_RECEIVE_USER = "receiveUser"; /* 领用人员*/ public static final String FIELD_RECEIVE_USER = "receiveUser"; /* 领用人员*/
public static final String FIELD_STATUS = "status"; /* 审批状态0.未审核1.已审核*/
public static final String COL_ID = "ID"; public static final String COL_ID = "ID";
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码*/ public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码*/
...@@ -77,6 +78,7 @@ public class HPBG003 extends DaoEPBase { ...@@ -77,6 +78,7 @@ public class HPBG003 extends DaoEPBase {
private String whCode = " "; /* 仓库编码*/ private String whCode = " "; /* 仓库编码*/
private String whName = " "; /* 仓库名称*/ private String whName = " "; /* 仓库名称*/
private String receiveUser = " "; /* 领用人员*/ private String receiveUser = " "; /* 领用人员*/
private Integer status = 2; /* 审批状态0.未审核1.已审核*/
/** /**
* initialize the metadata. * initialize the metadata.
...@@ -145,7 +147,9 @@ public class HPBG003 extends DaoEPBase { ...@@ -145,7 +147,9 @@ public class HPBG003 extends DaoEPBase {
eiColumn.setDescName("领用人员"); eiColumn.setDescName("领用人员");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("审批状态0.未审核1.已审核");
eiMetadata.addMeta(eiColumn);
} }
/** /**
...@@ -395,6 +399,15 @@ public class HPBG003 extends DaoEPBase { ...@@ -395,6 +399,15 @@ public class HPBG003 extends DaoEPBase {
public void setReceiveUser(String receiveUser) { public void setReceiveUser(String receiveUser) {
this.receiveUser = receiveUser; this.receiveUser = receiveUser;
} }
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
/** /**
* get the value from Map. * get the value from Map.
* *
...@@ -418,6 +431,7 @@ public class HPBG003 extends DaoEPBase { ...@@ -418,6 +431,7 @@ public class HPBG003 extends DaoEPBase {
setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode)); setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName)); setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
setReceiveUser(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIVE_USER)), receiveUser)); setReceiveUser(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIVE_USER)), receiveUser));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get("status")), status));
} }
/** /**
...@@ -442,6 +456,7 @@ public class HPBG003 extends DaoEPBase { ...@@ -442,6 +456,7 @@ public class HPBG003 extends DaoEPBase {
map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE))); map.put(FIELD_WH_CODE, StringUtils.toString(whCode, eiMetadata.getMeta(FIELD_WH_CODE)));
map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME))); map.put(FIELD_WH_NAME, StringUtils.toString(whName, eiMetadata.getMeta(FIELD_WH_NAME)));
map.put(FIELD_RECEIVE_USER, StringUtils.toString(receiveUser, eiMetadata.getMeta(FIELD_RECEIVE_USER))); map.put(FIELD_RECEIVE_USER, StringUtils.toString(receiveUser, eiMetadata.getMeta(FIELD_RECEIVE_USER)));
map.put("status", StringUtils.toString(status, eiMetadata.getMeta("status")));
return map; return map;
} }
......
src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG001.java
...@@ -14,6 +14,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -14,6 +14,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator; import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -56,6 +57,7 @@ public class ServiceHPBG001 extends ServiceEPBase { ...@@ -56,6 +57,7 @@ public class ServiceHPBG001 extends ServiceEPBase {
try { try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据 // 写入数据
List<HPBG001> hpbg001List = new ArrayList<>();
for (Map resultRow : resultRows) { for (Map resultRow : resultRows) {
HPBG001 hpbg001 = new HPBG001(); HPBG001 hpbg001 = new HPBG001();
hpbg001.fromMap(resultRow); hpbg001.fromMap(resultRow);
...@@ -64,7 +66,9 @@ public class ServiceHPBG001 extends ServiceEPBase { ...@@ -64,7 +66,9 @@ public class ServiceHPBG001 extends ServiceEPBase {
} else { } else {
this.modify(hpbg001); this.modify(hpbg001);
} }
hpbg001List.add(hpbg001);
} }
inInfo.getBlock(EiConstant.resultBlock).setRows(hpbg001List);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!"); inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) { } catch (Exception e) {
......
src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002.java
...@@ -5,8 +5,10 @@ import com.baosight.hpjx.common.DdynamicEnum; ...@@ -5,8 +5,10 @@ import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.common.ReviewStatusEnum;
import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.bg.domain.HPBG001;
import com.baosight.hpjx.hp.bg.domain.HPBG002; import com.baosight.hpjx.hp.bg.domain.HPBG002;
import com.baosight.hpjx.hp.bg.domain.HPBG002A; import com.baosight.hpjx.hp.bg.domain.HPBG002A;
import com.baosight.hpjx.hp.bg.domain.HPBG003A;
import com.baosight.hpjx.hp.bg.tools.HPBGTools; import com.baosight.hpjx.hp.bg.tools.HPBGTools;
import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.util.*; import com.baosight.hpjx.util.*;
...@@ -16,9 +18,8 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -16,9 +18,8 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator; import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.util.Arrays; import java.math.BigDecimal;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -56,15 +57,8 @@ public class ServiceHPBG002 extends ServiceEPBase { ...@@ -56,15 +57,8 @@ public class ServiceHPBG002 extends ServiceEPBase {
List<Long> ids = ObjectUtils.listEpKey(resultRows, HPBG002.FIELD_ID); List<Long> ids = ObjectUtils.listEpKey(resultRows, HPBG002.FIELD_ID);
List<HPBG002A> hpbg002AList = HPBGTools.HpBg002a.getByParentId(ids); List<HPBG002A> hpbg002AList = HPBGTools.HpBg002a.getByParentId(ids);
for (HPBG002 hpbg002: resultRows) { for (HPBG002 hpbg002: resultRows) {
hpbg002.setDeleteFlag(CommonConstant.YesNo.YES_1);
if (hpbg002.getId() == null || hpbg002.getId() == 0) {
continue;
}
List<HPBG002A> hpbg002As = hpbg002AList.stream().filter(hpbg002a1 -> hpbg002a1.getParentId().equals(hpbg002.getId())
&& hpbg002a1.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode())).collect(Collectors.toList());
AssertUtils.isTrue(hpbg002As.size()>0, "数据已提交，无法删除！");
DaoUtils.update(HPBG002.DELETE, hpbg002); DaoUtils.update(HPBG002.DELETE, hpbg002);
hpbg002As = hpbg002AList.stream().filter(hpbg002a1 -> hpbg002a1.getParentId().equals(hpbg002.getId())).collect(Collectors.toList()); List<HPBG002A> hpbg002As = hpbg002AList.stream().filter(hpbg002a1 -> hpbg002a1.getParentId().equals(hpbg002.getId())).collect(Collectors.toList());
hpbg002As.forEach(hpbg002a -> DaoUtils.update(HPBG002A.DELETE, hpbg002a)); hpbg002As.forEach(hpbg002a -> DaoUtils.update(HPBG002A.DELETE, hpbg002a));
} }
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
...@@ -88,6 +82,7 @@ public class ServiceHPBG002 extends ServiceEPBase { ...@@ -88,6 +82,7 @@ public class ServiceHPBG002 extends ServiceEPBase {
} }
List<Map> detailRows = inInfo.getBlock(CommonConstant.Field.DETAIL).getRows(); List<Map> detailRows = inInfo.getBlock(CommonConstant.Field.DETAIL).getRows();
List<HPBG002A> hpbg002aList = new ArrayList<>();
// 写入数据 // 写入数据
for (Map detailRow : detailRows) { for (Map detailRow : detailRows) {
HPBG002A hpbg002a = new HPBG002A(); HPBG002A hpbg002a = new HPBG002A();
...@@ -98,7 +93,10 @@ public class ServiceHPBG002 extends ServiceEPBase { ...@@ -98,7 +93,10 @@ public class ServiceHPBG002 extends ServiceEPBase {
} else { } else {
DaoUtils.update(HPBG002A.UPDATE, hpbg002a); DaoUtils.update(HPBG002A.UPDATE, hpbg002a);
} }
hpbg002aList.add(hpbg002a);
} }
inInfo.getBlock(EiConstant.resultBlock).setRows(Collections.singletonList(hpbg002));
inInfo.getBlock(CommonConstant.Field.DETAIL).setRows(hpbg002aList);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + detailRows.size() + "]条数据保存成功!"); inInfo.setMsg("操作成功！本次对[" + detailRows.size() + "]条数据保存成功!");
} catch (Exception e) { } catch (Exception e) {
...@@ -121,4 +119,38 @@ public class ServiceHPBG002 extends ServiceEPBase { ...@@ -121,4 +119,38 @@ public class ServiceHPBG002 extends ServiceEPBase {
public void modify(HPBG002 hpbg002) { public void modify(HPBG002 hpbg002) {
DaoUtils.update(HPBG002.UPDATE, hpbg002); DaoUtils.update(HPBG002.UPDATE, hpbg002);
} }
@OperationLogAnnotation(operModul = "办公用品入库",operType = "提交",operDesc = "提交操作")
public EiInfo submit(EiInfo inInfo) {
try {
List<HPBG002> resultRows = MapUtils.toDaoEPBases(inInfo,HPBG002.class);
List<Long> ids = ObjectUtils.listEpKey(resultRows, HPBG002.FIELD_ID);
List<HPBG002A> hpbg002As = HPBGTools.HpBg002a.getByParentId(ids);
List<String> itemCodes = ObjectUtils.listEpKey(hpbg002As, HPBG002A.FIELD_ITEM_CODE);
List<HPBG001> hpbg001s = HPBGTools.HpBg001.getByItemCode(itemCodes);
// 写入数据
for (HPBG002 hpbg002 : resultRows) {
AssertUtils.isTrue(hpbg002.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode()), "数据已提交，无法重复提交！");
List<HPBG002A> hpbg002aList = hpbg002As.stream().filter(hpbg002A -> hpbg002A.getParentId().equals(hpbg002.getId())).collect(Collectors.toList());
AssertUtils.isEmpty(hpbg002aList, "请先添加办公用品入库明细");
hpbg002aList.forEach(hpbg002A -> {
Map<String,HPBG001> hpbg001Map = hpbg001s.stream().filter(item -> item.getItemCode().equals(hpbg002A.getItemCode())).collect(Collectors.toMap(HPBG001::getItemCode, item -> item));
if (!hpbg001Map.isEmpty()){
HPBG001 hpbg001 = hpbg001Map.get(hpbg002A.getItemCode());
BigDecimal invQty = hpbg001.getInvQty().add(hpbg002A.getInvQty());
hpbg001.setInvQty(invQty.compareTo(BigDecimal.ZERO) < 0?BigDecimal.ZERO:invQty);
DaoUtils.update(HPBG001.UPDATE, hpbg001);
}
});
hpbg002.setStatus(ReviewStatusEnum.SUBMITTED.getCode());
DaoUtils.update(HPBG002.UPDATE_BY_STATUS, hpbg002);
}
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "保存失败");
}
return inInfo;
}
} }
src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002A.java
...@@ -6,6 +6,7 @@ import com.baosight.hpjx.common.ReviewStatusEnum; ...@@ -6,6 +6,7 @@ import com.baosight.hpjx.common.ReviewStatusEnum;
import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.bg.domain.HPBG001; import com.baosight.hpjx.hp.bg.domain.HPBG001;
import com.baosight.hpjx.hp.bg.domain.HPBG002;
import com.baosight.hpjx.hp.bg.domain.HPBG002A; import com.baosight.hpjx.hp.bg.domain.HPBG002A;
import com.baosight.hpjx.hp.bg.domain.HPBG004; import com.baosight.hpjx.hp.bg.domain.HPBG004;
import com.baosight.hpjx.hp.bg.tools.HPBGTools; import com.baosight.hpjx.hp.bg.tools.HPBGTools;
...@@ -19,6 +20,7 @@ import java.math.BigDecimal; ...@@ -19,6 +20,7 @@ import java.math.BigDecimal;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -53,19 +55,18 @@ public class ServiceHPBG002A extends ServiceEPBase { ...@@ -53,19 +55,18 @@ public class ServiceHPBG002A extends ServiceEPBase {
@Override @Override
public EiInfo delete(EiInfo inInfo) { public EiInfo delete(EiInfo inInfo) {
try { try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<HPBG002A> resultRows = MapUtils.toDaoEPBases(inInfo,HPBG002A.class);
for (Map resultRow: resultRows) { List<String> ids = ObjectUtils.listEpKey(resultRows, HPBG002A.FIELD_PARENT_ID);
HPBG002A hpbg002a = new HPBG002A(); if (Objects.nonNull(ids)) {
hpbg002a.fromMap(resultRow); HPBG002 hgbg002 = HPBGTools.HpBg002.get(resultRows.get(0).getParentId());
hpbg002a.setDeleteFlag(CommonConstant.YesNo.YES_1); AssertUtils.isTrue(hgbg002.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode()), "数据已提交，无法删除！");
if (hpbg002a.getId() == null || hpbg002a.getId() == 0) {
continue;
} }
AssertUtils.isTrue(hpbg002a.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode()), "数据已提交，无法删除！");
DaoUtils.update(HPBG002A.DELETE, hpbg002a); for (HPBG002A hpbg002A: resultRows) {
DaoUtils.update(HPBG002A.DELETE, hpbg002A);
} }
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!"); inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
}catch (Exception e){ }catch (Exception e){
LogUtils.setDetailMsg(inInfo, e, "删除失败"); LogUtils.setDetailMsg(inInfo, e, "删除失败");
} }
......
src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG002C.java
...@@ -43,7 +43,7 @@ public class ServiceHPBG002C extends ServiceEPBase { ...@@ -43,7 +43,7 @@ public class ServiceHPBG002C extends ServiceEPBase {
), null, false); ), null, false);
Long id = Long.parseLong(params.get(HPBG002.FIELD_ID)); Long id = Long.parseLong(params.get(HPBG002.FIELD_ID));
HPBG002 hpbg002 = HPBGTools.HpBg002.get(id); HPBG002 hpbg002 = HPBGTools.HpBg002.get(id);
List<HPBG002A> hpbg002As = HPBGTools.HpBg002a.getByParentId(id,ReviewStatusEnum.UNSUBMITTED.getCode()); List<HPBG002A> hpbg002As = HPBGTools.HpBg002a.getByParentId(id);
EiBlock resultBlock =new EiBlock(EiConstant.resultBlock); EiBlock resultBlock =new EiBlock(EiConstant.resultBlock);
resultBlock.setBlockMeta(new HPBG002().eiMetadata); resultBlock.setBlockMeta(new HPBG002().eiMetadata);
resultBlock.setRows(Collections.singletonList(hpbg002)); resultBlock.setRows(Collections.singletonList(hpbg002));
...@@ -61,7 +61,8 @@ public class ServiceHPBG002C extends ServiceEPBase { ...@@ -61,7 +61,8 @@ public class ServiceHPBG002C extends ServiceEPBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPBG002A.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPBG002A.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPBG002A.FIELD_STATUS, ReviewStatusEnum.UNSUBMITTED.getCode()); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPBG002A.FIELD_PARENT_ID,
inInfo.getCellStr(EiConstant.resultBlock, ACConstants.ROW_CODE_0, HPBG002A.FIELD_ID));
return super.query(inInfo, HPBG002A.QUERY,new HPBG002A(),false,new EiBlockMeta(),EiConstant.queryBlock,CommonConstant.Field.DETAIL,CommonConstant.Field.DETAIL); return super.query(inInfo, HPBG002A.QUERY,new HPBG002A(),false,new EiBlockMeta(),EiConstant.queryBlock,CommonConstant.Field.DETAIL,CommonConstant.Field.DETAIL);
} }
...@@ -73,11 +74,6 @@ public class ServiceHPBG002C extends ServiceEPBase { ...@@ -73,11 +74,6 @@ public class ServiceHPBG002C extends ServiceEPBase {
for (Map resultRow: resultRows) { for (Map resultRow: resultRows) {
HPBG002A hpbg002a = new HPBG002A(); HPBG002A hpbg002a = new HPBG002A();
hpbg002a.fromMap(resultRow); hpbg002a.fromMap(resultRow);
hpbg002a.setDeleteFlag(CommonConstant.YesNo.YES_1);
if (hpbg002a.getId() == null || hpbg002a.getId() == 0) {
continue;
}
AssertUtils.isTrue(hpbg002a.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode()), "数据已提交，无法删除！");
DaoUtils.update(HPBG002A.DELETE, hpbg002a); DaoUtils.update(HPBG002A.DELETE, hpbg002a);
} }
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
......
src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003.java
...@@ -5,10 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; ...@@ -5,10 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.common.ReviewStatusEnum;
import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.bg.domain.HPBG002; import com.baosight.hpjx.hp.bg.domain.*;
import com.baosight.hpjx.hp.bg.domain.HPBG002A;
import com.baosight.hpjx.hp.bg.domain.HPBG003;
import com.baosight.hpjx.hp.bg.domain.HPBG003A;
import com.baosight.hpjx.hp.bg.tools.HPBGTools; import com.baosight.hpjx.hp.bg.tools.HPBGTools;
import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.util.*; import com.baosight.hpjx.util.*;
...@@ -18,9 +15,8 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -18,9 +15,8 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator; import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.util.Arrays; import java.math.BigDecimal;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -90,6 +86,7 @@ public class ServiceHPBG003 extends ServiceEPBase { ...@@ -90,6 +86,7 @@ public class ServiceHPBG003 extends ServiceEPBase {
} }
List<Map> detailRows = inInfo.getBlock(CommonConstant.Field.DETAIL).getRows(); List<Map> detailRows = inInfo.getBlock(CommonConstant.Field.DETAIL).getRows();
List<HPBG003A> hpbg003AList = new ArrayList<>();
// 写入数据 // 写入数据
for (Map detailRow : detailRows) { for (Map detailRow : detailRows) {
HPBG003A hpbg003a = new HPBG003A(); HPBG003A hpbg003a = new HPBG003A();
...@@ -100,7 +97,10 @@ public class ServiceHPBG003 extends ServiceEPBase { ...@@ -100,7 +97,10 @@ public class ServiceHPBG003 extends ServiceEPBase {
} else { } else {
DaoUtils.update(HPBG003A.UPDATE, hpbg003a); DaoUtils.update(HPBG003A.UPDATE, hpbg003a);
} }
hpbg003AList.add(hpbg003a);
} }
inInfo.getBlock(EiConstant.resultBlock).setRows(Collections.singletonList(hpbg003));
inInfo.getBlock(CommonConstant.Field.DETAIL).setRows(hpbg003AList);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + detailRows.size() + "]条数据保存成功!"); inInfo.setMsg("操作成功！本次对[" + detailRows.size() + "]条数据保存成功!");
} catch (Exception e) { } catch (Exception e) {
...@@ -123,4 +123,38 @@ public class ServiceHPBG003 extends ServiceEPBase { ...@@ -123,4 +123,38 @@ public class ServiceHPBG003 extends ServiceEPBase {
public void modify(HPBG003 hpbg003) { public void modify(HPBG003 hpbg003) {
DaoUtils.update(HPBG003.UPDATE, hpbg003); DaoUtils.update(HPBG003.UPDATE, hpbg003);
} }
@OperationLogAnnotation(operModul = "办公用品入库",operType = "提交",operDesc = "提交操作")
public EiInfo submit(EiInfo inInfo) {
try {
List<HPBG003> resultRows = MapUtils.toDaoEPBases(inInfo,HPBG003.class);
List<Long> ids = ObjectUtils.listEpKey(resultRows, HPBG003.FIELD_ID);
List<HPBG003A> hpbg003As = HPBGTools.HpBg003a.getByParentId(ids);
List<String> itemCodes = ObjectUtils.listEpKey(hpbg003As, HPBG003A.FIELD_ITEM_CODE);
List<HPBG001> hpbg001s = HPBGTools.HpBg001.getByItemCode(itemCodes);
// 写入数据
for (HPBG003 hpbg003 : resultRows) {
AssertUtils.isTrue(hpbg003.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode()), "数据已提交，无法重复提交！");
List<HPBG003A> hpbg003aList = hpbg003As.stream().filter(hpbg002A -> hpbg002A.getParentId().equals(hpbg003.getId())).collect(Collectors.toList());
AssertUtils.isEmpty(hpbg003aList, "请先添加办公用品入库明细");
hpbg003aList.forEach(hpbg003A -> {
Map<String,HPBG001> hpbg001Map = hpbg001s.stream().filter(item -> item.getItemCode().equals(hpbg003A.getItemCode())).collect(Collectors.toMap(HPBG001::getItemCode, item -> item));
if (!hpbg001Map.isEmpty()){
HPBG001 hpbg001 = hpbg001Map.get(hpbg003A.getItemCode());
BigDecimal invQty = hpbg001.getInvQty().subtract(hpbg003A.getReceiveQty());
hpbg001.setInvQty(invQty.compareTo(BigDecimal.ZERO) < 0?BigDecimal.ZERO:invQty);
DaoUtils.update(HPBG001.UPDATE, hpbg001);
}
});
hpbg003.setStatus(ReviewStatusEnum.SUBMITTED.getCode());
DaoUtils.update(HPBG003.UPDATE_BY_STATUS, hpbg003);
}
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "保存失败");
}
return inInfo;
}
} }
src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003A.java
...@@ -17,6 +17,7 @@ import java.math.BigDecimal; ...@@ -17,6 +17,7 @@ import java.math.BigDecimal;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -50,16 +51,14 @@ public class ServiceHPBG003A extends ServiceEPBase { ...@@ -50,16 +51,14 @@ public class ServiceHPBG003A extends ServiceEPBase {
@Override @Override
public EiInfo delete(EiInfo inInfo) { public EiInfo delete(EiInfo inInfo) {
try { try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<HPBG003A> resultRows = MapUtils.toDaoEPBases(inInfo,HPBG003A.class);
for (Map resultRow: resultRows) { List<Long> ids = ObjectUtils.listEpKey(resultRows, HPBG003A.FIELD_PARENT_ID);
HPBG003A hpbg003a = new HPBG003A(); if (Objects.nonNull(ids)) {
hpbg003a.fromMap(resultRow); HPBG003 hgbg003 = HPBGTools.HpBg003.get(resultRows.get(0).getParentId());
hpbg003a.setDeleteFlag(CommonConstant.YesNo.YES_1); AssertUtils.isTrue(hgbg003.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode()), "数据已提交，无法删除！");
if (hpbg003a.getId() == null || hpbg003a.getId() == 0) {
continue;
} }
AssertUtils.isTrue(hpbg003a.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode()), "数据已提交，无法删除！"); for (HPBG003A hpbg003A: resultRows) {
DaoUtils.update(HPBG003A.DELETE, hpbg003a); DaoUtils.update(HPBG003A.DELETE, hpbg003A);
} }
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!"); inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
......
src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG003C.java
...@@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum; ...@@ -5,6 +5,7 @@ import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.ReviewStatusEnum; import com.baosight.hpjx.common.ReviewStatusEnum;
import com.baosight.hpjx.core.constant.CommonConstant; import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.bg.domain.HPBG002A;
import com.baosight.hpjx.hp.bg.domain.HPBG003; import com.baosight.hpjx.hp.bg.domain.HPBG003;
import com.baosight.hpjx.hp.bg.domain.HPBG003A; import com.baosight.hpjx.hp.bg.domain.HPBG003A;
import com.baosight.hpjx.hp.bg.tools.HPBGTools; import com.baosight.hpjx.hp.bg.tools.HPBGTools;
...@@ -42,7 +43,7 @@ public class ServiceHPBG003C extends ServiceEPBase { ...@@ -42,7 +43,7 @@ public class ServiceHPBG003C extends ServiceEPBase {
), null, false); ), null, false);
Long id = Long.parseLong(params.get(HPBG003.FIELD_ID)); Long id = Long.parseLong(params.get(HPBG003.FIELD_ID));
HPBG003 hpbg003 = HPBGTools.HpBg003.get(id); HPBG003 hpbg003 = HPBGTools.HpBg003.get(id);
List<HPBG003A> hpbg003As = HPBGTools.HpBg003a.getByParentId(id, ReviewStatusEnum.UNSUBMITTED.getCode()); List<HPBG003A> hpbg003As = HPBGTools.HpBg003a.getByParentId(id);
EiBlock resultBlock =new EiBlock(EiConstant.resultBlock); EiBlock resultBlock =new EiBlock(EiConstant.resultBlock);
resultBlock.setBlockMeta(new HPBG003().eiMetadata); resultBlock.setBlockMeta(new HPBG003().eiMetadata);
resultBlock.setRows(Collections.singletonList(hpbg003)); resultBlock.setRows(Collections.singletonList(hpbg003));
...@@ -60,7 +61,8 @@ public class ServiceHPBG003C extends ServiceEPBase { ...@@ -60,7 +61,8 @@ public class ServiceHPBG003C extends ServiceEPBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPBG003A.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPBG003A.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPBG003A.FIELD_STATUS, ReviewStatusEnum.UNSUBMITTED.getCode()); inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPBG002A.FIELD_PARENT_ID,
inInfo.getCellStr(EiConstant.resultBlock, ACConstants.ROW_CODE_0, HPBG002A.FIELD_ID));
return super.query(inInfo, HPBG003A.QUERY,new HPBG003A(),false,new EiBlockMeta(),EiConstant.queryBlock,CommonConstant.Field.DETAIL,CommonConstant.Field.DETAIL); return super.query(inInfo, HPBG003A.QUERY,new HPBG003A(),false,new EiBlockMeta(),EiConstant.queryBlock,CommonConstant.Field.DETAIL,CommonConstant.Field.DETAIL);
} }
...@@ -72,11 +74,6 @@ public class ServiceHPBG003C extends ServiceEPBase { ...@@ -72,11 +74,6 @@ public class ServiceHPBG003C extends ServiceEPBase {
for (Map resultRow: resultRows) { for (Map resultRow: resultRows) {
HPBG003A hpbg003a = new HPBG003A(); HPBG003A hpbg003a = new HPBG003A();
hpbg003a.fromMap(resultRow); hpbg003a.fromMap(resultRow);
hpbg003a.setDeleteFlag(CommonConstant.YesNo.YES_1);
if (hpbg003a.getId() == null || hpbg003a.getId() == 0) {
continue;
}
AssertUtils.isTrue(hpbg003a.getStatus().equals(ReviewStatusEnum.SUBMITTED.getCode()), "数据已提交，无法删除！");
DaoUtils.update(HPBG003A.DELETE, hpbg003a); DaoUtils.update(HPBG003A.DELETE, hpbg003a);
} }
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
......
src/main/java/com/baosight/hpjx/hp/bg/service/ServiceHPBG004.java
...@@ -16,6 +16,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -16,6 +16,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase; import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -60,6 +61,7 @@ public class ServiceHPBG004 extends ServiceEPBase { ...@@ -60,6 +61,7 @@ public class ServiceHPBG004 extends ServiceEPBase {
try { try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据 // 写入数据
List<HPBG004> hpbg004s = new ArrayList<>();
for (Map resultRow : resultRows) { for (Map resultRow : resultRows) {
HPBG004 hpbg004 = new HPBG004(); HPBG004 hpbg004 = new HPBG004();
hpbg004.fromMap(resultRow); hpbg004.fromMap(resultRow);
...@@ -68,7 +70,9 @@ public class ServiceHPBG004 extends ServiceEPBase { ...@@ -68,7 +70,9 @@ public class ServiceHPBG004 extends ServiceEPBase {
} else { } else {
this.modify(hpbg004); this.modify(hpbg004);
} }
hpbg004s.add(hpbg004);
} }
inInfo.getBlock(EiConstant.resultBlock).setRows(hpbg004s);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!"); inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) { } catch (Exception e) {
......
src/main/java/com/baosight/hpjx/hp/bg/sql/HPBG001.xml
...@@ -230,6 +230,9 @@ ...@@ -230,6 +230,9 @@
) )
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#, VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
#whCode#, #whName#, #itemType#, #itemCode#, #itemName#, #itemModel#, #itemUnit#, #invQty#) #whCode#, #whName#, #itemType#, #itemCode#, #itemName#, #itemModel#, #itemUnit#, #invQty#)
<selectKey resultClass="java.lang.Long" keyProperty="id" >
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPBG001
</selectKey>
</insert> </insert>
<delete id="delete"> <delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/bg/sql/HPBG002.xml
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
DELETE_FLAG = #deleteFlag# DELETE_FLAG = #deleteFlag#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="depositDate"> <isNotEmpty prepend=" AND " property="depositDate">
DEPOSIT_DATE = #depositDate# DEPOSIT_DATE = REPLACE(#depositDate#, '-', '')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="depositCode"> <isNotEmpty prepend=" AND " property="depositCode">
DEPOSIT_CODE = #depositCode# DEPOSIT_CODE = #depositCode#
...@@ -68,6 +68,9 @@ ...@@ -68,6 +68,9 @@
<isNotEmpty prepend=" AND " property="depositUser"> <isNotEmpty prepend=" AND " property="depositUser">
DEPOSIT_USER = #depositUser# DEPOSIT_USER = #depositUser#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="status">
STATUS = #status#
</isNotEmpty>
</sql> </sql>
<select id="query" parameterClass="java.util.HashMap" <select id="query" parameterClass="java.util.HashMap"
...@@ -87,7 +90,8 @@ ...@@ -87,7 +90,8 @@
DEPOSIT_CODE as "depositCode", <!-- 入库单号 --> DEPOSIT_CODE as "depositCode", <!-- 入库单号 -->
WH_CODE as "whCode", <!-- 仓库编码 --> WH_CODE as "whCode", <!-- 仓库编码 -->
WH_NAME as "whName", <!-- 仓库名称 --> WH_NAME as "whName", <!-- 仓库名称 -->
DEPOSIT_USER as "depositUser" <!-- 入库人员 --> DEPOSIT_USER as "depositUser", <!-- 入库人员 -->
STATUS as "status"
FROM ${hpjxSchema}.T_HPBG002 WHERE 1=1 FROM ${hpjxSchema}.T_HPBG002 WHERE 1=1
<include refid="condition" /> <include refid="condition" />
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
...@@ -166,10 +170,11 @@ ...@@ -166,10 +170,11 @@
DEPOSIT_CODE, <!-- 入库单号 --> DEPOSIT_CODE, <!-- 入库单号 -->
WH_CODE, <!-- 仓库编码 --> WH_CODE, <!-- 仓库编码 -->
WH_NAME, <!-- 仓库名称 --> WH_NAME, <!-- 仓库名称 -->
DEPOSIT_USER <!-- 入库人员 --> DEPOSIT_USER, <!-- 入库人员 -->
STATUS
) )
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#, VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
#depositDate#, #depositCode#, #whCode#, #whName#, #depositUser#) #depositDate#, #depositCode#, #whCode#, #whName#, #depositUser#,#status#)
<selectKey resultClass="java.lang.Long" keyProperty="id" > <selectKey resultClass="java.lang.Long" keyProperty="id" >
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPBG002 SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPBG002
</selectKey> </selectKey>
...@@ -202,7 +207,19 @@ ...@@ -202,7 +207,19 @@
DEPOSIT_CODE = #depositCode#, <!-- 入库单号 --> DEPOSIT_CODE = #depositCode#, <!-- 入库单号 -->
WH_CODE = #whCode#, <!-- 仓库编码 --> WH_CODE = #whCode#, <!-- 仓库编码 -->
WH_NAME = #whName#, <!-- 仓库名称 --> WH_NAME = #whName#, <!-- 仓库名称 -->
DEPOSIT_USER = #depositUser# <!-- 入库人员 --> DEPOSIT_USER = #depositUser#, <!-- 入库人员 -->
STATUS = #status#
WHERE
ID = #id#
</update>
<update id="updateBystatus">
UPDATE ${hpjxSchema}.T_HPBG002
SET
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
STATUS = #status# <!-- 审批状态0.未审核1.已审核 -->
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/bg/sql/HPBG002A.xml
...@@ -200,6 +200,9 @@ ...@@ -200,6 +200,9 @@
) )
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#, VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
#itemType#, #itemCode#, #itemName#, #itemModel#, #itemUnit#, #invQty#, #status#, #parentId#) #itemType#, #itemCode#, #itemName#, #itemModel#, #itemUnit#, #invQty#, #status#, #parentId#)
<selectKey resultClass="java.lang.Long" keyProperty="id" >
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPBG002A
</selectKey>
</insert> </insert>
<delete id="delete"> <delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/bg/sql/HPBG003.xml
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
DELETE_FLAG = #deleteFlag# DELETE_FLAG = #deleteFlag#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="receiveDate"> <isNotEmpty prepend=" AND " property="receiveDate">
RECEIVE_DATE = #receiveDate# RECEIVE_DATE = REPLACE(#receiveDate#, '-', '')
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="receiveCode"> <isNotEmpty prepend=" AND " property="receiveCode">
RECEIVE_CODE = #receiveCode# RECEIVE_CODE = #receiveCode#
...@@ -68,6 +68,9 @@ ...@@ -68,6 +68,9 @@
<isNotEmpty prepend=" AND " property="receiveUser"> <isNotEmpty prepend=" AND " property="receiveUser">
RECEIVE_USER = #receiveUser# RECEIVE_USER = #receiveUser#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="status">
STATUS = #status#
</isNotEmpty>
</sql> </sql>
<select id="query" parameterClass="java.util.HashMap" <select id="query" parameterClass="java.util.HashMap"
...@@ -87,7 +90,8 @@ ...@@ -87,7 +90,8 @@
RECEIVE_CODE as "receiveCode", <!-- 领用单号 --> RECEIVE_CODE as "receiveCode", <!-- 领用单号 -->
WH_CODE as "whCode", <!-- 仓库编码 --> WH_CODE as "whCode", <!-- 仓库编码 -->
WH_NAME as "whName", <!-- 仓库名称 --> WH_NAME as "whName", <!-- 仓库名称 -->
RECEIVE_USER as "receiveUser" <!-- 领用人员 --> RECEIVE_USER as "receiveUser", <!-- 领用人员 -->
STATUS as "status"
FROM ${hpjxSchema}.T_HPBG003 WHERE 1=1 FROM ${hpjxSchema}.T_HPBG003 WHERE 1=1
<include refid="condition" /> <include refid="condition" />
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
...@@ -166,10 +170,11 @@ ...@@ -166,10 +170,11 @@
RECEIVE_CODE, <!-- 领用单号 --> RECEIVE_CODE, <!-- 领用单号 -->
WH_CODE, <!-- 仓库编码 --> WH_CODE, <!-- 仓库编码 -->
WH_NAME, <!-- 仓库名称 --> WH_NAME, <!-- 仓库名称 -->
RECEIVE_USER <!-- 领用人员 --> RECEIVE_USER, <!-- 领用人员 -->
STATUS
) )
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#, VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
#receiveDate#, #receiveCode#, #whCode#, #whName#, #receiveUser#) #receiveDate#, #receiveCode#, #whCode#, #whName#, #receiveUser#, #status#)
<selectKey resultClass="java.lang.Long" keyProperty="id"> <selectKey resultClass="java.lang.Long" keyProperty="id">
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPBG003 SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPBG003
</selectKey> </selectKey>
...@@ -202,7 +207,19 @@ ...@@ -202,7 +207,19 @@
RECEIVE_CODE = #receiveCode#, <!-- 领用单号 --> RECEIVE_CODE = #receiveCode#, <!-- 领用单号 -->
WH_CODE = #whCode#, <!-- 仓库编码 --> WH_CODE = #whCode#, <!-- 仓库编码 -->
WH_NAME = #whName#, <!-- 仓库名称 --> WH_NAME = #whName#, <!-- 仓库名称 -->
RECEIVE_USER = #receiveUser# <!-- 领用人员 --> RECEIVE_USER = #receiveUser#, <!-- 领用人员 -->
STATUS = #status#
WHERE
ID = #id#
</update>
<update id="updateBystatus">
UPDATE ${hpjxSchema}.T_HPBG003
SET
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
STATUS = #status# <!-- 审批状态0.未审核1.已审核 -->
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
......
src/main/java/com/baosight/hpjx/hp/bg/sql/HPBG003A.xml
...@@ -201,6 +201,9 @@ ...@@ -201,6 +201,9 @@
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#, VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
#itemType#, #itemCode#, #itemName#, #itemModel#, #itemUnit#, #receiveQty#, #itemType#, #itemCode#, #itemName#, #itemModel#, #itemUnit#, #receiveQty#,
#status#, #parentId#) #status#, #parentId#)
<selectKey resultClass="java.lang.Long" keyProperty="id" >
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPBG003A
</selectKey>
</insert> </insert>
<delete id="delete"> <delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/bg/sql/HPBG004.xml
...@@ -252,6 +252,9 @@ ...@@ -252,6 +252,9 @@
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#, VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #deleteFlag#,
#takeStockDate#, #whCode#, #whName#, #itemType#, #itemCode#, #itemName#, #takeStockDate#, #whCode#, #whName#, #itemType#, #itemCode#, #itemName#,
#itemModel#, #itemUnit#, #paperQty#, #actualQty#, #proLossQty#, #stoLoca#, #takeStockUser#, #status#) #itemModel#, #itemUnit#, #paperQty#, #actualQty#, #proLossQty#, #stoLoca#, #takeStockUser#, #status#)
<selectKey resultClass="java.lang.Long" keyProperty="id" >
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPBG004
</selectKey>
</insert> </insert>
<delete id="delete"> <delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/bg/tools/HPBGTools.java
...@@ -31,18 +31,17 @@ public class HPBGTools { ...@@ -31,18 +31,17 @@ public class HPBGTools {
public static class HpBg002 { public static class HpBg002 {
public static HPBG002 get(Long id){ public static HPBG002 get(Long id){
AssertUtils.isTrue(Objects.isNull(id)||id<=0, "委外入库单ID不能为空！"); AssertUtils.isTrue(Objects.isNull(id)|| id<=0, "委外入库单ID不能为空！");
HPBG002 hpbg002 = (HPBG002) DaoBase.getInstance().get(HPBG002.QUERY,HPBG002.FIELD_ID, id); HPBG002 hpbg002 = (HPBG002) DaoBase.getInstance().get(HPBG002.QUERY,HPBG002.FIELD_ID, id);
return hpbg002; return hpbg002;
} }
} }
public static class HpBg002a { public static class HpBg002a {
public static List<HPBG002A> getByParentId(Long parentId,Integer status){ public static List<HPBG002A> getByParentId(Long parentId){
AssertUtils.isTrue(Objects.isNull(parentId)||parentId<=0, "委外入库单ID不能为空！"); AssertUtils.isTrue(Objects.isNull(parentId)||parentId<=0, "委外入库单ID不能为空！");
Map params = new HashMap(); Map params = new HashMap();
params.put("parentId", parentId); params.put("parentId", parentId);
params.put("status", status);
params.put("deleteFlag", 0); params.put("deleteFlag", 0);
List<HPBG002A> list = DaoBase.getInstance().query(HPBG002A.QUERY,params); List<HPBG002A> list = DaoBase.getInstance().query(HPBG002A.QUERY,params);
return CollectionUtils.isEmpty(list)?new ArrayList<>():list; return CollectionUtils.isEmpty(list)?new ArrayList<>():list;
...@@ -67,11 +66,10 @@ public class HPBGTools { ...@@ -67,11 +66,10 @@ public class HPBGTools {
} }
public static class HpBg003a { public static class HpBg003a {
public static List<HPBG003A> getByParentId(Long parentId, Integer status){ public static List<HPBG003A> getByParentId(Long parentId){
AssertUtils.isTrue(Objects.isNull(parentId)||parentId<=0, "委外入库单ID不能为空！"); AssertUtils.isTrue(Objects.isNull(parentId)||parentId<=0, "委外入库单ID不能为空！");
Map params = new HashMap(); Map params = new HashMap();
params.put("parentId", parentId); params.put("parentId", parentId);
params.put("status", status);
params.put("deleteFlag", 0); params.put("deleteFlag", 0);
List<HPBG003A> list = DaoBase.getInstance().query(HPBG003A.QUERY,params); List<HPBG003A> list = DaoBase.getInstance().query(HPBG003A.QUERY,params);
return CollectionUtils.isEmpty(list)?new ArrayList<>():list; return CollectionUtils.isEmpty(list)?new ArrayList<>():list;
......
src/main/java/com/baosight/hpjx/hp/ct/constant/HpCtConst.java 0 → 100644
package com.baosight.hpjx.hp.ct.constant;
/**
* @author:songx
* @date:2024/9/24,17:53
*/
public class HpCtConst {
/**
* HPCT01 定义
*
* @author:songx
* @date:2024/9/24,17:54
*/
public static class HpCt001 {
/**
* 状态
*
* @author:songx
* @date:2024/5/15,15:18
*/
public static class Status {
// 未关闭
public static final String OPEN = "open";
// 已关闭
public static final String CLOSE = "close";
}
}
}
src/main/java/com/baosight/hpjx/hp/ct/constant/HpCtSqlConst.java 0 → 100644
package com.baosight.hpjx.hp.ct.constant;
/**
* @author:songx
* @date:2024/9/24,18:09
*/
public class HpCtSqlConst {
/**
* @author:songx
* @date:2024/8/29,15:54
*/
public static class HpCt001 {
// 确认
public static final String CONFIRM = "HPCT001.confirm";
}
}
src/main/java/com/baosight/hpjx/hp/ct/service/ServiceHPCT001.java 0 → 100644
package com.baosight.hpjx.hp.ct.service;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.ct.constant.HpCtConst;
import com.baosight.hpjx.hp.ct.constant.HpCtSqlConst;
import com.baosight.hpjx.hp.ct.domain.HPCT001;
import com.baosight.hpjx.hp.ct.tools.HpCtTools;
import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.MapUtils;
import com.baosight.hpjx.util.ObjectUtils;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.core.web.threadlocal.UserSession;
import org.apache.commons.collections.CollectionUtils;
import java.util.List;
import java.util.Map;
/**
* 通知信息
*
* @author:songx
* @date:2021/10/15,16:46
*/
public class ServiceHPCT001 extends ServiceEPBase {
/**
* 页面加载调用.
*
* @param inInfo
*/
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPCT001().eiMetadata);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "初始化失败");
}
return inInfo;
}
/**
* 页面查询调用入口.
*
* @param inInfo
*/
public EiInfo query(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
// 只看自己的通知
queryMap.put(HPCT001.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HPCT001.QUERY);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询失败");
}
return inInfo;
}
/**
* 查询待办
*
* @param inInfo
* @return
*/
public EiInfo queryTodo(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
queryMap.put(HPCT001.FIELD_STATUS, HpCtConst.HpCt001.Status.OPEN);
queryMap.put(HPCT001.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HPCT001.QUERY, new HPCT001());
// 查询总数量
List<Integer> counts = dao.query(HPCT001.COUNT, queryMap);
inInfo.set(EiConstant.countStr, CollectionUtils.isEmpty(counts) ? 0 : counts.get(0));
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询待办信息");
}
return inInfo;
}
/**
* 查询已办
*
* @param inInfo
* @return
*/
public EiInfo queryRecord(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
queryMap.put(HPCT001.FIELD_STATUS, HpCtConst.HpCt001.Status.CLOSE);
queryMap.put(HPCT001.FIELD_USER_ENAME, UserSession.getLoginName());
inInfo = super.query(inInfo, HPCT001.QUERY, new HPCT001());
// 查询总数量
List<Integer> counts = dao.query(HPCT001.COUNT, queryMap);
inInfo.set(EiConstant.countStr, CollectionUtils.isEmpty(counts) ? 0 : counts.get(0));
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询已办信息");
}
return inInfo;
}
/**
* 已读
*
* @param inInfo
* @return
*/
public EiInfo confirm(EiInfo inInfo) {
try {
Map resultRow = EiInfoUtils.getFirstRow(inInfo, EiConstant.resultBlock);
if (ObjectUtils.isEmpty(resultRow.get(HPCT001.FIELD_INTERNAL_CODE))) {
inInfo.setMsg("无效的待办消息");
return inInfo;
}
resultRow.put(HPCT001.FIELD_STATUS, HpCtConst.HpCt001.Status.CLOSE);
resultRow.put(HPCT001.FIELD_CLOSE_TIME, DateUtils.shortDateTime());
DaoUtils.update(HpCtSqlConst.HpCt001.CONFIRM, resultRow);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "确认已办失败");
}
return inInfo;
}
/**
* 批量已读
*
* @param inInfo
* @return
*/
public EiInfo batchConfirm(EiInfo inInfo) {
try {
int successCount = 0;
List<HPCT001> fCt01s = MapUtils.toDaoEPBases(inInfo, HPCT001.class);
for (HPCT001 fCt01 : fCt01s) {
int result = HpCtTools.HpCt001.confirm(fCt01.getInternalCode());
successCount += result;
}
inInfo = this.query(inInfo);
inInfo.setMsg("操作成功！本次对[" + successCount + "]条数据确认已办成功!");
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "已办失败");
}
return inInfo;
}
}
src/main/java/com/baosight/hpjx/hp/ct/sql/HPCT001.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<sqlMap namespace="HPCT001">
<sql id="column">
ID as "id", <!-- 主键id -->
CREATED_BY as "createdBy", <!-- 记录创建者 -->
CREATED_NAME as "createdName", <!-- 记录创建名称 -->
CREATED_TIME as "createdTime", <!-- 记录创建时间 -->
UPDATED_BY as "updatedBy", <!-- 记录修改者 -->
UPDATED_NAME as "updatedName", <!-- 记录修改名称 -->
UPDATED_TIME as "updatedTime", <!-- 记录修改时间 -->
DELETE_FLAG as "deleteFlag", <!-- 0-未删除，1-已删除 -->
STATUS as "status", <!-- 状态 -->
INTERNAL_CODE as "internalCode", <!-- 内码 -->
TITLE as "title", <!-- 标题 -->
CONTENT as "content", <!-- 内容 -->
USER_ENAME as "userEname", <!-- 用户ID -->
USER_CNAME as "userCname", <!-- 用户姓名 -->
FORM_ENAME as "formEname", <!-- 画面英文名 -->
FORM_PARAM as "formParam", <!-- 画面参数 -->
CLOSE_TIME as "closeTime" <!-- 关闭时间 -->
</sql>
<sql id="condition">
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdBy">
CREATED_BY = #createdBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdName">
CREATED_NAME = #createdName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdTime">
CREATED_TIME = #createdTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedBy">
UPDATED_BY = #updatedBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedName">
UPDATED_NAME = #updatedName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedTime">
UPDATED_TIME = #updatedTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="deleteFlag">
DELETE_FLAG = #deleteFlag#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="status">
STATUS = #status#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="internalCode">
INTERNAL_CODE = #internalCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="title">
TITLE = #title#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="content">
CONTENT = #content#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="userEname">
USER_ENAME = #userEname#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="userCname">
USER_CNAME = #userCname#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="formEname">
FORM_ENAME = #formEname#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="formParam">
FORM_PARAM = #formParam#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="closeTime">
CLOSE_TIME = #closeTime#
</isNotEmpty>
</sql>
<sql id="customCondition">
<include refid="condition"/>
<isNotEmpty prepend=" AND " property="createTimeFrom">
CREATED_TIME &gt;= REPLACE(REPLACE(REPLACE(#createTimeFrom#, '-', ''), ':', ''), ' ', '')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createTimeTo">
CREATED_TIME &lt;= REPLACE(REPLACE(REPLACE(#createTimeTo#, '-', ''), ':', ''), ' ', '')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="closeTimeFrom">
CLOSE_TIME &gt;= REPLACE(REPLACE(REPLACE(#closeTimeFrom#, '-', ''), ':', ''), ' ', '')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="closeTimeTo">
CLOSE_TIME &lt;= REPLACE(REPLACE(REPLACE(#closeTimeTo#, '-', ''), ':', ''), ' ', '')
</isNotEmpty>
</sql>
<sql id="orderBy">
<dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy">
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
STATUS ASC, CREATED_TIME DESC
</isEmpty>
</dynamic>
</sql>
<select id="query" resultClass="com.baosight.hpjx.hp.ct.domain.HPCT001">
SELECT
<include refid="column"/>
FROM ${hpjxSchema}.T_HPCT001 WHERE 1=1
<include refid="customCondition"/>
<include refid="orderBy"/>
</select>
<select id="count" resultClass="int">
SELECT COUNT(*) FROM ${hpjxSchema}.T_HPCT001 WHERE 1=1
<include refid="customCondition"/>
</select>
<insert id="insert">
INSERT INTO ${hpjxSchema}.T_HPCT001 (
CREATED_BY, <!-- 记录创建者 -->
CREATED_NAME, <!-- 记录创建名称 -->
CREATED_TIME, <!-- 记录创建时间 -->
UPDATED_BY, <!-- 记录修改者 -->
UPDATED_NAME, <!-- 记录修改名称 -->
UPDATED_TIME, <!-- 记录修改时间 -->
DELETE_FLAG, <!-- 0-未删除，1-已删除 -->
STATUS, <!-- 状态 -->
INTERNAL_CODE, <!-- 内码 -->
TITLE, <!-- 标题 -->
CONTENT, <!-- 内容 -->
USER_ENAME, <!-- 用户ID -->
USER_CNAME, <!-- 用户姓名 -->
FORM_ENAME, <!-- 画面英文名 -->
FORM_PARAM, <!-- 画面参数 -->
CLOSE_TIME <!-- 关闭时间 -->
) VALUES (
#createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#,
#deleteFlag#, #status#, #internalCode#, #title#, #content#, #userEname#, #userCname#,
#formEname#, #formParam#, #closeTime#)
</insert>
<!-- 确认 -->
<update id="confirm">
UPDATE ${hggpSchema}.T_HPCT001
SET
STATUS = #status#,
CLOSE_TIME = #closeTime#,
<include refid="SqlBase.updateRevise"/>
WHERE INTERNAL_CODE = #internalCode#
AND STATUS = 'open'
</update>
</sqlMap>
src/main/java/com/baosight/hpjx/hp/ct/tools/HpCtTools.java 0 → 100644
package com.baosight.hpjx.hp.ct.tools;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.ct.constant.HpCtConst;
import com.baosight.hpjx.hp.ct.constant.HpCtSqlConst;
import com.baosight.hpjx.hp.ct.domain.HPCT001;
import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.StringUtils;
import java.util.HashMap;
import java.util.Map;
/**
* @author:songx
* @date:2024/3/25,20:44
*/
public class HpCtTools {
/**
* HPCT001 sql 定义
*
* @author:songx
* @date:2024/3/25,21:04
*/
public static class HpCt001 {
/**
* 写入数据库
*
* @param ct00
*/
public static void insertDb(HPCT001 ct00) {
ct00.setStatus(HpCtConst.HpCt001.Status.OPEN);
DaoUtils.insert(HPCT001.INSERT, ct00);
}
/**
* 确认已办
*
* @param internalCode
*/
public static int confirm(String internalCode) {
if (StringUtils.isBlank(internalCode)) {
return 0;
}
Map paramMap = new HashMap();
paramMap.put(HPCT001.FIELD_INTERNAL_CODE, internalCode);
paramMap.put(HPCT001.FIELD_STATUS, HpCtConst.HpCt001.Status.CLOSE);
paramMap.put(HPCT001.FIELD_CLOSE_TIME, DateUtils.shortDateTime());
return DaoUtils.update(HpCtSqlConst.HpCt001.CONFIRM, paramMap);
}
}
}
src/main/java/com/baosight/hpjx/hp/ct/utils/HpCtUtils.java 0 → 100644
package com.baosight.hpjx.hp.ct.utils;
import com.baosight.hpjx.hp.ct.domain.HPCT001;
import com.baosight.hpjx.hp.ct.tools.HpCtTools;
import com.baosight.hpjx.hp.xs.domain.User;
import com.baosight.hpjx.hp.xs.tools.HPXSTools;
import com.baosight.hpjx.util.AssertUtils;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
/**
* @author:songx
* @date:2024/3/25,20:45
*/
@Slf4j
public class HpCtUtils {
/**
* @author:songx
* @date:2024/10/8,17:20
*/
public static class HpCt001 {
/**
* 发送通知
*
* @param ct00 消息体
*/
public static void send(HPCT001 ct00) {
AssertUtils.isNull(ct00, "待办内容不能为空");
AssertUtils.isEmpty(ct00.getTitle(), "待办标题不能为空");
AssertUtils.isEmpty(ct00.getContent(), "待办内容不能为空");
AssertUtils.isEmpty(ct00.getUserEname(), "待办对象不能为空");
// 设置通知对象名称
User user = HPXSTools.XsUser.get(ct00.getUserEname());
ct00.setUserCname(user.getUserName());
HpCtTools.HpCt001.insertDb(ct00);
}
/**
* 发送通知
*
* @param ct00 消息体
* @param loginNames loginNames
*/
public static void send(HPCT001 ct00, List<String> loginNames) {
AssertUtils.isNull(ct00, "待办内容不能为空");
AssertUtils.isEmpty(ct00.getTitle(), "待办标题不能为空");
AssertUtils.isEmpty(ct00.getContent(), "待办内容不能为空");
AssertUtils.isEmpty(loginNames, "待办对象不能为空");
try {
for (String loginName : loginNames) {
User user = HPXSTools.XsUser.get(loginName);
ct00.setUserCname(user.getUserName());
ct00.setUserEname(user.getLoginName());
HpCtTools.HpCt001.insertDb(ct00);
}
} catch (Exception e) {
log.error("发送通知消息失败：{}", e.getMessage(), e);
}
}
}
}
src/main/java/com/baosight/hpjx/hp/yx/domain/HPYX003.java
...@@ -144,7 +144,7 @@ public class HPYX003 extends DaoEPBase { ...@@ -144,7 +144,7 @@ public class HPYX003 extends DaoEPBase {
eiColumn = new EiColumn(FIELD_QUANTITY); eiColumn = new EiColumn(FIELD_QUANTITY);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(0); eiColumn.setScaleLength(4);
eiColumn.setFieldLength(20); eiColumn.setFieldLength(20);
eiColumn.setDescName("产品数量"); eiColumn.setDescName("产品数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
......
src/main/resources/META-INF/resources/iPlatV7-index.jsp
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<%@include file="/WEB-INF/fragments/kendo-ui-css.tagf" %> <%@include file="/WEB-INF/fragments/kendo-ui-css.tagf" %>
<link rel="shortcut icon" href="${iPlatStaticURL}/iplat.ico" type="image/x-icon"> <link rel="shortcut icon" href="${iPlatStaticURL}/iplat.ico" type="image/x-icon">
<%-- <link href="${iPlatStaticURL}/iPlatV7-index.css" rel="stylesheet" type="text/css"/>--%> <link href="${iPlatStaticURL}/iPlatV7-index.css" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" href="${iPlatStaticURL}/iplatui/assets/js/plugins/slick/slick.min.css"> <link rel="stylesheet" href="${iPlatStaticURL}/iplatui/assets/js/plugins/slick/slick.min.css">
<link rel="stylesheet" href="${iPlatStaticURL}/iplatui/assets/js/plugins/slick/slick-theme.min.css" onload="this.rel='stylesheet'" rel="preload" as="style" > <link rel="stylesheet" href="${iPlatStaticURL}/iplatui/assets/js/plugins/slick/slick-theme.min.css" onload="this.rel='stylesheet'" rel="preload" as="style" >
......
src/main/resources/resources/ibatis/sqlmap-config.xml
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<!-- 基础服务 --> <!-- 基础服务 -->
<sqlMap resource="com/baosight/hpjx/hp/dm/sql/HPDM099.xml"/> <sqlMap resource="com/baosight/hpjx/hp/dm/sql/HPDM099.xml"/>
<sqlMap resource="com/baosight/hpjx/hp/ct/sql/HPCT001.xml"/>
<!-- 用户服务 --> <!-- 用户服务 -->
<sqlMap resource="com/baosight/hpjx/hp/xs/sql/HPXS007A.xml"/> <sqlMap resource="com/baosight/hpjx/hp/xs/sql/HPXS007A.xml"/>
......
src/main/webapp/HP/BG/HPBG002.js
...@@ -32,6 +32,7 @@ $(function() { ...@@ -32,6 +32,7 @@ $(function() {
}); });
$("#BTN_INSERT").on("click",addFunc); $("#BTN_INSERT").on("click",addFunc);
$("#BTN_UPDATE").on("click",updateFunc); $("#BTN_UPDATE").on("click",updateFunc);
$("#SUBMIT").on("click", submitFunc)
}, },
onDelete: function (e) { onDelete: function (e) {
...@@ -114,7 +115,7 @@ function updateFunc() { ...@@ -114,7 +115,7 @@ function updateFunc() {
return; return;
} }
if (rows[0].status == "3") { if (rows[0].status == "3") {
message("已经提交的数据不能进行修改！"); message("数据已提交,不能进行修改！");
return; return;
} }
JSColorbox.open({ JSColorbox.open({
...@@ -178,6 +179,14 @@ function deleteFunc(){ ...@@ -178,6 +179,14 @@ function deleteFunc(){
return; return;
} }
let flag = true; let flag = true;
$.each(rows, function(index, item) {
let status= item.get("status");
if(isBlank(status) || status == 3){
message("选中的第"+(index+1)+"行\"已审批\"，不能重复审批!");
flag = false;
return false;
}
});
if (flag){ if (flag){
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", { JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
ok: function () { ok: function () {
...@@ -197,6 +206,35 @@ function deleteFunc(){ ...@@ -197,6 +206,35 @@ function deleteFunc(){
} }
} }
function submitFunc() {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
let flag = true;
$.each(rows, function(index, item) {
let status= item.get("status");
if(isBlank(status) || status == 3){
message("选中的第"+(index+1)+"行\"已审批\"，不能重复审批!");
flag = false;
return false;
}
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"提交\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPBG002", "submit", true,
function (ei) {
if (ei.getStatus() != -1){
query();
}
});
}
});
}
}
/** /**
* 文件上传 * 文件上传
* *
......
src/main/webapp/HP/BG/HPBG002.jsp
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<EF:EFPage title="办公用品入库"> <EF:EFPage title="办公用品入库">
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFDatePicker blockId="inqu_status" row="0" ename="sellDate" cname="入库日期" role="date" <EF:EFDatePicker blockId="inqu_status" row="0" ename="depositDate" cname="入库日期" role="date"
format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/> format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
<EF:EFSelect blockId="inqu_status" row="0" ename="clientName" cname="仓库名称" colWidth="3" filter="contains"> <EF:EFSelect blockId="inqu_status" row="0" ename="clientName" cname="仓库名称" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
align="center" filter="contains" sort="true"> align="center" filter="contains" sort="true">
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="2">
<EF:EFCodeOption codeName="hpjx.hpcw.reviewStatus" condition="ITEM_CODE IN ('2','3')"/>
</EF:EFComboColumn>
<EF:EFColumn cname="创建人" ename="createdName" align="center" width="120" readonly="true" required="false" <EF:EFColumn cname="创建人" ename="createdName" align="center" width="120" readonly="true" required="false"
enable="false"/> enable="false"/>
<EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime" <EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
......
src/main/webapp/HP/BG/HPBG002A.js
...@@ -15,7 +15,6 @@ $(function() { ...@@ -15,7 +15,6 @@ $(function() {
$("#QUERY").on("click", function () { $("#QUERY").on("click", function () {
grid.dataSource.page(1); grid.dataSource.page(1);
}); });
$("#SUBMIT").on("click", submitFunc)
}, },
} }
}; };
...@@ -41,31 +40,3 @@ let query = function () { ...@@ -41,31 +40,3 @@ let query = function () {
resultGrid.dataSource.page(1); resultGrid.dataSource.page(1);
} }
function submitFunc() {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
let flag = true;
$.each(rows, function(index, item) {
let status= item.get("status");
if(isBlank(status) || status == 3){
message("选中的第"+(index+1)+"行\"已审批\"，不能重复审批!");
flag = false;
return false;
}
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"提交\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPBG002A", "submit", true,
function (ei) {
if (ei.getStatus() != -1){
query();
}
});
}
});
}
}
\ No newline at end of file
src/main/webapp/HP/BG/HPBG002A.jsp
...@@ -46,9 +46,6 @@ ...@@ -46,9 +46,6 @@
displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0" displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,15}?$/" data-regex="/^-?[0-9]{1,15}?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="2">
<EF:EFCodeOption codeName="hpjx.hpcw.reviewStatus" condition="ITEM_CODE IN ('2','3')"/>
</EF:EFComboColumn>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HP/BG/HPBG002B.js
...@@ -58,7 +58,7 @@ $(function() { ...@@ -58,7 +58,7 @@ $(function() {
} }
}); });
}, },
onAdd: function (e) { beforeAdd: function (e) {
let whCode = $("#result-0-whCode").val(); let whCode = $("#result-0-whCode").val();
if (isBlank(whCode)) { if (isBlank(whCode)) {
message("请选择仓库名称！"); message("请选择仓库名称！");
......
src/main/webapp/HP/BG/HPBG002B.jsp
...@@ -56,9 +56,6 @@ ...@@ -56,9 +56,6 @@
displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0" displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,15}?$/" data-regex="/^-?[0-9]{1,15}?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="2" hidden="true">
<EF:EFCodeOption codeName="hpjx.hpcw.reviewStatus" condition="ITEM_CODE IN ('2','3')"/>
</EF:EFComboColumn>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HP/BG/HPBG002C.js
...@@ -58,7 +58,7 @@ $(function() { ...@@ -58,7 +58,7 @@ $(function() {
} }
}); });
}, },
onAdd: function (e) { beforeAdd: function (e) {
let whCode = $("#result-0-whCode").val(); let whCode = $("#result-0-whCode").val();
if (isBlank(whCode)) { if (isBlank(whCode)) {
message("请选择仓库名称！"); message("请选择仓库名称！");
......
src/main/webapp/HP/BG/HPBG002C.jsp
...@@ -59,9 +59,6 @@ ...@@ -59,9 +59,6 @@
displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0" displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,15}?$/" data-regex="/^-?[0-9]{1,15}?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="2">
<EF:EFCodeOption codeName="hpjx.hpcw.reviewStatus" condition="ITEM_CODE IN ('2','3')"/>
</EF:EFComboColumn>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HP/BG/HPBG003.js
...@@ -32,13 +32,18 @@ $(function() { ...@@ -32,13 +32,18 @@ $(function() {
}); });
$("#BTN_INSERT").on("click",addFunc); $("#BTN_INSERT").on("click",addFunc);
$("#BTN_UPDATE").on("click",updateFunc); $("#BTN_UPDATE").on("click",updateFunc);
$("#SUBMIT").on("click", submitFunc)
}, },
onAdd: function (e) { onAdd: function (e) {
$.each(e.items, function (index, item) { $.each(e.items, function (index, item) {
item['sellDate'] = currShortDate() item['sellDate'] = currShortDate()
}); });
}, },
onDelete: function (e) {
// 阻止默认请求，使用自定义删除
e.preventDefault();
deleteFunc();
},
onSave: function (e) { onSave: function (e) {
// 阻止默认请求，使用自定义保存 // 阻止默认请求，使用自定义保存
e.preventDefault(); e.preventDefault();
...@@ -109,7 +114,7 @@ function updateFunc() { ...@@ -109,7 +114,7 @@ function updateFunc() {
return; return;
} }
if (rows[0].status == "3") { if (rows[0].status == "3") {
message("已经提交的数据不能进行修改！"); message("数据已提交,不能进行修改！");
return; return;
} }
JSColorbox.open({ JSColorbox.open({
...@@ -121,40 +126,26 @@ function updateFunc() { ...@@ -121,40 +126,26 @@ function updateFunc() {
}); });
} }
function btnSaveFunc(btnNode) { function deleteFunc(){
let rows = resultGrid.getCheckedRows(); let rows = resultGrid.getCheckedRows();
if (rows.length < 1) { if (rows.length < 1) {
message("请选择数据") message("请选择数据")
return; return;
} }
let flag = true; let flag = true;
rows.forEach(function (item,index){ $.each(rows, function(index, item) {
if (isBlank(item.sellDate)){ let status= item.get("status");
message("选中的第"+(index+1)+"行\"推广日期\"，不能为空!"); if(isBlank(status) || status == 3){
flag = false; message("选中的第"+(index+1)+"行\"已审批\"，不能重复审批!");
return false;
}
if (isBlank(item.sourceFunds)){
message("选中的第"+(index+1)+"行\"推广名称\"，不能为空!");
flag = false;
return false;
}
if (isBlank(item.goalAmount) || !isNumber(item.goalAmount)){
message("选中的第"+(index+1)+"行\"目标销售额\"，不能为空!");
flag = false; flag = false;
return false; return false;
} }
if (isBlank(item.budget) || !isNumber(item.budget)){ });
message("选中的第"+(index+1)+"行\"推广预算\"，不能为空!");
flag = false;
return false;
}
})
if (flag){ if (flag){
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", { JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
ok: function () { ok: function () {
JSUtils.submitGridsData("result", "HPYX010", "save", JSUtils.submitGridsData("result", "HPBG003", "delete", true,
true, function (e) { function (e) {
var status = e.getStatus(); var status = e.getStatus();
if (status !== -1) { if (status !== -1) {
NotificationUtil(e.msg); NotificationUtil(e.msg);
...@@ -168,31 +159,32 @@ function btnSaveFunc(btnNode) { ...@@ -168,31 +159,32 @@ function btnSaveFunc(btnNode) {
} }
}); });
} }
} }
function deleteFunc(){ function submitFunc() {
let rows = resultGrid.getCheckedRows(); let rows = resultGrid.getCheckedRows();
if (rows.length < 1) { if (rows.length < 1) {
message("请选择数据") message("请选择数据");
return; return;
} }
let flag = true; let flag = true;
if (flag){ $.each(rows, function(index, item) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", { let status= item.get("status");
if(isBlank(status) || status == 3){
message("选中的第"+(index+1)+"行\"已审批\"，不能重复审批!");
flag = false;
return false;
}
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"提交\"操作? ", {
ok: function () { ok: function () {
JSUtils.submitGridsData("result", "HPBG003", "delete", true, JSUtils.submitGridsData("result", "HPBG003", "submit", true,
function (e) { function (ei) {
var status = e.getStatus(); if (ei.getStatus() != -1){
if (status !== -1) {
NotificationUtil(e.msg);
query(); query();
}else {
NotificationUtil(e.msg, "error");
} }
btnNode.attr("disabled", false); });
}
);
} }
}); });
} }
......
src/main/webapp/HP/BG/HPBG003.jsp
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
align="center" filter="contains" sort="true"> align="center" filter="contains" sort="true">
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="2">
<EF:EFCodeOption codeName="hpjx.hpcw.reviewStatus" condition="ITEM_CODE IN ('2','3')"/>
</EF:EFComboColumn>
<EF:EFColumn cname="创建人" ename="createdName" align="center" width="120" readonly="true" required="false" <EF:EFColumn cname="创建人" ename="createdName" align="center" width="120" readonly="true" required="false"
enable="false"/> enable="false"/>
<EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime" <EF:EFColumn cname="创建时间" ename="createdTime" parseFormats="['yyyyMMddHHmmss']" editType="datetime"
......
src/main/webapp/HP/BG/HPBG003A.js
...@@ -15,7 +15,6 @@ $(function() { ...@@ -15,7 +15,6 @@ $(function() {
$("#QUERY").on("click", function () { $("#QUERY").on("click", function () {
grid.dataSource.page(1); grid.dataSource.page(1);
}); });
$("#SUBMIT").on("click", submitFunc)
}, },
} }
}; };
...@@ -41,31 +40,3 @@ let query = function () { ...@@ -41,31 +40,3 @@ let query = function () {
resultGrid.dataSource.page(1); resultGrid.dataSource.page(1);
} }
function submitFunc() {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
let flag = true;
$.each(rows, function(index, item) {
let status= item.get("status");
if(isBlank(status) || status == 3){
message("选中的第"+(index+1)+"行\"已审批\"，不能重复审批!");
flag = false;
return false;
}
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"提交\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPBG003A", "submit", true,
function (ei) {
if (ei.getStatus() != -1){
query();
}
});
}
});
}
}
\ No newline at end of file
src/main/webapp/HP/BG/HPBG003A.jsp
...@@ -46,9 +46,6 @@ ...@@ -46,9 +46,6 @@
displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0" displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,15}?$/" data-regex="/^-?[0-9]{1,15}?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="2">
<EF:EFCodeOption codeName="hpjx.hpcw.reviewStatus" condition="ITEM_CODE IN ('2','3')"/>
</EF:EFComboColumn>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
src/main/webapp/HP/BG/HPBG003B.js
...@@ -53,7 +53,7 @@ $(function() { ...@@ -53,7 +53,7 @@ $(function() {
} }
}); });
}, },
onAdd: function (e) { beforeAdd: function (e) {
let whCode = $("#result-0-whCode").val(); let whCode = $("#result-0-whCode").val();
if (isBlank(whCode)) { if (isBlank(whCode)) {
message("请选择仓库名称！"); message("请选择仓库名称！");
......
src/main/webapp/HP/BG/HPBG003B.jsp
...@@ -56,9 +56,6 @@ ...@@ -56,9 +56,6 @@
displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0" displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,15}?$/" data-regex="/^-?[0-9]{1,15}?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFComboColumn ename="status" cname="审批状态" width="80" enable="false" align="center" readonly="false" required="true" defaultValue="2">
<EF:EFCodeOption codeName="hpjx.hpcw.reviewStatus" condition="ITEM_CODE IN ('2','3')"/>
</EF:EFComboColumn>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HP/BG/HPBG003C.js
...@@ -59,7 +59,7 @@ $(function() { ...@@ -59,7 +59,7 @@ $(function() {
} }
}); });
}, },
onAdd: function (e) { beforeAdd: function (e) {
let whCode = $("#result-0-whCode").val(); let whCode = $("#result-0-whCode").val();
if (isBlank(whCode)) { if (isBlank(whCode)) {
message("请选择仓库名称！"); message("请选择仓库名称！");
...@@ -136,12 +136,6 @@ function btnSaveFunc() { ...@@ -136,12 +136,6 @@ function btnSaveFunc() {
flag = false; flag = false;
return false; return false;
} }
let status= item.get("status");
if(status == 3){
message("选中的第"+(index+1)+"行\"审批状态\"已提交，无法操作");
flag = false;
return false;
}
}) })
if(flag) if(flag)
JSUtils.confirm("确定对数据做\"保存\"操作? ", { JSUtils.confirm("确定对数据做\"保存\"操作? ", {
......
src/main/webapp/HP/BG/HPBG003C.jsp
...@@ -59,9 +59,6 @@ ...@@ -59,9 +59,6 @@
displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0" displayType="0" sort="true" align="right" maxLength="15" required="true" defaultValue="0"
data-regex="/^-?[0-9]{1,15}?$/" data-regex="/^-?[0-9]{1,15}?$/"
data-errorprompt="请输入数字，该值最大可设置15位整数！"/> data-errorprompt="请输入数字，该值最大可设置15位整数！"/>
<EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" readonly="false" required="true" defaultValue="2">
<EF:EFCodeOption codeName="hpjx.hpcw.reviewStatus" condition="ITEM_CODE IN ('2','3')"/>
</EF:EFComboColumn>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<div class="row" style="display:flex;justify-content:center;"> <div class="row" style="display:flex;justify-content:center;">
......
src/main/webapp/HP/CT/HPCT001.js 0 → 100644
$(function () {
IPLATUI.EFGrid = {
"result": {
exportGrid: false,
pageable: {
pageSize: 15,
pageSizes: [15, 50, 100, 200]
},
columns: [{
field: "operate",
template: function (options) {
let formEname = options.formEname;
if (isBlank(formEname)) {
return "";
}
let formParam = "todoInternalCode=" + options.internalCode
+ (isBlank(options.formParam) ? "" : "&" + options.formParam);
let params = '\'' + formEname + '\',\'' + formParam + '\'';
let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showDetail(' + params + ')">详情</a>';
return template;
}
}]
}
}
// 查询
$("#QUERY").on("click", query);
// 已读
$("#CONFIRM").on("click", confirm);
});
/**
* 页面加载时执行
*/
$(window).load(function () {
// 查询
query();
});
/**
* 查询
*/
let query = function () {
resultGrid.dataSource.page(1);
}
/**
* 已读
*/
let confirm = function () {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"确认已办\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPCT001", "batchConfirm", true);
}
});
}
/**
* 展示详情
*
* @param formEname
* @param param
*/
let showDetail = function (formEname, param) {
IPLAT.openForm(formEname, param);
}
src/main/webapp/HP/CT/HPCT001.jsp 0 → 100644
<!DOCTYPE html>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<EF:EFPage title="待办消息">
<EF:EFRegion id="inqu" title="条件区域">
<div class="row">
<EF:EFSelect cname="状态" blockId="inqu_status" ename="status" row="0" colWidth="3" optionLabel="全部">
<EF:EFCodeOption codeName="app.ct.status"/>
</EF:EFSelect>
<EF:EFInput cname="标题" blockId="inqu_status" ename="title" row="0" colWidth="3"/>
<EF:EFInput cname="内容" blockId="inqu_status" ename="content" row="0" colWidth="3"/>
</div>
<div class="row">
<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
startName="createTimeFrom" endName="createTimeTo" row="0" role="datetime"
format="yyyy-MM-dd HH:mm:ss" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
<EF:EFDateSpan startCname="关闭日期(从)" endCname="至" blockId="inqu_status"
startName="closeTimeFrom" endName="closeTimeTo" row="0" role="datetime"
format="yyyy-MM-dd HH:mm:ss" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
</div>
</EF:EFRegion>
<EF:EFRegion id="result" title="明细数据">
<EF:EFGrid blockId="result" autoDraw="override" showCount="true" checkMode="row" height="69vh">
<EF:EFColumn ename="internalCode" cname="内码" hidden="true"/>
<EF:EFColumn ename="formEname" cname="表单英文名" hidden="true"/>
<EF:EFColumn ename="formParam" cname="表单参数" hidden="true"/>
<EF:EFColumn ename="operate" cname="操作" enable="false" width="80" align="center"/>
<EF:EFComboColumn ename="status" cname="状态" enable="false" width="100" align="center">
<EF:EFCodeOption codeName="app.ct.status"/>
</EF:EFComboColumn>
<EF:EFColumn ename="title" cname="标题" enable="false" width="140" align="center"/>
<EF:EFColumn ename="content" cname="内容" enable="false" width="500" align="left" sort="true"/>
<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
<EF:EFColumn ename="closeTime" cname="关闭时间" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
src/main/webapp/HP/YX/HPYX001.jsp
...@@ -105,12 +105,12 @@ ...@@ -105,12 +105,12 @@
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/> dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFColumn ename="district" cname="区域" width="120" enable="true" readonly="false" align="center" required="true"/> <EF:EFColumn ename="district" cname="区域" width="120" enable="true" readonly="false" align="center" required="true"/>
<EF:EFColumn ename="productName" cname="产品名称" width="120" enable="true" readonly="false" align="center" required="false"/> <EF:EFColumn ename="productName" cname="产品名称" width="120" enable="true" readonly="false" align="center" required="false"/>
<EF:EFColumn ename="quantity" cname="产品数量" maxLength="15" displayType="0.00" format="{0:N0}" <EF:EFColumn ename="quantity" cname="产品数量" maxLength="16" displayType="0.0000" format="{0:N4}"
data-regex="/^-?[0-9]{1,12}$/" align="right" data-regex="/^-?[0-9]{1,16}([.][0-9]{1,4})?$/" align="right"
data-errorprompt="请输入数字，该值最大可设置12位整数！" sumType="all"/> data-errorprompt="请输入数字，该值最大可设置16位整数和4位小数！" sumType="all"/>
<EF:EFColumn ename="price" cname="价格" maxLength="15" displayType="0.00" format="{0:C2}" <EF:EFColumn ename="price" cname="价格" maxLength="16" displayType="0.00" format="{0:C2}"
data-regex="/^-?[0-9]{1,12}([.][0-9]{1,3})?$/" align="right" data-regex="/^-?[0-9]{1,16}([.][0-9]{1,2})?$/" align="right"
data-errorprompt="请输入数字，该值最大可设置12位整数和3位小数！" sumType="all"/> data-errorprompt="请输入数字，该值最大可设置16位整数和2位小数！" sumType="all"/>
<EF:EFColumn ename="quality" cname="质量" width="120" enable="true" readonly="false" align="center" required="false"/> <EF:EFColumn ename="quality" cname="质量" width="120" enable="true" readonly="false" align="center" required="false"/>
<EF:EFComboColumn ename="surveyUser" cname="调查人员" columnTemplate="#=textField#" itemTemplate="#=textField#" <EF:EFComboColumn ename="surveyUser" cname="调查人员" columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" defaultValue="${loginName}" textField="textField" valueField="valueField" defaultValue="${loginName}"
......
src/main/webapp/common/js/common.js
...@@ -279,7 +279,8 @@ function currShortDate() { ...@@ -279,7 +279,8 @@ function currShortDate() {
const year = date.getFullYear(); const year = date.getFullYear();
const month = date.getMonth() + 1; // 月份从0开始，需要加1 const month = date.getMonth() + 1; // 月份从0开始，需要加1
const day = date.getDate(); const day = date.getDate();
return year + (month < 10 ? '0' + month : month.toString()) + (day < 10 ? '0' + day : day); return year.toString() + (month < 10 ? '0' + month : month.toString())
+ (day < 10 ? '0' + day : day.toString());
} }
/** /**
...@@ -291,7 +292,7 @@ function currShortMonth() { ...@@ -291,7 +292,7 @@ function currShortMonth() {
const date = new Date(); const date = new Date();
const year = date.getFullYear(); const year = date.getFullYear();
const month = date.getMonth() + 1; // 月份从0开始，需要加1 const month = date.getMonth() + 1; // 月份从0开始，需要加1
return year + (month < 10 ? '0' + month : month); return year.toString() + (month < 10 ? '0' + month : month.toString());
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment