Skip to content

H
hp-smart
Commit ebdfb907 by 宋祥
Options

1.其他出库单逻辑开发

parent 142153e3
Showing with 1079 additions and 438 deletions
src/main/java/com/baosight/hpjx/core/security/UserSessionUtils.java
package com.baosight.hpjx.core.security; package com.baosight.hpjx.core.security;
import com.baosight.hpjx.hp.xs.domain.User; import com.baosight.hpjx.hp.xs.domain.User;
import com.baosight.hpjx.hp.xs.tools.HPXSUserTools;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
...@@ -19,6 +20,7 @@ import java.util.concurrent.ConcurrentMap; ...@@ -19,6 +20,7 @@ import java.util.concurrent.ConcurrentMap;
public class UserSessionUtils extends UserSession { public class UserSessionUtils extends UserSession {
private static ConcurrentMap companyMap = new ConcurrentHashMap(); private static ConcurrentMap companyMap = new ConcurrentHashMap();
private static ConcurrentMap depMap = new ConcurrentHashMap();
/** /**
* 获取用户信息 * 获取用户信息
...@@ -54,13 +56,35 @@ public class UserSessionUtils extends UserSession { ...@@ -54,13 +56,35 @@ public class UserSessionUtils extends UserSession {
*/ */
public static String getCompanyCode() { public static String getCompanyCode() {
String loginName = getLoginName(); String loginName = getLoginName();
if (loginName == null) {
return null;
}
String companyCode = MapUtils.getString(companyMap, loginName); String companyCode = MapUtils.getString(companyMap, loginName);
if (StringUtils.isBlank(companyCode)) { if (companyCode == null) {
companyCode = getUser().getCompanyCode(); User user = getUser();
companyCode = companyCode == null ? "" : companyCode; companyCode = user == null || user.getCompanyCode() == null ? "" : user.getCompanyCode();
companyMap.put(loginName, companyCode); companyMap.put(loginName, companyCode);
} }
return companyCode; return companyCode;
} }
/**
* 获取登录用户的部门编码
*
* @return
*/
public static String getDepCode() {
String loginName = getLoginName();
if (loginName == null) {
return null;
}
String depCode = MapUtils.getString(depMap, loginName);
if (depCode == null) {
depCode = HPXSUserTools.getOrgId();
depCode = depCode == null ? "" : depCode.trim();
depMap.put(loginName, depCode);
}
return depCode;
}
} }
src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java
...@@ -38,6 +38,8 @@ public class HPConstant { ...@@ -38,6 +38,8 @@ public class HPConstant {
public static final String WH_CODE = "WH_CODE"; public static final String WH_CODE = "WH_CODE";
// 其他入库单号 // 其他入库单号
public static final String OTHER_ENTER_NO = "OTHER_ENTER_NO"; public static final String OTHER_ENTER_NO = "OTHER_ENTER_NO";
// 其他出库单号
public static final String OTHER_OUTER_NO = "OTHER_OUTER_NO";
} }
/** /**
......
src/main/java/com/baosight/hpjx/hp/constant/HPSqlConstant.java
...@@ -21,6 +21,20 @@ public class HPSqlConstant { ...@@ -21,6 +21,20 @@ public class HPSqlConstant {
} }
/** /**
* HPKC007 SQL 定义
*
* @author:songx
* @date:2024/1/20,16:45
*/
public class HPKC007 {
// 查询
public static final String QUERY_SUM = "HPKC007.querySum";
// 锁
public static final String LOCK = "HPKC007.lock";
}
/**
* HPKC009 SQL 定义 * HPKC009 SQL 定义
* *
* @author:songx * @author:songx
......
src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC007.java
/**
* Generate time : 2024-01-10 14:03:35
* Version : 1.0
*/
package com.baosight.hpjx.hp.kc.domain; package com.baosight.hpjx.hp.kc.domain;
import com.baosight.iplat4j.core.util.NumberUtils; import com.baosight.iplat4j.core.util.NumberUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baosight.iplat4j.core.util.DateUtils;
import java.sql.Timestamp;
import com.baosight.iplat4j.core.ei.EiColumn; import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase; import com.baosight.iplat4j.core.data.DaoEPBase;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.baosight.iplat4j.core.util.StringUtils; import com.baosight.iplat4j.core.util.StringUtils;
/** /**
* THpkc007 * Project: <br>
* * Title:THpkc007.java <br>
*/ * Description: <br>
*
* Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
*
* @version 1.0
* @history 2024-01-24 11:37:39 create
*/
public class HPKC007 extends DaoEPBase { public class HPKC007 extends DaoEPBase {
private Integer id = 0; private static final long serialVersionUID = 1L;
public static final String FIELD_ID = "id";
public static final String FIELD_COMPANY_CODE = "companyCode"; /* 企业编码 预留*/
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码 预留*/
public static final String FIELD_RECEIPT_DATE = "receiptDate"; /* 单据日期*/
public static final String FIELD_OTHER_OUTER_NO = "otherOuterNo"; /* 其他出库单号*/
public static final String FIELD_WH_CODE = "whCode"; /* 仓库编码*/
public static final String FIELD_WH_NAME = "whName"; /* 仓库名称*/
public static final String FIELD_INVENT_TYPE = "inventType"; /* 物料类型*/
public static final String FIELD_INVENT_CODE = "inventCode"; /* 物料编码*/
public static final String FIELD_INVENT_NAME = "inventName"; /* 物料名称*/
public static final String FIELD_INVENT_RECORD_ID = "inventRecordId"; /* 规格*/
public static final String FIELD_AMOUNT = "amount"; /* 数量*/
public static final String FIELD_WEIGHT = "weight"; /* 重量*/
public static final String FIELD_STATUS = "status"; /* 状态 0审核 1保存*/
public static final String FIELD_KC_ID = "kcId"; /* 库存ID*/
public static final String FIELD_REMARK = "remark"; /* 备注*/
public static final String FIELD_CREATED_BY = "createdBy"; /* 创建人*/
public static final String FIELD_CREATED_NAME = "createdName"; /* 创建人名称*/
public static final String FIELD_CREATED_TIME = "createdTime"; /* 创建时间*/
public static final String FIELD_UPDATED_BY = "updatedBy"; /* 更新人*/
public static final String FIELD_UPDATED_NAME = "updatedName"; /* 更新人名称*/
public static final String FIELD_UPDATED_TIME = "updatedTime"; /* 更新时间*/
public static final String COL_ID = "ID";
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码 预留*/
public static final String COL_RECEIPT_DATE = "RECEIPT_DATE"; /* 单据日期*/
public static final String COL_OTHER_OUTER_NO = "OTHER_OUTER_NO"; /* 其他出库单号*/
public static final String COL_WH_CODE = "WH_CODE"; /* 仓库编码*/
public static final String COL_WH_NAME = "WH_NAME"; /* 仓库名称*/
public static final String COL_INVENT_TYPE = "INVENT_TYPE"; /* 物料类型*/
public static final String COL_INVENT_CODE = "INVENT_CODE"; /* 物料编码*/
public static final String COL_INVENT_NAME = "INVENT_NAME"; /* 物料名称*/
public static final String COL_INVENT_RECORD_ID = "INVENT_RECORD_ID"; /* 规格*/
public static final String COL_AMOUNT = "AMOUNT"; /* 数量*/
public static final String COL_WEIGHT = "WEIGHT"; /* 重量*/
public static final String COL_STATUS = "STATUS"; /* 状态 0审核 1保存*/
public static final String COL_KC_ID = "KC_ID"; /* 库存ID*/
public static final String COL_REMARK = "REMARK"; /* 备注*/
public static final String COL_CREATED_BY = "CREATED_BY"; /* 创建人*/
public static final String COL_CREATED_NAME = "CREATED_NAME"; /* 创建人名称*/
public static final String COL_CREATED_TIME = "CREATED_TIME"; /* 创建时间*/
public static final String COL_UPDATED_BY = "UPDATED_BY"; /* 更新人*/
public static final String COL_UPDATED_NAME = "UPDATED_NAME"; /* 更新人名称*/
public static final String COL_UPDATED_TIME = "UPDATED_TIME"; /* 更新时间*/
public static final String QUERY = "HPKC007.query";
public static final String COUNT = "HPKC007.count";
public static final String INSERT = "HPKC007.insert";
public static final String UPDATE = "HPKC007.update";
public static final String DELETE = "HPKC007.delete";
private Integer id = null;
private String companyCode = " "; /* 企业编码 预留*/ private String companyCode = " "; /* 企业编码 预留*/
private String depCode = " "; /* 部门编码 预留*/ private String depCode = " "; /* 部门编码 预留*/
private Date receiptTime ; /* 单据日期*/ private String receiptDate = " "; /* 单据日期*/
private String otherEnthouse = " "; /* 其他入库单号*/ private String otherOuterNo = " "; /* 其他出库单号*/
private String whCode = " "; /* 仓库编码*/ private String whCode = " "; /* 仓库编码*/
private String whName = " "; /* 仓库名称*/ private String whName = " "; /* 仓库名称*/
private String matType = " "; /* 物料类型*/ private String inventType = " "; /* 物料类型*/
private String matCode = " "; /* 物料编码*/ private String inventCode = " "; /* 物料编码*/
private String matName = " "; /* 物料名称*/ private String inventName = " "; /* 物料名称*/
private BigDecimal amount = new BigDecimal("0"); /* 数量*/ private Long inventRecordId = null; /* 规格*/
private BigDecimal weight = new BigDecimal("0"); /* 重量*/ private BigDecimal amount = new BigDecimal(0.00); /* 数量*/
private int status; /* 状态 0审核 1保存*/ private BigDecimal weight = new BigDecimal(0.00); /* 重量*/
private Integer status; /* 状态 0审核 1保存*/
private Long kcId = new Long(0); /* 库存ID*/
private String remark = " "; /* 备注*/ private String remark = " "; /* 备注*/
/** private String createdBy = " "; /* 创建人*/
* initialize the metadata private String createdName = " "; /* 创建人名称*/
*/ private String createdTime = " "; /* 创建时间*/
public void initMetaData() { private String updatedBy = " "; /* 更新人*/
EiColumn eiColumn; private String updatedName = " "; /* 更新人名称*/
private String updatedTime = " "; /* 更新时间*/
/**
* initialize the metadata.
*/
public void initMetaData() {
EiColumn eiColumn;
eiColumn = new EiColumn("id"); eiColumn = new EiColumn(FIELD_ID);
eiColumn.setPrimaryKey(true); eiColumn.setPrimaryKey(true);
eiColumn.setDescName(" "); eiColumn.setDescName(" ");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("companyCode"); eiColumn = new EiColumn(FIELD_COMPANY_CODE);
eiColumn.setDescName("企业编码 预留"); eiColumn.setDescName("企业编码 预留");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("depCode"); eiColumn = new EiColumn(FIELD_DEP_CODE);
eiColumn.setDescName("部门编码 预留"); eiColumn.setDescName("部门编码 预留");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("receiptTime"); eiColumn = new EiColumn(FIELD_RECEIPT_DATE);
eiColumn.setDescName("单据日期"); eiColumn.setDescName("单据日期");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("otherEnthouse"); eiColumn = new EiColumn(FIELD_OTHER_OUTER_NO);
eiColumn.setDescName("其他入库单号"); eiColumn.setDescName("其他出库单号");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("whCode"); eiColumn = new EiColumn(FIELD_WH_CODE);
eiColumn.setDescName("仓库编码"); eiColumn.setDescName("仓库编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("whName"); eiColumn = new EiColumn(FIELD_WH_NAME);
eiColumn.setDescName("仓库名称"); eiColumn.setDescName("仓库名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("matType"); eiColumn = new EiColumn(FIELD_INVENT_TYPE);
eiColumn.setDescName("物料类型"); eiColumn.setDescName("物料类型");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("matCode"); eiColumn = new EiColumn(FIELD_INVENT_CODE);
eiColumn.setDescName("物料编码"); eiColumn.setDescName("物料编码");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("matName"); eiColumn = new EiColumn(FIELD_INVENT_NAME);
eiColumn.setDescName("物料名称"); eiColumn.setDescName("物料名称");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("amount"); eiColumn = new EiColumn(FIELD_AMOUNT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(2); eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10); eiColumn.setFieldLength(10);
eiColumn.setDescName("数量"); eiColumn.setDescName("数量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("weight"); eiColumn = new EiColumn(FIELD_WEIGHT);
eiColumn.setType("N"); eiColumn.setType("N");
eiColumn.setScaleLength(2); eiColumn.setScaleLength(2);
eiColumn.setFieldLength(10); eiColumn.setFieldLength(10);
eiColumn.setDescName("重量"); eiColumn.setDescName("重量");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("status"); eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态 0审核 1保存"); eiColumn.setDescName("状态 0审核 1保存");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("remark"); eiColumn = new EiColumn(FIELD_KC_ID);
eiColumn.setDescName("库存ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_REMARK);
eiColumn.setDescName("备注"); eiColumn.setDescName("备注");
eiMetadata.addMeta(eiColumn); eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY);
eiColumn.setDescName("创建人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_NAME);
eiColumn.setDescName("创建人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_TIME);
eiColumn.setDescName("创建时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_BY);
eiColumn.setDescName("更新人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_NAME);
eiColumn.setDescName("更新人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_TIME);
eiColumn.setDescName("更新时间");
eiMetadata.addMeta(eiColumn);
}
/** }
* the constructor
*/ /**
public HPKC007() { * the constructor.
initMetaData(); */
} public HPKC007() {
initMetaData();
}
/** /**
* get the id * get the id .
* @return the id * @return the id
*/ */
public Integer getId() { public Integer getId() {
...@@ -122,13 +213,15 @@ initMetaData(); ...@@ -122,13 +213,15 @@ initMetaData();
} }
/** /**
* set the id * set the id .
*
* @param id
*/ */
public void setId(Integer id) { public void setId(Integer id) {
this.id = id; this.id = id;
} }
/** /**
* get the companyCode - 企业编码 预留 * get the companyCode - 企业编码 预留.
* @return the companyCode * @return the companyCode
*/ */
public String getCompanyCode() { public String getCompanyCode() {
...@@ -136,13 +229,15 @@ initMetaData(); ...@@ -136,13 +229,15 @@ initMetaData();
} }
/** /**
* set the companyCode - 企业编码 预留 * set the companyCode - 企业编码 预留.
*
* @param companyCode - 企业编码 预留
*/ */
public void setCompanyCode(String companyCode) { public void setCompanyCode(String companyCode) {
this.companyCode = companyCode; this.companyCode = companyCode;
} }
/** /**
* get the depCode - 部门编码 预留 * get the depCode - 部门编码 预留.
* @return the depCode * @return the depCode
*/ */
public String getDepCode() { public String getDepCode() {
...@@ -150,41 +245,47 @@ initMetaData(); ...@@ -150,41 +245,47 @@ initMetaData();
} }
/** /**
* set the depCode - 部门编码 预留 * set the depCode - 部门编码 预留.
*
* @param depCode - 部门编码 预留
*/ */
public void setDepCode(String depCode) { public void setDepCode(String depCode) {
this.depCode = depCode; this.depCode = depCode;
} }
/** /**
* get the receiptTime - 单据日期 * get the receiptDate - 单据日期.
* @return the receiptTime * @return the receiptDate
*/ */
public Date getReceiptTime() { public String getReceiptDate() {
return this.receiptTime; return this.receiptDate;
} }
/** /**
* set the receiptTime - 单据日期 * set the receiptDate - 单据日期.
*
* @param receiptDate - 单据日期
*/ */
public void setReceiptTime(Date receiptTime) { public void setReceiptDate(String receiptDate) {
this.receiptTime = receiptTime; this.receiptDate = receiptDate;
} }
/** /**
* get the otherEnthouse - 其他入库单号 * get the otherOuterNo - 其他出库单号.
* @return the otherEnthouse * @return the otherOuterNo
*/ */
public String getOtherEnthouse() { public String getOtherOuterNo() {
return this.otherEnthouse; return this.otherOuterNo;
} }
/** /**
* set the otherEnthouse - 其他入库单号 * set the otherOuterNo - 其他出库单号.
*
* @param otherOuterNo - 其他出库单号
*/ */
public void setOtherEnthouse(String otherEnthouse) { public void setOtherOuterNo(String otherOuterNo) {
this.otherEnthouse = otherEnthouse; this.otherOuterNo = otherOuterNo;
} }
/** /**
* get the whCode - 仓库编码 * get the whCode - 仓库编码.
* @return the whCode * @return the whCode
*/ */
public String getWhCode() { public String getWhCode() {
...@@ -192,13 +293,15 @@ initMetaData(); ...@@ -192,13 +293,15 @@ initMetaData();
} }
/** /**
* set the whCode - 仓库编码 * set the whCode - 仓库编码.
*
* @param whCode - 仓库编码
*/ */
public void setWhCode(String whCode) { public void setWhCode(String whCode) {
this.whCode = whCode; this.whCode = whCode;
} }
/** /**
* get the whName - 仓库名称 * get the whName - 仓库名称.
* @return the whName * @return the whName
*/ */
public String getWhName() { public String getWhName() {
...@@ -206,55 +309,79 @@ initMetaData(); ...@@ -206,55 +309,79 @@ initMetaData();
} }
/** /**
* set the whName - 仓库名称 * set the whName - 仓库名称.
*
* @param whName - 仓库名称
*/ */
public void setWhName(String whName) { public void setWhName(String whName) {
this.whName = whName; this.whName = whName;
} }
/** /**
* get the matType - 物料类型 * get the inventType - 物料类型.
* @return the matType * @return the inventType
*/
public String getInventType() {
return this.inventType;
}
/**
* set the inventType - 物料类型.
*
* @param inventType - 物料类型
*/
public void setInventType(String inventType) {
this.inventType = inventType;
}
/**
* get the inventCode - 物料编码.
* @return the inventCode
*/ */
public String getMatType() { public String getInventCode() {
return this.matType; return this.inventCode;
} }
/** /**
* set the matType - 物料类型 * set the inventCode - 物料编码.
*
* @param inventCode - 物料编码
*/ */
public void setMatType(String matType) { public void setInventCode(String inventCode) {
this.matType = matType; this.inventCode = inventCode;
} }
/** /**
* get the matCode - 物料编码 * get the inventName - 物料名称.
* @return the matCode * @return the inventName
*/ */
public String getMatCode() { public String getInventName() {
return this.matCode; return this.inventName;
} }
/** /**
* set the matCode - 物料编码 * set the inventName - 物料名称.
*
* @param inventName - 物料名称
*/ */
public void setMatCode(String matCode) { public void setInventName(String inventName) {
this.matCode = matCode; this.inventName = inventName;
} }
/** /**
* get the matName - 物料名称 * get the inventRecordId - 规格.
* @return the matName * @return the inventRecordId
*/ */
public String getMatName() { public Long getInventRecordId() {
return this.matName; return this.inventRecordId;
} }
/** /**
* set the matName - 物料名称 * set the inventRecordId - 规格.
*
* @param inventRecordId - 规格
*/ */
public void setMatName(String matName) { public void setInventRecordId(Long inventRecordId) {
this.matName = matName; this.inventRecordId = inventRecordId;
} }
/** /**
* get the amount - 数量 * get the amount - 数量.
* @return the amount * @return the amount
*/ */
public BigDecimal getAmount() { public BigDecimal getAmount() {
...@@ -262,13 +389,15 @@ initMetaData(); ...@@ -262,13 +389,15 @@ initMetaData();
} }
/** /**
* set the amount - 数量 * set the amount - 数量.
*
* @param amount - 数量
*/ */
public void setAmount(BigDecimal amount) { public void setAmount(BigDecimal amount) {
this.amount = amount; this.amount = amount;
} }
/** /**
* get the weight - 重量 * get the weight - 重量.
* @return the weight * @return the weight
*/ */
public BigDecimal getWeight() { public BigDecimal getWeight() {
...@@ -276,27 +405,47 @@ initMetaData(); ...@@ -276,27 +405,47 @@ initMetaData();
} }
/** /**
* set the weight - 重量 * set the weight - 重量.
*
* @param weight - 重量
*/ */
public void setWeight(BigDecimal weight) { public void setWeight(BigDecimal weight) {
this.weight = weight; this.weight = weight;
} }
/** /**
* get the status - 状态 0审核 1保存 * get the status - 状态 0审核 1保存.
* @return the status * @return the status
*/ */
public int getStatus() { public Integer getStatus() {
return this.status; return this.status;
} }
/** /**
* set the status - 状态 0审核 1保存 * set the status - 状态 0审核 1保存.
*
* @param status - 状态 0审核 1保存
*/ */
public void setStatus(int status) { public void setStatus(Integer status) {
this.status = status; this.status = status;
} }
/** /**
* get the remark - 备注 * get the kcId - 库存ID.
* @return the kcId
*/
public Long getKcId() {
return this.kcId;
}
/**
* set the kcId - 库存ID.
*
* @param kcId - 库存ID
*/
public void setKcId(Long kcId) {
this.kcId = kcId;
}
/**
* get the remark - 备注.
* @return the remark * @return the remark
*/ */
public String getRemark() { public String getRemark() {
...@@ -304,56 +453,171 @@ initMetaData(); ...@@ -304,56 +453,171 @@ initMetaData();
} }
/** /**
* set the remark - 备注 * set the remark - 备注.
*
* @param remark - 备注
*/ */
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
/** /**
* get the value from Map * get the createdBy - 创建人.
*/ * @return the createdBy
public void fromMap(Map map) { */
public String getCreatedBy() {
setId(NumberUtils.toInteger(StringUtils.toString(map.get("id")), id)); return this.createdBy;
setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("companyCode")), companyCode)); }
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("depCode")), depCode));
setReceiptTime(DateUtils.toDate(StringUtils.toString(map.get("receiptTime"))));
setOtherEnthouse(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("otherEnthouse")), otherEnthouse));
setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("whCode")), whCode));
setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("whName")), whName));
setMatType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("matType")), matType));
setMatCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("matCode")), matCode));
setMatName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("matName")), matName));
setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get("amount")), amount));
setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get("weight")), weight));
setStatus(NumberUtils.toint(StringUtils.toString(map.get("status")), status));
setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("remark")), remark));
}
/** /**
* set the value to Map * set the createdBy - 创建人.
*/ *
public Map toMap() { * @param createdBy - 创建人
*/
Map map = new HashMap(); public void setCreatedBy(String createdBy) {
map.put("id",StringUtils.toString(id, eiMetadata.getMeta("id"))); this.createdBy = createdBy;
map.put("companyCode",StringUtils.toString(companyCode, eiMetadata.getMeta("companyCode"))); }
map.put("depCode",StringUtils.toString(depCode, eiMetadata.getMeta("depCode"))); /**
map.put("receiptTime",StringUtils.toString(receiptTime, eiMetadata.getMeta("receiptTime"))); * get the createdName - 创建人名称.
map.put("otherEnthouse",StringUtils.toString(otherEnthouse, eiMetadata.getMeta("otherEnthouse"))); * @return the createdName
map.put("whCode",StringUtils.toString(whCode, eiMetadata.getMeta("whCode"))); */
map.put("whName",StringUtils.toString(whName, eiMetadata.getMeta("whName"))); public String getCreatedName() {
map.put("matType",StringUtils.toString(matType, eiMetadata.getMeta("matType"))); return this.createdName;
map.put("matCode",StringUtils.toString(matCode, eiMetadata.getMeta("matCode"))); }
map.put("matName",StringUtils.toString(matName, eiMetadata.getMeta("matName")));
map.put("amount",StringUtils.toString(amount, eiMetadata.getMeta("amount")));
map.put("weight",StringUtils.toString(weight, eiMetadata.getMeta("weight")));
map.put("status",StringUtils.toString(status, eiMetadata.getMeta("status")));
map.put("remark",StringUtils.toString(remark, eiMetadata.getMeta("remark")));
return map;
} /**
* set the createdName - 创建人名称.
*
* @param createdName - 创建人名称
*/
public void setCreatedName(String createdName) {
this.createdName = createdName;
}
/**
* get the createdTime - 创建时间.
* @return the createdTime
*/
public String getCreatedTime() {
return this.createdTime;
}
/**
* set the createdTime - 创建时间.
*
* @param createdTime - 创建时间
*/
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
/**
* get the updatedBy - 更新人.
* @return the updatedBy
*/
public String getUpdatedBy() {
return this.updatedBy;
}
/**
* set the updatedBy - 更新人.
*
* @param updatedBy - 更新人
*/
public void setUpdatedBy(String updatedBy) {
this.updatedBy = updatedBy;
}
/**
* get the updatedName - 更新人名称.
* @return the updatedName
*/
public String getUpdatedName() {
return this.updatedName;
}
/**
* set the updatedName - 更新人名称.
*
* @param updatedName - 更新人名称
*/
public void setUpdatedName(String updatedName) {
this.updatedName = updatedName;
}
/**
* get the updatedTime - 更新时间.
* @return the updatedTime
*/
public String getUpdatedTime() {
return this.updatedTime;
}
/**
* set the updatedTime - 更新时间.
*
* @param updatedTime - 更新时间
*/
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
/**
* get the value from Map.
*
* @param map - source data map
*/
@Override
public void fromMap(Map map) {
setId(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_ID)), id));
setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
setReceiptDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_RECEIPT_DATE)), receiptDate));
setOtherOuterNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_OTHER_OUTER_NO)), otherOuterNo));
setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_CODE)), whCode));
setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_WH_NAME)), whName));
setInventType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_TYPE)), inventType));
setInventCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_CODE)), inventCode));
setInventName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INVENT_NAME)), inventName));
setInventRecordId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_INVENT_RECORD_ID)), inventRecordId));
setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
setStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_STATUS)), status));
setKcId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_KC_ID)), kcId));
setRemark(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REMARK)), remark));
setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_NAME)), createdName));
setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_TIME)), createdTime));
setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_BY)), updatedBy));
setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_NAME)), updatedName));
setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_UPDATED_TIME)), updatedTime));
}
/**
* set the value to Map.
*/
@Override
public Map toMap() {
Map map = new HashMap();
map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
map.put(FIELD_RECEIPT_DATE, StringUtils.toString(receiptDate, eiMetadata.getMeta(FIELD_RECEIPT_DATE)));
map.put(FIELD_OTHER_OUTER_NO, StringUtils.toString(otherOuterNo, eiMetadata.getMeta(FIELD_OTHER_OUTER_NO)));
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_INVENT_TYPE, StringUtils.toString(inventType, eiMetadata.getMeta(FIELD_INVENT_TYPE)));
map.put(FIELD_INVENT_CODE, StringUtils.toString(inventCode, eiMetadata.getMeta(FIELD_INVENT_CODE)));
map.put(FIELD_INVENT_NAME, StringUtils.toString(inventName, eiMetadata.getMeta(FIELD_INVENT_NAME)));
map.put(FIELD_INVENT_RECORD_ID, StringUtils.toString(inventRecordId, eiMetadata.getMeta(FIELD_INVENT_RECORD_ID)));
map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
map.put(FIELD_WEIGHT, StringUtils.toString(weight, eiMetadata.getMeta(FIELD_WEIGHT)));
map.put(FIELD_STATUS, StringUtils.toString(status, eiMetadata.getMeta(FIELD_STATUS)));
map.put(FIELD_KC_ID, StringUtils.toString(kcId, eiMetadata.getMeta(FIELD_KC_ID)));
map.put(FIELD_REMARK, StringUtils.toString(remark, eiMetadata.getMeta(FIELD_REMARK)));
map.put(FIELD_CREATED_BY, StringUtils.toString(createdBy, eiMetadata.getMeta(FIELD_CREATED_BY)));
map.put(FIELD_CREATED_NAME, StringUtils.toString(createdName, eiMetadata.getMeta(FIELD_CREATED_NAME)));
map.put(FIELD_CREATED_TIME, StringUtils.toString(createdTime, eiMetadata.getMeta(FIELD_CREATED_TIME)));
map.put(FIELD_UPDATED_BY, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_UPDATED_BY)));
map.put(FIELD_UPDATED_NAME, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_UPDATED_NAME)));
map.put(FIELD_UPDATED_TIME, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_UPDATED_TIME)));
return map;
}
} }
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC006.java
...@@ -197,8 +197,8 @@ public class ServiceHPKC006 extends ServiceBase { ...@@ -197,8 +197,8 @@ public class ServiceHPKC006 extends ServiceBase {
DaoUtils.update(HPKC006.DELETE, fKc006); DaoUtils.update(HPKC006.DELETE, fKc006);
// 修改库存 // 修改库存
HPKC006 dbKc006 = mapKc006.get(fKc006.getOtherEnterNo()); HPKC006 dbKc006 = mapKc006.get(fKc006.getOtherEnterNo());
HPKCTools.updateStock(dbKc006.getWhCode(), dbKc006.getInventRecordId(), dbKc006.getAmount(), HPKCTools.updateStock(dbKc006.getWhCode(), dbKc006.getInventRecordId(), dbKc006.getAmount().negate(),
dbKc006.getWeight()); dbKc006.getWeight().negate());
} }
inInfo = this.query(inInfo); inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007.java
package com.baosight.hpjx.hp.kc.service; package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.constant.HPSqlConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC006;
import com.baosight.hpjx.hp.kc.domain.HPKC007; import com.baosight.hpjx.hp.kc.domain.HPKC007;
import com.baosight.hpjx.hp.kc.tools.HPKCTools;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.util.AssertUtils;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.ObjectUtils;
import com.baosight.hpjx.util.StringUtil;
import com.baosight.iplat4j.core.ei.EiBlock; import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.impl.ServiceBase; import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import org.apache.commons.collections.MapUtils;
import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -27,6 +45,10 @@ public class ServiceHPKC007 extends ServiceBase { ...@@ -27,6 +45,10 @@ public class ServiceHPKC007 extends ServiceBase {
*/ */
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
try { try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC007().eiMetadata); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC007().eiMetadata);
} catch (PlatException e) { } catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败"); LogUtils.setDetailMsg(inInfo, e, "初始化失败");
...@@ -35,96 +57,162 @@ public class ServiceHPKC007 extends ServiceBase { ...@@ -35,96 +57,162 @@ public class ServiceHPKC007 extends ServiceBase {
} }
/** /**
* 查询操作. * 查询操作
*
* @param inInfo
* @return
*/ */
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/ try {
EiInfo outInfo = super.query(inInfo, "HPKC007.query", new HPKC007()); Map queryRow = EiInfoUtils.getFirstRow(inInfo);
return outInfo; String receiptDate = MapUtils.getString(queryRow, "receiptDate");
queryRow.put("receiptDate", StringUtil.removeSpecifiedCharacter(receiptDate,
StringUtil.DEFAULT_CHARACTER_TO_BE_REMOVED));
inInfo = super.query(inInfo, HPKC007.QUERY, new HPKC006());
List sum = dao.query(HPSqlConstant.HPKC006.QUERY_SUM, queryRow);
inInfo.getBlock(EiConstant.resultBlock).set(EiConstant.COLUMN_TOTAL_SUM, sum.get(0));
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
return inInfo;
} }
/** /**
* 新增操作. * 新增操作
* @param inInfo
* @return
*/ */
@Override @Override
public EiInfo insert(EiInfo inInfo) { public EiInfo insert(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try { try {
HPKC007 hpkc007 = new HPKC007(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock); // 数据校验
this.checkSaveData(resultRows);
// 数据写入
for (int i = 0; i < eiBlock.getRowCount(); i++) { for (int i = 0; i < resultRows.size(); i++) {
Map<?, ?> map = eiBlock.getRow(i); HPKC007 fKc007 = new HPKC007();
hpkc007.fromMap(map); fKc007.fromMap(resultRows.get(i));
// 设置基础信息
this.dao.insert("HPKC007.insert", hpkc007.toMap()); this.setBaseInfo(fKc007);
// 生成出库单号
fKc007.setOtherOuterNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.OTHER_OUTER_NO));
DaoUtils.insert(HPKC007.INSERT, fKc007);
// 修改库存
HPKCTools.updateStock(fKc007.getWhCode(), fKc007.getInventRecordId(), fKc007.getAmount().negate(),
fKc007.getWeight().negate());
} }
inInfo.setStatus(EiConstant.STATUS_SUCCESS); inInfo = this.query(inInfo);
inInfo.setMsg("新增成功！"); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
} catch (PlatException e) { } catch (Exception e) {
e.printStackTrace(); LogUtils.setDetailMsg(inInfo, e, "新增失败");
inInfo.setStatus(EiConstant.STATUS_FAILURE);
inInfo.setMsg("新增失败！原因参见详细错误描述！");
inInfo.setDetailMsg(e.getMessage());
logError("新增失败", e.getMessage());
return inInfo;
} }
return inInfo; return inInfo;
} }
/** /**
* 修改操作. * 修改操作
*
* @param inInfo
* @return
*/ */
public EiInfo update(EiInfo inInfo) { public EiInfo update(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try { try {
HPKC007 hpkc007 = new HPKC007(); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock); // 数据校验
for (int i = 0; i < eiBlock.getRowCount(); i++) { this.checkSaveData(resultRows);
Map<?, ?> map = eiBlock.getRow(i); // 入库单号
hpkc007.fromMap(map); List<String> otherOuterNos = ObjectUtils.listKey(resultRows, "otherOuterNo");
// 锁记录
this.dao.update("HPKC007.update", hpkc007.toMap()); HPKCTools.lockKc007(otherOuterNos);
// 查询数据库记录
Map<String, HPKC007> mapKc007 = HPKCTools.mapKc007(otherOuterNos);
for (int i = 0; i < resultRows.size(); i++) {
HPKC007 fKc007 = new HPKC007();
fKc007.fromMap(resultRows.get(i));
// 设置基础信息
this.setBaseInfo(fKc007);
DaoUtils.update(HPKC007.UPDATE, fKc007);
// 计算差异数量与重量
HPKC007 dbKc007 = mapKc007.get(fKc007.getOtherOuterNo());
BigDecimal diffAmount = fKc007.getAmount().subtract(dbKc007.getAmount());
BigDecimal diffWeight = fKc007.getWeight().subtract(dbKc007.getWeight());
// 修改库存
HPKCTools.updateStock(fKc007.getWhCode(), fKc007.getInventRecordId(), diffAmount.negate(),
diffWeight.negate());
} }
inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_SUCCESS); inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsg("修改成功！"); inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据修改成功!");
} catch (PlatException e) { } catch (PlatException e) {
inInfo.setStatus(EiConstant.STATUS_FAILURE); LogUtils.setDetailMsg(inInfo, e, "修改失败");
inInfo.setMsg("操作失败！原因参见详细错误描述！"); }
inInfo.setDetailMsg(e.getMessage());
logError("修改失败", e.getMessage());
return inInfo; return inInfo;
} }
return query(inInfo);
/**
* 校验保存的数据
*
* @param resultRows
*/
private void checkSaveData(List<Map> resultRows) {
for (int i = 0; i < resultRows.size(); i++) {
HPKC007 fKc007 = new HPKC007();
fKc007.fromMap(resultRows.get(i));
AssertUtils.isEmpty(fKc007.getWhCode(), "仓库名称不能为空");
AssertUtils.isNull(fKc007.getInventCode(), "存货名称不能为空");
AssertUtils.isNull(fKc007.getInventRecordId(), "规格不能为空");
AssertUtils.isGt(BigDecimal.ZERO, fKc007.getAmount(), "数量必须大于0");
AssertUtils.isGt(BigDecimal.ZERO, fKc007.getWeight(), "重量必须大于0");
}
} }
/** /**
* 删除操作. * 设置基础信息
*
* @param fKc007
*/ */
public EiInfo delete(EiInfo eiInfo) { private void setBaseInfo(HPKC007 fKc007) {
HPKC007 hpkc007 = new HPKC007(); // 去除日期字符串中的-
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock); fKc007.setReceiptDate(StringUtil.removeHorizontalLine(fKc007.getReceiptDate()));
try { // 仓库名称
for (int i = 0; i < eiBlock.getRowCount(); i++) { fKc007.setWhName(HPPZTools.getPz007ByCode(fKc007.getWhCode()).getWhName());
Map<?, ?> map = eiBlock.getRow(i); // 物料名称
hpkc007.fromMap(map); fKc007.setInventName(HPPZTools.getPz004ByCode(fKc007.getInventCode()).getInventName());
}
this.dao.delete("HPKC007.delete", hpkc007.toMap()); /**
* 删除操作
*
* @param inInfo
* @return
*/
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 入库单号
List<String> otherOuterNos = ObjectUtils.listKey(resultRows, "otherOuterNo");
// 锁记录
HPKCTools.lockKc007(otherOuterNos);
// 查询数据库记录
Map<String, HPKC007> mapKc007 = HPKCTools.mapKc007(otherOuterNos);
for (int i = 0; i < resultRows.size(); i++) {
HPKC007 fKc007 = new HPKC007();
fKc007.fromMap(resultRows.get(i));
DaoUtils.update(HPKC007.DELETE, fKc007);
// 修改库存
HPKC007 dbKc007 = mapKc007.get(fKc007.getOtherOuterNo());
HPKCTools.updateStock(dbKc007.getWhCode(), dbKc007.getInventRecordId(), dbKc007.getAmount(),
dbKc007.getWeight());
} }
} catch (PlatException e) { inInfo = this.query(inInfo);
eiInfo.setStatus(EiConstant.STATUS_FAILURE); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
eiInfo.setMsg("删除失败，原因参见详细错误描述！"); inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
eiInfo.setDetailMsg(e.getMessage()); } catch (Exception e) {
logError("删除失败！", e.getMessage()); LogUtils.setDetailMsg(inInfo, e, "删除失败");
return eiInfo;
} }
return inInfo;
eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("删除成功！");
return eiInfo;
} }
} }
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC009.java
...@@ -325,7 +325,7 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -325,7 +325,7 @@ public class ServiceHPKC009 extends ServiceBase {
List<HPKC007> cItems = dao.query("HPKC007.statDate", queryMap); List<HPKC007> cItems = dao.query("HPKC007.statDate", queryMap);
Map<String, HPKC007> cItemMap = cItems.stream().collect(Collectors.toMap(item -> Map<String, HPKC007> cItemMap = cItems.stream().collect(Collectors.toMap(item ->
item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#" item.getCompanyCode() + "#" + item.getDepCode() + "#" + item.getWhCode() + "#"
+ item.getMatType() + "#" + item.getMatCode(), item -> item)); + item.getInventType() + "#" + item.getInventCode(), item -> item));
// 1.4、期初库存 // 1.4、期初库存
queryMap.put("dateProc", queryMap.get("beforeDate")); queryMap.put("dateProc", queryMap.get("beforeDate"));
queryMap.put("kcType", HPConstant.KcType.QT); queryMap.put("kcType", HPConstant.KcType.QT);
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC010.java
...@@ -180,7 +180,7 @@ public class ServiceHPKC010 extends ServiceBase { ...@@ -180,7 +180,7 @@ public class ServiceHPKC010 extends ServiceBase {
try { try {
checkUpdateStockParam(companyCode,whCode,inventRecordId,amount,weight); checkUpdateStockParam(companyCode,whCode,inventRecordId,amount,weight);
HPKC010 newObj = generatorBaseInfo(companyCode,whCode,inventRecordId,amount,weight); HPKC010 newObj = generatorBaseInfo(companyCode,whCode,inventRecordId,amount,weight);
List<Map> list = dao.query("queryByCondition",new HashMap<String,Object>(){{ List<Map> list = dao.query("HPKC010.queryByCondition",new HashMap<String,Object>(){{
put("companyCode",companyCode); put("companyCode",companyCode);
put("whCode",whCode); put("whCode",whCode);
put("inventRecordId",inventRecordId); put("inventRecordId",inventRecordId);
...@@ -192,7 +192,7 @@ public class ServiceHPKC010 extends ServiceBase { ...@@ -192,7 +192,7 @@ public class ServiceHPKC010 extends ServiceBase {
throw new PlatException("当前库存为空，库存变更数量与重量不能小于等于0！"); throw new PlatException("当前库存为空，库存变更数量与重量不能小于等于0！");
} }
generatorBaseInfo(newObj); generatorBaseInfo(newObj);
DaoUtils.insert("insert",newObj); DaoUtils.insert("HPKC010.insert",newObj);
}else{ }else{
//修改 //修改
HPKC010 oldObj = new HPKC010(); HPKC010 oldObj = new HPKC010();
...@@ -207,7 +207,7 @@ public class ServiceHPKC010 extends ServiceBase { ...@@ -207,7 +207,7 @@ public class ServiceHPKC010 extends ServiceBase {
oldObj.setUpdatedBy(newObj.getUpdatedBy()); oldObj.setUpdatedBy(newObj.getUpdatedBy());
oldObj.setUpdatedName(newObj.getUpdatedName()); oldObj.setUpdatedName(newObj.getUpdatedName());
oldObj.setUpdatedTime(newObj.getUpdatedTime()); oldObj.setUpdatedTime(newObj.getUpdatedTime());
int result = DaoUtils.update("updateStock",oldObj); int result = DaoUtils.update("HPKC010.updateStock",oldObj);
if(result!=1){ if(result!=1){
throw new PlatException("库存更新失败，库存已发生变更或系统异常，请重试！"); throw new PlatException("库存更新失败，库存已发生变更或系统异常，请重试！");
} }
......
src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC007.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<!-- table information
Generate time : 2024-01-10 14:03:35
Version : 1.0
tableName :hpjx.t_hpkc007
ID INTEGER NOT NULL primarykey,
COMPANY_CODE VARCHAR NOT NULL,
DEP_CODE VARCHAR NOT NULL,
RECEIPT_TIME DATETIME,
OTHER_ENTHOUSE VARCHAR NOT NULL,
WH_CODE VARCHAR NOT NULL,
WH_NAME VARCHAR NOT NULL,
MAT_TYPE VARCHAR NOT NULL,
MAT_CODE VARCHAR NOT NULL,
MAT_NAME VARCHAR NOT NULL,
AMOUNT DECIMAL NOT NULL,
WEIGHT DECIMAL NOT NULL,
STATUS TINYINT NOT NULL,
REMARK VARCHAR
-->
<sqlMap namespace="HPKC007"> <sqlMap namespace="HPKC007">
<select id="query" parameterClass="java.util.HashMap" <sql id="column">
resultClass="com.baosight.hpjx.hp.kc.domain.HPKC007">
SELECT
ID as "id", ID as "id",
COMPANY_CODE as "companyCode", <!-- 企业编码 预留 --> COMPANY_CODE as "companyCode", <!-- 企业编码 预留 -->
DEP_CODE as "depCode", <!-- 部门编码 预留 --> DEP_CODE as "depCode", <!-- 部门编码 预留 -->
RECEIPT_TIME as "receiptTime", <!-- 单据日期 --> RECEIPT_DATE as "receiptDate", <!-- 单据日期 -->
OTHER_ENTHOUSE as "otherEnthouse", <!-- 其他入库单号 --> OTHER_OUTER_NO as "otherOuterNo", <!-- 其他出库单号 -->
WH_CODE as "whCode", <!-- 仓库编码 --> WH_CODE as "whCode", <!-- 仓库编码 -->
WH_NAME as "whName", <!-- 仓库名称 --> WH_NAME as "whName", <!-- 仓库名称 -->
MAT_TYPE as "matType", <!-- 物料类型 --> INVENT_TYPE as "inventType", <!-- 物料类型 -->
MAT_CODE as "matCode", <!-- 物料编码 --> INVENT_CODE as "inventCode", <!-- 物料编码 -->
MAT_NAME as "matName", <!-- 物料名称 --> INVENT_NAME as "inventName", <!-- 物料名称 -->
AMOUNT as "amount", <!-- 数量 --> AMOUNT as "amount", <!-- 数量 -->
WEIGHT as "weight", <!-- 重量 --> WEIGHT as "weight", <!-- 重量 -->
STATUS as "status", <!-- 状态 0审核 1保存 --> STATUS as "status", <!-- 状态 0审核 1保存 -->
REMARK as "remark" <!-- 备注 --> KC_ID as "kcId", <!-- 库存ID -->
FROM hpjx.t_hpkc007 WHERE 1=1 REMARK as "remark", <!-- 备注 -->
<isNotEmpty prepend=" AND " property="receiptTime"> CREATED_BY as "createdBy", <!-- 创建人 -->
RECEIPT_TIME = #receiptTime# CREATED_NAME as "createdName", <!-- 创建人名称 -->
</isNotEmpty> CREATED_TIME as "createdTime", <!-- 创建时间 -->
UPDATED_BY as "updatedBy", <!-- 更新人 -->
UPDATED_NAME as "updatedName", <!-- 更新人名称 -->
<isNotEmpty prepend=" AND " property="otherEnthouse"> UPDATED_TIME as "updatedTime" <!-- 更新时间 -->
OTHER_ENTHOUSE LIKE CONCAT('%',CONCAT(#otherEnthouse#,'%')) </sql>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="whName">
WH_NAME = LIKE CONCAT('%',CONCAT(#whName#,'%'))
</isNotEmpty>
<isNotEmpty prepend=" AND " property="status">
STATUS = #status#
</isNotEmpty>
<dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy">
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
</isEmpty>
</dynamic>
</select>
<select id="count" resultClass="int">
SELECT COUNT(*) FROM hpjx.t_hpkc007 WHERE 1=1
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
</select>
<!-- <sql id="condition">
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
ID = #id# ID = #id#
</isNotEmpty> </isNotEmpty>
...@@ -84,11 +36,11 @@ ...@@ -84,11 +36,11 @@
<isNotEmpty prepend=" AND " property="depCode"> <isNotEmpty prepend=" AND " property="depCode">
DEP_CODE = #depCode# DEP_CODE = #depCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="receiptTime"> <isNotEmpty prepend=" AND " property="receiptDate">
RECEIPT_TIME = #receiptTime# RECEIPT_DATE = #receiptDate#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="otherEnthouse"> <isNotEmpty prepend=" AND " property="otherOuterNo">
OTHER_ENTHOUSE = #otherEnthouse# OTHER_OUTER_NO = #otherOuterNo#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="whCode"> <isNotEmpty prepend=" AND " property="whCode">
WH_CODE = #whCode# WH_CODE = #whCode#
...@@ -96,71 +48,110 @@ ...@@ -96,71 +48,110 @@
<isNotEmpty prepend=" AND " property="whName"> <isNotEmpty prepend=" AND " property="whName">
WH_NAME = #whName# WH_NAME = #whName#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="matType"> <isNotEmpty prepend=" AND " property="inventType">
MAT_TYPE = #matType# INVENT_TYPE = #inventType#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="matCode">
MAT_CODE = #matCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="matName">
MAT_NAME = #matName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="amount">
AMOUNT = #amount#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="weight"> <isNotEmpty prepend=" AND " property="inventCode">
WEIGHT = #weight# INVENT_CODE = #inventCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="status"> <isNotEmpty prepend=" AND " property="inventName">
STATUS = #status# INVENT_NAME = #inventName#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="remark"> </sql>
REMARK = #remark#
<sql id="customCondition">
<isNotEmpty prepend=" AND " property="otherOuterNos">
OTHER_OUTER_NO IN <iterate close=")" open="(" conjunction="," property="otherOuterNos">#otherOuterNos[]#</iterate>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="spec">
<isEqual property="spec" compareValue="无规格">
INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = '')
</isEqual>
<isNotEqual property="spec" compareValue="无规格">
INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
</isNotEqual>
</isNotEmpty>
</sql>
<sql id="order">
<dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy">
$orderBy$
</isNotEmpty> </isNotEmpty>
--> <isEmpty property="orderBy">
ID asc
</isEmpty>
</dynamic>
</sql>
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.hpjx.hp.kc.domain.HPKC007">
SELECT
<include refid="column"/>
FROM hpjx.t_hpkc007
WHERE 1=1
<include refid="condition"/>
<include refid="customCondition"/>
<include refid="order"/>
</select>
<select id="count" resultClass="int">
SELECT COUNT(*) FROM hpjx.t_hpkc007 WHERE 1=1
<include refid="condition"/>
<include refid="customCondition"/>
</select>
<!-- 查询统计 -->
<select id="querySum" resultClass="com.baosight.hpjx.hp.kc.domain.HPKC007">
SELECT
COALESCE(SUM(AMOUNT), 0) AS "amount", <!-- 数量 -->
COALESCE(SUM(WEIGHT), 0) AS "weight" <!-- 重量 -->
FROM ${hpjxSchema}.T_HPKC007
WHERE 1=1
<include refid="condition"/>
<include refid="customCondition"/>
</select>
<insert id="insert"> <insert id="insert">
INSERT INTO hpjx.t_hpkc007 (ID, INSERT INTO ${hpjxSchema}.T_HPKC007 (
COMPANY_CODE, <!-- 企业编码 预留 --> COMPANY_CODE, <!-- 企业编码 预留 -->
DEP_CODE, <!-- 部门编码 预留 --> DEP_CODE, <!-- 部门编码 预留 -->
RECEIPT_TIME, <!-- 单据日期 --> RECEIPT_DATE, <!-- 单据日期 -->
OTHER_ENTHOUSE, <!-- 其他入库单号 --> OTHER_OUTER_NO, <!-- 其他出库单号 -->
WH_CODE, <!-- 仓库编码 --> WH_CODE, <!-- 仓库编码 -->
WH_NAME, <!-- 仓库名称 --> WH_NAME, <!-- 仓库名称 -->
MAT_TYPE, <!-- 物料类型 --> INVENT_TYPE, <!-- 物料类型 -->
MAT_CODE, <!-- 物料编码 --> INVENT_CODE, <!-- 物料编码 -->
MAT_NAME, <!-- 物料名称 --> INVENT_NAME, <!-- 物料名称 -->
AMOUNT, <!-- 数量 --> AMOUNT, <!-- 数量 -->
WEIGHT, <!-- 重量 --> WEIGHT, <!-- 重量 -->
STATUS, <!-- 状态 0审核 1保存 --> KC_ID, <!-- 库存ID -->
REMARK <!-- 备注 --> REMARK, <!-- 备注 -->
CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME <!-- 创建时间 -->
) VALUES (
#companyCode#, #depCode#, #receiptDate#, #otherOuterNo#, #whCode#, #whName#,
#inventType#, #inventCode#, #inventName#, #amount#, #weight#,
#kcId#, #remark#, #createdBy#, #createdName#, #createdTime#
) )
VALUES (#id#, #companyCode#, #depCode#, #receiptTime#, #otherEnthouse#, #whCode#, #whName#, #matType#, #matCode#, #matName#, #amount#, #weight#, #status#, #remark#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
DELETE FROM hpjx.t_hpkc007 WHERE DELETE FROM hpjx.t_hpkc007 WHERE ID = #id#
ID = #id#
</delete> </delete>
<update id="update"> <update id="update">
UPDATE hpjx.t_hpkc007 UPDATE ${hpjxSchema}.T_HPKC007
SET SET
COMPANY_CODE = #companyCode#, <!-- 企业编码 预留 --> RECEIPT_DATE = #receiptDate#, <!-- 单据日期 -->
DEP_CODE = #depCode#, <!-- 部门编码 预留 -->
RECEIPT_TIME = #receiptTime#, <!-- 单据日期 -->
OTHER_ENTHOUSE = #otherEnthouse#, <!-- 其他入库单号 -->
WH_CODE = #whCode#, <!-- 仓库编码 -->
WH_NAME = #whName#, <!-- 仓库名称 -->
MAT_TYPE = #matType#, <!-- 物料类型 -->
MAT_CODE = #matCode#, <!-- 物料编码 -->
MAT_NAME = #matName#, <!-- 物料名称 -->
AMOUNT = #amount#, <!-- 数量 --> AMOUNT = #amount#, <!-- 数量 -->
WEIGHT = #weight#, <!-- 重量 --> WEIGHT = #weight#, <!-- 重量 -->
STATUS = #status#, <!-- 状态 0审核 1保存 --> REMARK = #remark#, <!-- 备注 -->
REMARK = #remark# <!-- 备注 --> UPDATED_BY = #updatedBy#, <!-- 更新人 -->
WHERE UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
ID = #id# UPDATED_TIME = #updatedTime# <!-- 更新时间 -->
WHERE ID = #id#
</update> </update>
<!-- 统计库存 --> <!-- 统计库存 -->
...@@ -169,8 +160,8 @@ ...@@ -169,8 +160,8 @@
COMPANY_CODE AS "companyCode", COMPANY_CODE AS "companyCode",
DEP_CODE AS "depCode", DEP_CODE AS "depCode",
WH_CODE AS "whCode", WH_CODE AS "whCode",
MAT_TYPE AS "matType", INVENT_TYPE AS "inventType",
MAT_CODE AS "matCode", INVENT_CODE AS "inventCode",
COALESCE(SUM(AMOUNT), 0) AS "amount", COALESCE(SUM(AMOUNT), 0) AS "amount",
COALESCE(SUM(WEIGHT), 0) AS "weight" COALESCE(SUM(WEIGHT), 0) AS "weight"
FROM ${hpjxSchema}.T_HPKC004 FROM ${hpjxSchema}.T_HPKC004
...@@ -178,7 +169,7 @@ ...@@ -178,7 +169,7 @@
<isNotEmpty prepend=" AND " property="createdTimeFrom"> <isNotEmpty prepend=" AND " property="createdTimeFrom">
CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo# CREATED_TIME BETWEEN #createdTimeFrom# AND #createdTimeTo#
</isNotEmpty> </isNotEmpty>
GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, MAT_TYPE, MAT_CODE GROUP BY COMPANY_CODE, DEP_CODE, WH_CODE, INVENT_TYPE, INVENT_CODE
</select> </select>
</sqlMap> </sqlMap>
src/main/java/com/baosight/hpjx/hp/kc/tools/HPKCTools.java
...@@ -3,6 +3,7 @@ package com.baosight.hpjx.hp.kc.tools; ...@@ -3,6 +3,7 @@ package com.baosight.hpjx.hp.kc.tools;
import com.baosight.hpjx.core.dao.DaoBase; import com.baosight.hpjx.core.dao.DaoBase;
import com.baosight.hpjx.hp.constant.HPSqlConstant; import com.baosight.hpjx.hp.constant.HPSqlConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC006; import com.baosight.hpjx.hp.kc.domain.HPKC006;
import com.baosight.hpjx.hp.kc.domain.HPKC007;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
...@@ -66,6 +67,50 @@ public class HPKCTools { ...@@ -66,6 +67,50 @@ public class HPKCTools {
} }
/** /**
* 锁
*
* @param otherOuterNos
* @return
*/
public static void lockKc007(List<String> otherOuterNos) {
if (CollectionUtils.isEmpty(otherOuterNos)) {
return;
}
Map queryMap = new HashMap();
queryMap.put("otherOuterNos", otherOuterNos);
DaoBase.getInstance().update(HPSqlConstant.HPKC007.LOCK, queryMap);
}
/**
* 查询其他入库信息
*
* @param otherOuterNos
* @return
*/
public static List<HPKC007> listKc007(List<String> otherOuterNos) {
if (CollectionUtils.isEmpty(otherOuterNos)) {
return null;
}
Map queryMap = new HashMap();
queryMap.put("otherOuterNos", otherOuterNos);
return DaoBase.getInstance().query(HPKC007.QUERY, queryMap);
}
/**
* 查询其他入库信息
*
* @param otherOuterNos
* @return
*/
public static Map<String, HPKC007> mapKc007(List<String> otherOuterNos) {
List<HPKC007> results = listKc007(otherOuterNos);
if (CollectionUtils.isEmpty(results)) {
return null;
}
return results.stream().collect(Collectors.toMap(HPKC007::getOtherOuterNo, item -> item));
}
/**
* 更新库存 * 更新库存
* *
* @param whCode * @param whCode
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ004.java
...@@ -52,7 +52,7 @@ public class ServiceHPPZ004 extends ServiceBase { ...@@ -52,7 +52,7 @@ public class ServiceHPPZ004 extends ServiceBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
try { try {
inInfo = super.query(inInfo, "HPPZ004.query", new HPPZ003()); inInfo = super.query(inInfo, "HPPZ004.query", new HPPZ004());
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败"); LogUtils.setDetailMsg(inInfo, e, "查询失败");
} }
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java
...@@ -3,7 +3,6 @@ package com.baosight.hpjx.hp.pz.service; ...@@ -3,7 +3,6 @@ package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.common.DdynamicEnum; import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant; import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC007;
import com.baosight.hpjx.hp.pz.domain.HPPZ007; import com.baosight.hpjx.hp.pz.domain.HPPZ007;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
...@@ -50,7 +49,7 @@ public class ServiceHPPZ007 extends ServiceBase { ...@@ -50,7 +49,7 @@ public class ServiceHPPZ007 extends ServiceBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
try { try {
inInfo = super.query(inInfo, HPPZ007.QUERY, new HPKC007()); inInfo = super.query(inInfo, HPPZ007.QUERY, new HPPZ007());
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败"); LogUtils.setDetailMsg(inInfo, e, "查询失败");
} }
......
src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ007.xml
...@@ -19,12 +19,6 @@ ...@@ -19,12 +19,6 @@
UPDATED_TIME as "updatedTime" <!-- 修改时间 --> UPDATED_TIME as "updatedTime" <!-- 修改时间 -->
</sql> </sql>
<sql id="customCondition">
<isNotEmpty prepend=" AND " property="whCodes">
WH_CODE IN <iterate close=")" open="(" conjunction="," property="whCodes">#whCodes[]#</iterate>
</isNotEmpty>
</sql>
<sql id="condition"> <sql id="condition">
AND DELETE_FLAG = 0 AND DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="id"> <isNotEmpty prepend=" AND " property="id">
...@@ -53,6 +47,12 @@ ...@@ -53,6 +47,12 @@
</isNotEmpty> </isNotEmpty>
</sql> </sql>
<sql id="customCondition">
<isNotEmpty prepend=" AND " property="whCodes">
WH_CODE IN <iterate close=")" open="(" conjunction="," property="whCodes">#whCodes[]#</iterate>
</isNotEmpty>
</sql>
<sql id="order"> <sql id="order">
<dynamic prepend="ORDER BY"> <dynamic prepend="ORDER BY">
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
......
src/main/java/com/baosight/hpjx/util/AssertUtils.java
...@@ -157,7 +157,7 @@ public class AssertUtils { ...@@ -157,7 +157,7 @@ public class AssertUtils {
* @param message * @param message
*/ */
public static void isGt(BigDecimal a, BigDecimal b, String message) { public static void isGt(BigDecimal a, BigDecimal b, String message) {
if (a.compareTo(b) < 1) { if (a.compareTo(b) == 1) {
throw new PlatException(message); throw new PlatException(message);
} }
} }
......
src/main/java/com/baosight/iplat4j/core/data/ibatis/dao/SqlMapDaoLogProxy.java 0 → 100644
package com.baosight.iplat4j.core.data.ibatis.dao;
import com.baosight.hpjx.core.security.UserSessionUtils;
import com.baosight.hpjx.util.ObjectUtils;
import com.baosight.iplat4j.core.service.soa.DomainQuery.PageStatus;
import com.baosight.iplat4j.core.util.ExceptionUtil;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author:songx
* @date:2024/1/24,9:00
*/
public class SqlMapDaoLogProxy extends SqlMapDao {
public static final String QUERY = "query";
public SqlMapDaoLogProxy() {
}
public List query(String name, Object parameters) {
try {
// 初始化参数
this.initParam(name, parameters);
List ret = super.query(name, parameters);
return ret;
} catch (RuntimeException var4) {
throw var4;
}
}
public List queryAll(String name, Object parameters) {
try {
// 初始化参数
this.initParam(name, parameters);
List ret = super.queryAll(name, parameters);
return ret;
} catch (RuntimeException var4) {
throw var4;
}
}
public List query(String name, Object parameters, int offset, int limit) {
try {
// 初始化参数
this.initParam(name, parameters);
List ret = super.query(name, parameters, offset, limit);
return ret;
} catch (RuntimeException var6) {
throw var6;
}
}
public List query(String name, Object parameters, PageStatus pageStatus) {
int limit = pageStatus.getPageSize();
int offset = pageStatus.getPageNumber() * pageStatus.getPageSize();
try {
List ret = super.query(name, parameters, offset, limit);
return ret;
} catch (RuntimeException var7) {
ExceptionUtil.getRootCauseMessage(var7);
throw var7;
}
}
public int count(String name, Object parameters) {
String var3 = this.autoCount ? "query" : "count";
try {
// 初始化参数
this.initParam(name, parameters);
int ret = super.count(name, parameters);
return ret;
} catch (RuntimeException var5) {
throw var5;
}
}
public void insert(String name, Object object) {
String var3 = "insert";
try {
super.insert(name, object);
} catch (RuntimeException var5) {
throw var5;
}
}
public int update(String name, Object object) {
String var3 = "update";
try {
int ret = super.update(name, object);
return ret;
} catch (RuntimeException var5) {
throw var5;
}
}
public int delete(String name, Object parameters) {
String var3 = "delete";
try {
int ret = super.delete(name, parameters);
return ret;
} catch (RuntimeException var5) {
throw var5;
}
}
public int insertBatch(String name, Collection parameters) {
String operation = "insert";
try {
this.getStatementName(operation, name);
int ret = super.insertBatch(name, parameters);
return ret;
} catch (RuntimeException var5) {
throw var5;
}
}
public int updateBatch(String name, Collection parameters) {
String operation = "update";
try {
this.getStatementName(operation, name);
int ret = super.updateBatch(name, parameters);
return ret;
} catch (RuntimeException var5) {
throw var5;
}
}
public int deleteBatch(String name, Collection parameters) {
String operation = "delete";
try {
this.getStatementName(operation, name);
int ret = super.deleteBatch(name, parameters);
return ret;
} catch (RuntimeException var5) {
throw var5;
}
}
/**
* 初始化参数
*
* @param name
* @param parameters
*/
private void initParam(String name, Object parameters) {
// 查询登录用户信息时不设置企业编码，否则会形成死循环
if ("HPXSUser.query".equals(name)) {
return;
}
if (parameters == null) {
parameters = new HashMap();
}
// 企业编码
((Map) parameters).put("companyCode", UserSessionUtils.getCompanyCode());
// 部门编码
// ((Map) parameters).put("depCode", UserSessionUtils.getDepCode());
}
}
src/main/webapp/HP/KC/HPKC006.js
...@@ -19,29 +19,13 @@ $(function() { ...@@ -19,29 +19,13 @@ $(function() {
return ""; return "";
}, },
editor: function (container, options) { editor: function (container, options) {
var grid = container.closest(".k-grid").data("kendoGrid"); let inInfo = new EiInfo();
var cellIndex = grid.cellIndex(container); inInfo.set("inventType", options.model["inventType"]);
var input = $('<input />'); inInfo.set("serviceName", "HPPZ006");
input.attr("name", options.field); inInfo.set("methodName", "queryMaterialComboBox");
input.attr("id", options.field); inInfo.set("blockId", "material_record_block_id");
input.appendTo(container); inInfo.set("field", options.field);
let eiInfo = new EiInfo(); refreshSelect(container, inInfo);
eiInfo.set("inventType", options.model["inventType"]);
var dataSource;
EiCommunicator.send("HPPZ006", "queryMaterialComboBox", eiInfo, {
onSuccess: function (ei) {
dataSource = ei.getBlock("material_record_block_id").getMappedRows();
},
onFail: function (ei) {
}
}, {async: false});
input.kendoDropDownList({
valuePrimitive: true,
dataTextField: "textField",
dataValueField: "valueField",
dataSource: dataSource,
template: "#=textField#"
});
} }
}, { }, {
field: "inventRecordId", field: "inventRecordId",
...@@ -54,30 +38,13 @@ $(function() { ...@@ -54,30 +38,13 @@ $(function() {
return ""; return "";
}, },
editor: function (container, options) { editor: function (container, options) {
refreshsel let inInfo = new EiInfo();
var grid = container.closest(".k-grid").data("kendoGrid"); inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
var cellIndex = grid.cellIndex(container); inInfo.set("serviceName", "HPPZ006");
var input = $('<input />'); inInfo.set("methodName", "queryComboBoxSpec");
input.attr("name", options.field); inInfo.set("blockId", "invent_spec_block_id");
input.attr("id", options.field); inInfo.set("field", options.field);
input.appendTo(container); refreshSelect(container, inInfo);
let eiInfo = new EiInfo();
eiInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
var dataSource;
EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
onSuccess: function (ei) {
dataSource = ei.getBlock("invent_spec_block_id").getMappedRows();
},
onFail: function (ei) {
}
}, {async: false});
input.kendoDropDownList({
valuePrimitive: true,
dataTextField: "textField",
dataValueField: "valueField",
dataSource: dataSource,
template: "#=textField#"
});
} }
}], }],
loadComplete: function (grid) { loadComplete: function (grid) {
......
src/main/webapp/HP/KC/HPKC007.js
$(function () { var inventNameGlobalData = [];
var specGlobalData = [];
$(function() {
$("#QUERY").on("click", function () { IPLATUI.EFGrid = {
resultGrid.dataSource.page(1); pageable: {
}); pageSize: 20,
pageSizes: [10, 20, 50, 70, 100],
},
"result": {
columns: [{
field: "inventCode",
template: function (dataItem) {
for (let i = 0; i < inventNameGlobalData.length; i++) {
if (inventNameGlobalData[i]['valueField'] === dataItem['inventCode']) {
return inventNameGlobalData[i]['textField'];
}
}
return "";
},
editor: function (container, options) {
let inInfo = new EiInfo();
inInfo.set("inventType", options.model["inventType"]);
inInfo.set("serviceName", "HPPZ006");
inInfo.set("methodName", "queryMaterialComboBox");
inInfo.set("blockId", "material_record_block_id");
inInfo.set("field", options.field);
refreshSelect(container, inInfo);
}
}, {
field: "inventRecordId",
template: function (dataItem) {
for (let i = 0; i < specGlobalData.length; i++) {
if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {
return specGlobalData[i]['textField'];
}
}
return "";
},
editor: function (container, options) {
let inInfo = new EiInfo();
inInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
inInfo.set("serviceName", "HPPZ006");
inInfo.set("methodName", "queryComboBoxSpec");
inInfo.set("blockId", "invent_spec_block_id");
inInfo.set("field", options.field);
refreshSelect(container, inInfo);
}
}],
loadComplete: function (grid) {
}
}
}
// 查询
$("#QUERY").on("click", query);
});
IPLATUI.EFGrid.result = { /**
pageable: { * 页面加载时执行
pageSize: 20, */
pageSizes: [10, 20, 30, 50, 100, 200], $(window).load(function () {
// 存货名称
let eiInfo = new EiInfo();
EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
onSuccess: function (ei) {
inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
}, },
onFail: function (ei) {
} }
}, {async: false});
// 规格
EiCommunicator.send("HPPZ006", "queryComboBoxSpec", eiInfo, {
onSuccess: function (ei) {
specGlobalData = ei.getBlock("invent_spec_block_id").getMappedRows();
},
onFail: function (ei) {
}
}, {async: false});
// 查询
query();
}); });
/**
* 查询
*/
let query = function () {
resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
}
src/main/webapp/HP/KC/HPKC007.jsp
...@@ -4,58 +4,60 @@ ...@@ -4,58 +4,60 @@
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %> <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/> <c:set var="ctx" value="${pageContext.request.contextPath}"/>
<head>
<%-- <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
</head>
<EF:EFPage title="仓库档案">
<EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%> <EF:EFPage title="其他出库单">
<style> <EF:EFRegion id="inqu" title="查询条件">
.row { <div class="row">
display: flex; <EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
justify-content: space-between; role="date" format="yyyy-MM-dd" readonly="true"/>
align-items: center; <EF:EFInput cname="出库单号" ename="inqu_status-0-otherOuterNo" colWidth="3"/>
} <EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
</style> <EF:EFOption label="全部" value=""/>
<div class="row"> <%-- blockId="inqu_status" row="0" --%> <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
<EF:EFDatePicker ename="receiptDate" cname="单据日期" </EF:EFSelect>
format="yyyy-MM-dd" depth="year" /> <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains"
<EF:EFInput blockId="inqu_status" ename="otherEnthouse" cname="其他出库单号" row="0"/> template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#">
<EF:EFInput blockId="inqu_status" ename="whName" cname="仓库名称" row="0"/> <EF:EFOption label="全部" value=""/>
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
<EF:EFSelect cname="单据状态" optionLabel="全部" blockId="inqu_status" ename="status" row="0"> </EF:EFSelect>
<EF:EFOption label="审核" value="1"/> </div>
<EF:EFOption label="反审" value="0"/> <div class="row">
<EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
</div> </div>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="result" title="记录集"> <EF:EFRegion id="result" title="记录集">
<EF:EFGrid blockId="result" autoDraw="no"> <EF:EFGrid blockId="result" autoDraw="no">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="otherOuterNo" cname="出库单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="receiptTime" cname="单据日期"/> <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
<EF:EFColumn ename="otherEnthouse" cname="其他出库单号"/> parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
<EF:EFColumn ename="whCode" cname="仓库编码"/> <EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
<EF:EFColumn ename="whName" cname="仓库名称"/> itemTemplate="#=textField#" blockName="wh_record_block_id"
<EF:EFColumn ename="matType" cname="物料类型"/> textField="textField" valueField="valueField"
<EF:EFColumn ename="matCode" cname="物料编码"/> align="center" filter="contains" required="true">
<EF:EFColumn ename="matName" cname="物料名称"/>
<EF:EFColumn ename="amount" cname="数量"/>
<EF:EFColumn ename="weight" cname="重量"/>
<EF:EFComboColumn align="center" ename="status" cname="操作">
<EF:EFOption label="审核" value="1"/>
<EF:EFOption label="反审" value="0"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="remark" cname="备注"/> <EF:EFComboColumn ename="inventType" cname="存货类型" width="100" align="center" required="true"
columnTemplate="#=valueField#-#=textField#" itemTemplate="#=valueField#-#=textField#">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn>
<EF:EFColumn ename="inventCode" cname="存货名称" width="120" align="center" required="true"/>
<EF:EFColumn ename="inventRecordId" cname="规格" width="120" align="center"/>
<EF:EFColumn ename="amount" cname="数量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all" required="true"/>
<EF:EFColumn ename="weight" cname="重量" format="{0:N3}" maxLength="20" width="100" align="right"
sumType="all" required="true"/>
<EF:EFColumn ename="remark" cname="备注" width="150"/>
<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
<script>
var ctx = "${ctx}";
</script>
<script src="${ctx}/HP/KC/HPKC007.js"></script>
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