Commit 14298a2e by wasx8023

1.其他入库单逻辑关联库存

parent e7f11fa5
...@@ -36,6 +36,8 @@ public class HPConstant { ...@@ -36,6 +36,8 @@ public class HPConstant {
public static final String INVENT_CODE = "INVENT_CODE"; public static final String INVENT_CODE = "INVENT_CODE";
// 仓库编码 // 仓库编码
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";
} }
/** /**
......
...@@ -7,6 +7,20 @@ package com.baosight.hpjx.hp.constant; ...@@ -7,6 +7,20 @@ package com.baosight.hpjx.hp.constant;
public class HPSqlConstant { public class HPSqlConstant {
/** /**
* HPKC006 SQL 定义
*
* @author:songx
* @date:2024/1/20,16:45
*/
public class HPKC006 {
// 查询
public static final String QUERY_SUM = "HPKC006.querySum";
// 锁
public static final String LOCK = "HPKC006.lock";
}
/**
* HPKC009 SQL 定义 * HPKC009 SQL 定义
* *
* @author:songx * @author:songx
......
...@@ -4,13 +4,13 @@ import com.baosight.hpjx.common.DdynamicEnum; ...@@ -4,13 +4,13 @@ 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.HPKC005; import com.baosight.hpjx.hp.kc.domain.HPKC005;
import com.baosight.hpjx.hp.kc.domain.HPKC006;
import com.baosight.hpjx.hp.pz.tools.HPPZTools; import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.util.AssertUtils; import com.baosight.hpjx.util.AssertUtils;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.EiInfoUtils; import com.baosight.hpjx.util.EiInfoUtils;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.StringUtil; import com.baosight.hpjx.util.StringUtil;
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;
...@@ -36,16 +36,16 @@ public class ServiceHPKC005 extends ServiceBase { ...@@ -36,16 +36,16 @@ public class ServiceHPKC005 extends ServiceBase {
* @return * @return
*/ */
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
HPKC005 HPKC005 = new HPKC005(); try {
EiInfo outInfo = super.initLoad(inInfo, HPKC005); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
outInfo.addBlock(EiConstant.queryBlock).setCell(0, "receiptDate", CommonMethod.getCurrentSameYearMonth()); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null);
outInfo.getBlock(EiConstant.resultBlock).getRows().clear(); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null);
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false);
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC006().eiMetadata);
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.MATERIAL_RECORD_BLOCK_ID), null); } catch (PlatException e) {
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.INVENT_SPEC_BLOCK_ID), null); LogUtils.setDetailMsg(inInfo, e, "初始化失败");
CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID), null, false); }
return outInfo; return inInfo;
} }
/** /**
...@@ -169,10 +169,10 @@ public class ServiceHPKC005 extends ServiceBase { ...@@ -169,10 +169,10 @@ public class ServiceHPKC005 extends ServiceBase {
*/ */
public EiInfo update(EiInfo inInfo) { public EiInfo update(EiInfo inInfo) {
try { try {
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock); List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (int i = 0; i < eiBlock.getRowCount(); i++) { for (int i = 0; i < resultRows.size(); i++) {
HPKC005 fKc005 = new HPKC005(); HPKC005 fKc005 = new HPKC005();
fKc005.fromMap(eiBlock.getRow(i)); fKc005.fromMap(resultRows.get(i));
// 设置基础信息 // 设置基础信息
this.setBaseInfo(fKc005); this.setBaseInfo(fKc005);
DaoUtils.update(HPKC005.UPDATE, fKc005); DaoUtils.update(HPKC005.UPDATE, fKc005);
......
package com.baosight.hpjx.hp.kc.service; package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.hp.kc.domain.HPKC007;
import com.baosight.hpjx.util.LogUtils;
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.hpjx.hp.kc.domain.HPKC007;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Map; import java.util.Map;
/**
* 其他出库单
*
* @author:songx
* @date:2024/1/23,21:44
*/
public class ServiceHPKC007 extends ServiceBase { public class ServiceHPKC007 extends ServiceBase {
public EiInfo initLoad(EiInfo inInfo) { /**
HPKC007 hpkc007 = new HPKC007(); * 画面初始化
EiInfo outInfo = super.initLoad(inInfo, hpkc007); *
outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(hpkc007.eiMetadata); * @param inInfo
return inInfo; * @return
} */
public EiInfo initLoad(EiInfo inInfo) {
try {
/** inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC007().eiMetadata);
* 查询操作. } catch (PlatException e) {
*/ LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@Override }
public EiInfo query(EiInfo inInfo) { return inInfo;
/* 调用EI查询方法.*/ }
EiInfo outInfo = super.query(inInfo, "HPKC007.query", new HPKC007());
return outInfo; /**
* 查询操作.
} */
@Override
/** public EiInfo query(EiInfo inInfo) {
* 新增操作. /* 调用EI查询方法.*/
*/ EiInfo outInfo = super.query(inInfo, "HPKC007.query", new HPKC007());
@Override return outInfo;
public EiInfo insert(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); }
try {
HPKC007 hpkc007 = new HPKC007(); /**
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock); * 新增操作.
*/
@Override
for (int i = 0; i < eiBlock.getRowCount(); i++) { public EiInfo insert(EiInfo inInfo) {
Map<?, ?> map = eiBlock.getRow(i); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
hpkc007.fromMap(map); try {
HPKC007 hpkc007 = new HPKC007();
this.dao.insert("HPKC007.insert", hpkc007.toMap()); EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
}
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsg("新增成功!"); for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i);
} catch (PlatException e) { hpkc007.fromMap(map);
e.printStackTrace();
inInfo.setStatus(EiConstant.STATUS_FAILURE); this.dao.insert("HPKC007.insert", hpkc007.toMap());
inInfo.setMsg("新增失败!原因参见详细错误描述!"); }
inInfo.setDetailMsg(e.getMessage()); inInfo.setStatus(EiConstant.STATUS_SUCCESS);
logError("新增失败", e.getMessage()); inInfo.setMsg("新增成功!");
return inInfo;
} } catch (PlatException e) {
return inInfo; e.printStackTrace();
} inInfo.setStatus(EiConstant.STATUS_FAILURE);
inInfo.setMsg("新增失败!原因参见详细错误描述!");
/** inInfo.setDetailMsg(e.getMessage());
* 修改操作. logError("新增失败", e.getMessage());
*/ return inInfo;
public EiInfo update(EiInfo inInfo) { }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); return inInfo;
try { }
HPKC007 hpkc007 = new HPKC007();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock); /**
for (int i = 0; i < eiBlock.getRowCount(); i++) { * 修改操作.
Map<?, ?> map = eiBlock.getRow(i); */
hpkc007.fromMap(map); public EiInfo update(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
this.dao.update("HPKC007.update", hpkc007.toMap()); try {
} HPKC007 hpkc007 = new HPKC007();
inInfo.setStatus(EiConstant.STATUS_SUCCESS); EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
inInfo.setMsg("修改成功!"); for (int i = 0; i < eiBlock.getRowCount(); i++) {
} catch (PlatException e) { Map<?, ?> map = eiBlock.getRow(i);
inInfo.setStatus(EiConstant.STATUS_FAILURE); hpkc007.fromMap(map);
inInfo.setMsg("操作失败!原因参见详细错误描述!");
inInfo.setDetailMsg(e.getMessage()); this.dao.update("HPKC007.update", hpkc007.toMap());
logError("修改失败", e.getMessage()); }
return inInfo; inInfo.setStatus(EiConstant.STATUS_SUCCESS);
} inInfo.setMsg("修改成功!");
return query(inInfo); } catch (PlatException e) {
} inInfo.setStatus(EiConstant.STATUS_FAILURE);
inInfo.setMsg("操作失败!原因参见详细错误描述!");
/** inInfo.setDetailMsg(e.getMessage());
* 删除操作. logError("修改失败", e.getMessage());
*/ return inInfo;
public EiInfo delete(EiInfo eiInfo) { }
HPKC007 hpkc007 = new HPKC007(); return query(inInfo);
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock); }
try {
for (int i = 0; i < eiBlock.getRowCount(); i++) { /**
Map<?, ?> map = eiBlock.getRow(i); * 删除操作.
hpkc007.fromMap(map); */
public EiInfo delete(EiInfo eiInfo) {
this.dao.delete("HPKC007.delete", hpkc007.toMap()); HPKC007 hpkc007 = new HPKC007();
} EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
} catch (PlatException e) { try {
eiInfo.setStatus(EiConstant.STATUS_FAILURE); for (int i = 0; i < eiBlock.getRowCount(); i++) {
eiInfo.setMsg("删除失败,原因参见详细错误描述!"); Map<?, ?> map = eiBlock.getRow(i);
eiInfo.setDetailMsg(e.getMessage()); hpkc007.fromMap(map);
logError("删除失败!", e.getMessage());
return eiInfo; this.dao.delete("HPKC007.delete", hpkc007.toMap());
} }
} catch (PlatException e) {
eiInfo.setStatus(EiConstant.STATUS_SUCCESS); eiInfo.setStatus(EiConstant.STATUS_FAILURE);
eiInfo.setMsg("删除成功!"); eiInfo.setMsg("删除失败,原因参见详细错误描述!");
return eiInfo; eiInfo.setDetailMsg(e.getMessage());
} logError("删除失败!", e.getMessage());
return eiInfo;
}
eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("删除成功!");
return eiInfo;
}
} }
...@@ -320,7 +320,7 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -320,7 +320,7 @@ public class ServiceHPKC009 extends ServiceBase {
List<HPKC006> bItems = dao.query("HPKC006.statDate", queryMap); List<HPKC006> bItems = dao.query("HPKC006.statDate", queryMap);
Map<String, HPKC006> bItemMap = bItems.stream().collect(Collectors.toMap(item -> Map<String, HPKC006> bItemMap = bItems.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.3、发出 // 1.3、发出
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 ->
...@@ -336,10 +336,10 @@ public class ServiceHPKC009 extends ServiceBase { ...@@ -336,10 +336,10 @@ public class ServiceHPKC009 extends ServiceBase {
// 根据期末库存生成收发存对象 // 根据期末库存生成收发存对象
for (HPKC006 aItem : aItems) { for (HPKC006 aItem : aItems) {
String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#" String key = aItem.getCompanyCode() + "#" + aItem.getDepCode() + "#"
+ aItem.getWhCode() + "#" + aItem.getMatType() + "#" + aItem.getMatCode(); + aItem.getWhCode() + "#" + aItem.getInventType() + "#" + aItem.getInventCode();
HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class); HPKC009 kc009 = BeanUtils.copy(aItem, HPKC009.class);
kc009.setInventType(Integer.parseInt(aItem.getMatType())); kc009.setInventType(Integer.parseInt(aItem.getInventType()));
kc009.setInventCode(aItem.getMatCode()); kc009.setInventCode(aItem.getInventCode());
kc009.setKcType(HPConstant.KcType.QT); kc009.setKcType(HPConstant.KcType.QT);
kc009.setDateType(queryMap.get("dateType").toString()); kc009.setDateType(queryMap.get("dateType").toString());
kc009.setDateProc(queryMap.get("yesterDate").toString()); kc009.setDateProc(queryMap.get("yesterDate").toString());
......
...@@ -2,6 +2,7 @@ package com.baosight.hpjx.hp.kc.service; ...@@ -2,6 +2,7 @@ package com.baosight.hpjx.hp.kc.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.core.security.UserSessionUtils;
import com.baosight.hpjx.hp.kc.domain.HPKC010; import com.baosight.hpjx.hp.kc.domain.HPKC010;
import com.baosight.hpjx.hp.pz.domain.HPPZ006; import com.baosight.hpjx.hp.pz.domain.HPPZ006;
import com.baosight.hpjx.hp.pz.domain.HPPZ007; import com.baosight.hpjx.hp.pz.domain.HPPZ007;
...@@ -166,19 +167,19 @@ public class ServiceHPKC010 extends ServiceBase { ...@@ -166,19 +167,19 @@ public class ServiceHPKC010 extends ServiceBase {
/** /**
* 更新库存 * 更新库存
* @param companyCode 企业编码 *
* @param whCode 仓库编码 * @param inInfo
* @param inventRecordId 存货档案ID
* @param amout 数量
* @param weight 重量
* @return * @return
*/ */
public EiInfo updateStock(String companyCode, String whCode, Long inventRecordId public EiInfo updateStock(EiInfo inInfo){
, BigDecimal amout, BigDecimal weight){ String whCode = inInfo.getString("whCode");
EiInfo inInfo = new EiInfo(); Long inventRecordId = Long.parseLong(inInfo.getString("inventRecordId"));
BigDecimal amount = new BigDecimal(inInfo.getString("amount"));
BigDecimal weight = new BigDecimal(inInfo.getString("weight"));
String companyCode = UserSessionUtils.getCompanyCode();
try { try {
checkUpdateStockParam(companyCode,whCode,inventRecordId,amout,weight); checkUpdateStockParam(companyCode,whCode,inventRecordId,amount,weight);
HPKC010 newObj = generatorBaseInfo(companyCode,whCode,inventRecordId,amout,weight); HPKC010 newObj = generatorBaseInfo(companyCode,whCode,inventRecordId,amount,weight);
List<Map> list = dao.query("queryByCondition",new HashMap<String,Object>(){{ List<Map> list = dao.query("queryByCondition",new HashMap<String,Object>(){{
put("companyCode",companyCode); put("companyCode",companyCode);
put("whCode",whCode); put("whCode",whCode);
...@@ -186,8 +187,8 @@ public class ServiceHPKC010 extends ServiceBase { ...@@ -186,8 +187,8 @@ public class ServiceHPKC010 extends ServiceBase {
}}); }});
if(CollectionUtils.isEmpty(list)){ if(CollectionUtils.isEmpty(list)){
//新增 //新增
if(Objects.isNull(amout)||amout.compareTo(BigDecimal.ZERO)<=0 if(Objects.isNull(amount)||amount.compareTo(BigDecimal.ZERO)<=0
||Objects.isNull(amout)||weight.compareTo(BigDecimal.ZERO)<=0){ ||Objects.isNull(amount)||weight.compareTo(BigDecimal.ZERO)<=0){
throw new PlatException("当前库存为空,库存变更数量与重量不能小于等于0!"); throw new PlatException("当前库存为空,库存变更数量与重量不能小于等于0!");
} }
generatorBaseInfo(newObj); generatorBaseInfo(newObj);
...@@ -196,7 +197,7 @@ public class ServiceHPKC010 extends ServiceBase { ...@@ -196,7 +197,7 @@ public class ServiceHPKC010 extends ServiceBase {
//修改 //修改
HPKC010 oldObj = new HPKC010(); HPKC010 oldObj = new HPKC010();
oldObj.fromMap(list.get(0)); oldObj.fromMap(list.get(0));
BigDecimal afterAmout = oldObj.getAmount().add(amout); BigDecimal afterAmout = oldObj.getAmount().add(amount);
BigDecimal afterWeight = oldObj.getWeight().add(weight); BigDecimal afterWeight = oldObj.getWeight().add(weight);
if(afterAmout.compareTo(BigDecimal.ZERO)<=0||afterWeight.compareTo(BigDecimal.ZERO)<=0){ if(afterAmout.compareTo(BigDecimal.ZERO)<=0||afterWeight.compareTo(BigDecimal.ZERO)<=0){
throw new PlatException("库存更新失败,出库数量与重量不能大于当前库存!"); throw new PlatException("库存更新失败,出库数量与重量不能大于当前库存!");
......
package com.baosight.hpjx.hp.kc.tools;
import com.baosight.hpjx.core.dao.DaoBase;
import com.baosight.hpjx.hp.constant.HPSqlConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC006;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.service.soa.XLocalManager;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author:songx
* @date:2024/1/23,21:18
*/
public class HPKCTools {
/**
* 锁
*
* @param otherEnterNos
* @return
*/
public static void lockKc006(List<String> otherEnterNos) {
if (CollectionUtils.isEmpty(otherEnterNos)) {
return;
}
Map queryMap = new HashMap();
queryMap.put("otherEnterNos", otherEnterNos);
DaoBase.getInstance().update(HPSqlConstant.HPKC006.LOCK, queryMap);
}
/**
* 查询其他入库信息
*
* @param otherEnterNos
* @return
*/
public static List<HPKC006> listKc006(List<String> otherEnterNos) {
if (CollectionUtils.isEmpty(otherEnterNos)) {
return null;
}
Map queryMap = new HashMap();
queryMap.put("otherEnterNos", otherEnterNos);
return DaoBase.getInstance().query(HPKC006.QUERY, queryMap);
}
/**
* 查询其他入库信息
*
* @param otherEnterNos
* @return
*/
public static Map<String, HPKC006> mapKc006(List<String> otherEnterNos) {
List<HPKC006> results = listKc006(otherEnterNos);
if (CollectionUtils.isEmpty(results)) {
return null;
}
return results.stream().collect(Collectors.toMap(HPKC006::getOtherEnterNo, item -> item));
}
/**
* 更新库存
*
* @param whCode
* @param inventRecordId
* @param amount
* @param weight
*/
public static void updateStock(String whCode, Long inventRecordId, BigDecimal amount, BigDecimal weight) {
EiInfo inInfo = new EiInfo();
inInfo.set("whCode", whCode);
inInfo.set("inventRecordId", inventRecordId);
inInfo.set("amount", amount);
inInfo.set("weight", weight);
inInfo.set(EiConstant.serviceName, "HPKC010");
inInfo.set(EiConstant.methodName, "updateStock");
EiInfo outInfo = XLocalManager.call(inInfo);
if (outInfo.getStatus() < 0) {
throw new PlatException("跟新库存失败:" + outInfo.getMsg());
}
}
}
...@@ -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.common.InitiateModeEnum; import com.baosight.hpjx.common.InitiateModeEnum;
import com.baosight.hpjx.core.dao.DaoUtils; import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.kc.domain.HPKC006;
import com.baosight.hpjx.hp.pz.domain.HPPZ006; import com.baosight.hpjx.hp.pz.domain.HPPZ006;
import com.baosight.hpjx.hp.pz.tools.HPPZTools; import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.util.AssertUtils; import com.baosight.hpjx.util.AssertUtils;
...@@ -15,7 +14,6 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -15,7 +14,6 @@ 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 java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
...@@ -51,7 +49,7 @@ public class ServiceHPPZ006 extends ServiceBase { ...@@ -51,7 +49,7 @@ public class ServiceHPPZ006 extends ServiceBase {
@Override @Override
public EiInfo query(EiInfo inInfo) { public EiInfo query(EiInfo inInfo) {
try { try {
inInfo = super.query(inInfo, "HPPZ006.query", new HPKC006()); inInfo = super.query(inInfo, "HPPZ006.query", new HPPZ006());
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败"); LogUtils.setDetailMsg(inInfo, e, "查询失败");
} }
......
...@@ -5,6 +5,7 @@ import org.apache.commons.lang.StringUtils; ...@@ -5,6 +5,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.math.BigDecimal;
import java.util.Collection; import java.util.Collection;
import java.util.Map; import java.util.Map;
...@@ -148,4 +149,17 @@ public class AssertUtils { ...@@ -148,4 +149,17 @@ public class AssertUtils {
} }
} }
/**
* A大于B
*
* @param a
* @param b
* @param message
*/
public static void isGt(BigDecimal a, BigDecimal b, String message) {
if (a.compareTo(b) < 1) {
throw new PlatException(message);
}
}
} }
package com.baosight.hpjx.util; package com.baosight.hpjx.util;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 重写Apache.ObjectUtils类方法 * 重写Apache.ObjectUtils类方法
* *
...@@ -82,5 +87,16 @@ public class ObjectUtils extends org.apache.commons.lang.ObjectUtils { ...@@ -82,5 +87,16 @@ public class ObjectUtils extends org.apache.commons.lang.ObjectUtils {
} }
return StringUtils.isBlank(object.toString()); return StringUtils.isBlank(object.toString());
} }
/**
* 从集合MAP中取KEY
*
* @param items
* @param keyName
* @return
*/
public static List<String> listKey(List<Map> items, String keyName) {
return items.stream().map(item -> MapUtils.getString(item, keyName)).collect(Collectors.toList());
}
} }
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<EF:EFRegion id="result" title="明细信息"> <EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row"> <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="内码" hidden="true"/> <EF:EFColumn ename="id" cname="内码" hidden="true"/>
<EF:EFColumn ename="statisticalNumber" cname="盘点单号" enable="false" width="130" algin="center"/> <EF:EFColumn ename="statisticalNumber" cname="盘点单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd" <EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/> parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
<%--<EF:EFComboColumn ename="status" cname="单据状态" enable="false" width="100" readonly="true" <%--<EF:EFComboColumn ename="status" cname="单据状态" enable="false" width="100" readonly="true"
......
$(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) {
var grid = container.closest(".k-grid").data("kendoGrid");
var cellIndex = grid.cellIndex(container);
var input = $('<input />');
input.attr("name", options.field);
input.attr("id", options.field);
input.appendTo(container);
let eiInfo = new EiInfo();
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",
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) {
refreshsel
var grid = container.closest(".k-grid").data("kendoGrid");
var cellIndex = grid.cellIndex(container);
var input = $('<input />');
input.attr("name", options.field);
input.attr("id", options.field);
input.appendTo(container);
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) {
}
}
}
// 查询
$("#QUERY").on("click", query);
// 保存
$("#BTN_SAVE").on("click", save);
});
/**
* 页面加载时执行
*/
$(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页开始查询
}
/**
* 保存
*/
let save = function () {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPKC006", "save", true);
}
});
}
IPLATUI.EFGrid.result = {
pageable: {
pageSize: 20,
pageSizes: [10, 20, 30, 50, 100, 200],
},
}
});
\ No newline at end of file
...@@ -4,60 +4,61 @@ ...@@ -4,60 +4,61 @@
<%@ 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="查询条件" align-item="center"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
<style>
.row {
display: flex;
justify-content: space-between;
align-items: center;
}
</style>
<div class="row"> <%-- blockId="inqu_status" row="0" --%>
<EF:EFDatePicker blockId="inqu_status" ename = "receiptTime" cname="单据日期"
format="yyyy-MM-dd" />
<EF:EFInput blockId="inqu_status" ename="otherEnthouse" cname="其他入库单号" row="0"/>
<EF:EFInput blockId="inqu_status" ename="whName" cname="仓库名称" row="0"/>
<EF:EFSelect cname="单据状态" optionLabel="全部" blockId="inqu_status" ename="status" row="0">
<EF:EFOption label="审核" value="1"/>
<EF:EFOption label="反审" value="0"/>
</EF:EFSelect>
</div>
</EF:EFRegion> <EF:EFPage title="其他入库单">
<EF:EFRegion id="inqu" title="查询条件" align-item="center">
<EF:EFRegion id="result" title="记录集"> <div class="row">
<EF:EFGrid blockId="result" autoDraw="no"> <EF:EFDatePicker cname="单据日期" ename="inqu_status-0-receiptDate" colWidth="3"
<EF:EFColumn ename="id" cname="主键" hidden="true"/> role="date" format="yyyy-MM-dd" readonly="true"/>
<EF:EFInput cname="入库单号" ename="inqu_status-0-otherEnterNo" colWidth="3"/>
<EF:EFColumn ename="receiptTime" cname="单据日期"/> <EF:EFSelect ename="inqu_status-0-whCode" cname="仓库名称" colWidth="3" filter="contains" defultValue="">
<EF:EFColumn ename="otherEnthouse" cname="其他入库单号"/> <EF:EFOption label="全部" value=""/>
<EF:EFColumn ename="whCode" cname="仓库编码"/> <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
<EF:EFColumn ename="whName" cname="仓库名称"/> </EF:EFSelect>
<EF:EFColumn ename="matType" cname="物料类型"/> <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains"
<EF:EFColumn ename="matCode" cname="物料编码"/> template="#=valueField#-#=textField#" valueTemplate="#=valueField#-#=textField#">
<EF:EFColumn ename="matName" cname="物料名称"/> <EF:EFOption label="全部" value=""/>
<EF:EFColumn ename="spec" cname="规格"/> <EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
<EF:EFColumn ename="amount" cname="数量"/> </EF:EFSelect>
<EF:EFColumn ename="weight" cname="重量"/> </div>
<EF:EFComboColumn align="center" ename="status" cname="操作"> <div class="row">
<EF:EFOption label="审核" value="1"/> <EF:EFSelect cname="存货名称" ename="inqu_status-0-inventCode" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="反审" value="0"/> <EF:EFOption label="全部" value=""/>
</EF:EFComboColumn> <EF:EFOptions blockId="material_record_block_id" textField="textField" valueField="valueField"/>
<EF:EFColumn ename="remark" cname="备注"/> </EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-spec" cname="规格" colWidth="3" filter="contains" defultValue="">
</EF:EFGrid> <EF:EFOption label="全部" value=""/>
</EF:EFRegion> <EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
</EF:EFPage> </EF:EFSelect>
</div>
</EF:EFRegion>
<EF:EFRegion id="result" title="记录集">
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="otherEnterNo" cname="入库单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="receiptDate" cname="单据日期" editType="date" dateFormat="yyyy-MM-dd"
parseFormats="['yyyyMMdd']" width="90" align="center" required="true"/>
<EF:EFComboColumn ename="whCode" cname="仓库编码" width="120" columnTemplate="#=textField#"
itemTemplate="#=textField#" blockName="wh_record_block_id"
textField="textField" valueField="valueField"
align="center" filter="contains" required="true">
</EF:EFComboColumn>
<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="notes" cname="备注" width="100"/>
<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:EFRegion>
<script> </EF:EFPage>
var ctx = "${ctx}"; \ No newline at end of file
</script>
<script src="${ctx}/HP/KC/HPKC006.js"></script>
\ No newline at end of file
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