Skip to content

H
hp-smart
Commit b4ed0c4c by 宋祥
Options

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

# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005B.java
parents c9362783 e0999391
Showing with 961 additions and 30 deletions
src/main/java/com/baosight/hpjx/common/DdynamicEnum.java
......@@ -184,8 +184,23 @@ public enum DdynamicEnum {
* 用途：物料清单部件类型 耗材 零件 部件
* 编写：ly
*/
CODESET_CODE_BLOCK_ID("codeset_code_block_id","itemCode","itemCname","HPSC002.querySmallCode");
CODESET_CODE_BLOCK_ID("codeset_code_block_id","itemCode","itemCname","HPSC002.querySmallCode"),
/**
* 模块：日志管理
* 用途：日志查询
* 编写：wan
*/
OPER_MODUL_BLOCK_ID("oper_modul_block_id","operModul","operModul","HPRZ001.queryOperModulComboBox"),
/**
* 模块：日志管理
* 用途：日志查询
* 编写：wan
*/
OPER_TYPE_BLOCK_ID("oper_type_block_id","operType","operType","HPRZ001.queryOperTypeComboBox");
/** 将结果集放入的块名 */
private final String blockId;
/** 字段名 */
......
src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI001.java
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baosight.eplat.be.dz.constants.BEDZConstants;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -47,6 +48,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产日报",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......@@ -66,6 +68,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产日报",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
EiInfo outInfo = new EiInfo();
......@@ -111,6 +114,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产日报",operType = "查询",operDesc = "查询CompanyCode")
public EiInfo queryCompanyCode(EiInfo inInfo) {
EiInfo outInfo = new EiInfo();
try {
......@@ -133,6 +137,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show14")
public EiInfo queryZLInfo(EiInfo inInfo) {
EiInfo eiInfo = new EiInfo();
String serviceId = "S_BE_XP_17";
......@@ -189,6 +194,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show17")
public EiInfo queryXMinfo(EiInfo inInfo) {
EiInfo eiInfo = new EiInfo();
String serviceId = "S_BE_XP_17";
......@@ -254,6 +260,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show21")
public EiInfo queryRJCLInfo(EiInfo inInfo) {
EiInfo eiInfo = new EiInfo();
String serviceId = "S_BE_XP_17";
......@@ -310,6 +317,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show7")
public EiInfo queryYCLInfo(EiInfo inInfo) {
EiInfo eiInfo = new EiInfo();
String serviceId = "S_BE_XP_17";
......@@ -366,6 +374,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show6")
public EiInfo queryHAPlanInfo(EiInfo inInfo) {
String paramsStr = inInfo.getString(PARAMS_KEY_STR);
JSONArray jsonArray = (JSONArray) JSONArray.parse(paramsStr);
......@@ -431,6 +440,7 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show9")
public EiInfo queryMonWtInfo(EiInfo inInfo) {
String paramsStr = inInfo.getString(PARAMS_KEY_STR);
JSONArray jsonArray = (JSONArray) JSONArray.parse(paramsStr);
......@@ -491,6 +501,7 @@ public class ServiceHPBI001 extends ServiceBase {
*
* @return
*/
@OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "微服务测试方法（柱形图、折线图、饼图）")
public EiInfo queryMicroServiceBarData(EiInfo eiInfo) {
EiInfo returnInfo = new EiInfo();
String paramsStr = eiInfo.getString(PARAMS_KEY_STR);
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -45,6 +46,7 @@ public class ServiceHPKC001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "采购入库单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......@@ -66,6 +68,7 @@ public class ServiceHPKC001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "采购入库单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -89,6 +92,7 @@ public class ServiceHPKC001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "采购入库单",operType = "插入",operDesc = "插入")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -123,6 +127,7 @@ public class ServiceHPKC001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "采购入库单",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -161,6 +166,7 @@ public class ServiceHPKC001 extends ServiceBase {
*
* @param resultRows
*/
@OperationLogAnnotation(operModul = "采购入库单",operType = "校验",operDesc = "校验保存的数据")
private void checkSaveData(List<Map> resultRows) {
for (int i = 0; i < resultRows.size(); i++) {
HPKC001 fKc001 = new HPKC001();
......@@ -178,6 +184,7 @@ public class ServiceHPKC001 extends ServiceBase {
*
* @param fKc001
*/
@OperationLogAnnotation(operModul = "采购入库单",operType = "设置",operDesc = "设置基础信息")
private void setBaseInfo(HPKC001 fKc001) {
// 去除日期字符串中的-
fKc001.setReceiptDate(StringUtil.removeHorizontalLine(fKc001.getReceiptDate()));
......@@ -193,6 +200,7 @@ public class ServiceHPKC001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "采购入库单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -38,6 +39,7 @@ public class ServiceHPKC002 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "生产领料单",operType = "查询",operDesc = "初始化")
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
......@@ -61,6 +63,7 @@ public class ServiceHPKC002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产领料单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -83,6 +86,7 @@ public class ServiceHPKC002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产领料单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002A.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -45,6 +46,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "初始化")
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
......@@ -67,6 +69,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -85,6 +88,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生成出库单")
public EiInfo select(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -44,6 +45,7 @@ public class ServiceHPKC003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产入库单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), new HashMap<String,Object>(){{put("inventTypes",new String[]{"2","3"});}}, false);
......@@ -61,6 +63,7 @@ public class ServiceHPKC003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产入库单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -81,6 +84,7 @@ public class ServiceHPKC003 extends ServiceBase {
* @param eiInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产入库单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo eiInfo) {
try {
List<Map> resultRows = eiInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.common.ProdOrderStatusEnum;
......@@ -49,6 +50,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "初始化")
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
......@@ -68,6 +70,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -86,6 +89,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务查询",operType = "插入",operDesc = "生成入库单")
public EiInfo select(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -41,6 +42,7 @@ public class ServiceHPKC004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "销售出库单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......@@ -62,6 +64,7 @@ public class ServiceHPKC004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "销售出库单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -83,6 +86,7 @@ public class ServiceHPKC004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "销售出库单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004A.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -42,6 +43,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "初始化")
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
......@@ -58,6 +60,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -74,6 +77,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生成出库单")
public EiInfo select(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -40,6 +41,7 @@ public class ServiceHPKC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存盘点单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
......@@ -59,6 +61,7 @@ public class ServiceHPKC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存盘点单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -81,6 +84,7 @@ public class ServiceHPKC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存盘点单",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -113,6 +117,7 @@ public class ServiceHPKC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存盘点单",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -137,6 +142,7 @@ public class ServiceHPKC005 extends ServiceBase {
*
* @param fKc005
*/
@OperationLogAnnotation(operModul = "库存盘点单",operType = "设置",operDesc = "设置基础信息")
private void setBaseInfo(HPKC005 fKc005) {
// 去除日期字符串中的-
fKc005.setReceiptDate(StringUtil.removeHorizontalLine(fKc005.getReceiptDate()));
......@@ -156,6 +162,7 @@ public class ServiceHPKC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存盘点单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005A.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
......@@ -38,6 +39,7 @@ public class ServiceHPKC005A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "初始化")
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
......@@ -58,6 +60,7 @@ public class ServiceHPKC005A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -75,6 +78,7 @@ public class ServiceHPKC005A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生成盘点单")
public EiInfo select(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC006.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -49,6 +50,7 @@ public class ServiceHPKC006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他入库单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......@@ -70,6 +72,7 @@ public class ServiceHPKC006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他入库单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -93,6 +96,7 @@ public class ServiceHPKC006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他入库单",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -139,6 +143,7 @@ public class ServiceHPKC006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他入库单",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -177,6 +182,7 @@ public class ServiceHPKC006 extends ServiceBase {
*
* @param resultRows
*/
@OperationLogAnnotation(operModul = "其他入库单",operType = "校验",operDesc = "校验保存的数据")
private void checkSaveData(List<Map> resultRows) {
for (int i = 0; i < resultRows.size(); i++) {
HPKC006 fKc006 = new HPKC006();
......@@ -194,6 +200,7 @@ public class ServiceHPKC006 extends ServiceBase {
*
* @param fKc006
*/
@OperationLogAnnotation(operModul = "其他入库单",operType = "设置",operDesc = "设置基础信息")
private void setBaseInfo(HPKC006 fKc006) {
// 去除日期字符串中的-
fKc006.setReceiptDate(StringUtil.removeHorizontalLine(fKc006.getReceiptDate()));
......@@ -209,6 +216,7 @@ public class ServiceHPKC006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他入库单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -47,6 +48,7 @@ public class ServiceHPKC007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他出库单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......@@ -68,6 +70,7 @@ public class ServiceHPKC007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他出库单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -89,6 +92,7 @@ public class ServiceHPKC007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他出库单",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -123,6 +127,7 @@ public class ServiceHPKC007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他出库单",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -162,6 +167,7 @@ public class ServiceHPKC007 extends ServiceBase {
*
* @param resultRows
*/
@OperationLogAnnotation(operModul = "其他出库单",operType = "校验",operDesc = "校验保存的数据")
private void checkSaveData(List<Map> resultRows) {
for (int i = 0; i < resultRows.size(); i++) {
HPKC007 fKc007 = new HPKC007();
......@@ -179,6 +185,7 @@ public class ServiceHPKC007 extends ServiceBase {
*
* @param fKc007
*/
@OperationLogAnnotation(operModul = "其他出库单",operType = "设置",operDesc = "设置基础信息")
private void setBaseInfo(HPKC007 fKc007) {
// 去除日期字符串中的-
fKc007.setReceiptDate(StringUtil.removeHorizontalLine(fKc007.getReceiptDate()));
......@@ -194,6 +201,7 @@ public class ServiceHPKC007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "其他出库单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007A.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -44,6 +45,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "初始化")
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
......@@ -66,6 +68,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -84,6 +87,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生成出库单")
public EiInfo select(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC008.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -38,6 +39,7 @@ public class ServiceHPKC008 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "数据统计单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......@@ -57,6 +59,7 @@ public class ServiceHPKC008 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "数据统计单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -80,6 +83,7 @@ public class ServiceHPKC008 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "数据统计单",operType = "查询",operDesc = "新增")
public EiInfo insert(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -111,6 +115,7 @@ public class ServiceHPKC008 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "数据统计单",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -140,6 +145,7 @@ public class ServiceHPKC008 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "数据统计单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC009.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.hp.constant.HPConstant;
......@@ -54,6 +55,7 @@ public class ServiceHPKC009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存收发存",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
......@@ -73,6 +75,7 @@ public class ServiceHPKC009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存收发存",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -96,6 +99,7 @@ public class ServiceHPKC009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存收发存",operType = "插入",operDesc = "按天统计")
public EiInfo statDay(EiInfo inInfo) {
try {
// 取昨天的日期
......@@ -130,6 +134,7 @@ public class ServiceHPKC009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存收发存",operType = "插入",operDesc = "按月统计")
public EiInfo statMonth(EiInfo inInfo) {
try {
// 上个月的日期
......@@ -165,6 +170,7 @@ public class ServiceHPKC009 extends ServiceBase {
*
* @return
*/
@OperationLogAnnotation(operModul = "库存收发存",operType = "插入",operDesc = "统计库存收发存")
private List<HPKC009> statData(Map queryMap) {
List<HPKC009> newKc009s = new ArrayList<>();
// 1.1、期末库存
......@@ -282,6 +288,7 @@ public class ServiceHPKC009 extends ServiceBase {
*
* @param kc009s
*/
@OperationLogAnnotation(operModul = "库存收发存",operType = "设置",operDesc = "设置基础信息")
private void setBaseInfo(List<HPKC009> kc009s) {
// 仓库名称
List<String> whCodes = kc009s.stream().map(HPKC009::getWhCode).collect(Collectors.toList());
......@@ -316,6 +323,7 @@ public class ServiceHPKC009 extends ServiceBase {
* @param inventRecordId
* @return
*/
@OperationLogAnnotation(operModul = "库存收发存",operType = "设置",operDesc = "构建KEY")
private String buildKey(Object companyCode, Object depCode, Object inventType, Object inventCode,
Object whCode, Object inventRecordId) {
return ObjectUtils.trimToEmpty(companyCode) + "#"
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC009A.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.hp.constant.HPSqlConstant;
......@@ -51,6 +52,7 @@ public class ServiceHPKC009A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
......@@ -67,6 +69,7 @@ public class ServiceHPKC009A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -90,6 +93,7 @@ public class ServiceHPKC009A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "按天统计")
public EiInfo statDay(EiInfo inInfo) {
try {
// 取昨天的日期
......@@ -124,6 +128,7 @@ public class ServiceHPKC009A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "按月统计")
public EiInfo statMonth(EiInfo inInfo) {
try {
// 上个月的日期
......@@ -159,6 +164,7 @@ public class ServiceHPKC009A extends ServiceBase {
*
* @return
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "统计库存收发存")
private List<HPKC009A> statData(Map queryMap) {
List<HPKC009A> newKc009As = new ArrayList<>();
// 1.1、期末库存
......@@ -230,6 +236,7 @@ public class ServiceHPKC009A extends ServiceBase {
*
* @param kc009as
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "设置",operDesc = "设置基础信息")
private void setBaseInfo(List<HPKC009A> kc009as) {
// 仓库名称
List<String> whCodes = kc009as.stream().map(HPKC009A::getWhCode).collect(Collectors.toList());
......@@ -278,6 +285,7 @@ public class ServiceHPKC009A extends ServiceBase {
* @param subInventCode
* @return
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "设置",operDesc = "构建KEY")
private String buildKey(Object companyCode, Object depCode, Object whCode, Object projCode, Object inventCode,
Object subInventCode) {
return ObjectUtils.trimToEmpty(companyCode) + "#"
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC010.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.core.security.UserSessionUtils;
......@@ -39,6 +40,7 @@ public class ServiceHPKC010 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "实时库存管理",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
HPKC010 HPKC010 = new HPKC010();
EiInfo outInfo = super.initLoad(inInfo, HPKC010);
......@@ -53,6 +55,7 @@ public class ServiceHPKC010 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "实时库存管理",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -67,6 +70,7 @@ public class ServiceHPKC010 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "实时库存管理",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -91,6 +95,7 @@ public class ServiceHPKC010 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "实时库存管理",operType = "修改",operDesc = "更新库存")
public EiInfo updateStock(EiInfo inInfo){
String whCode = inInfo.getString("whCode");
Long inventRecordId = Long.parseLong(inInfo.getString("inventRecordId"));
......@@ -149,6 +154,7 @@ public class ServiceHPKC010 extends ServiceBase {
* @param weight
* @reutrn HPKC010
*/
private HPKC010 generatorBaseInfo(String companyCode, String whCode, Long inventRecordId, BigDecimal amout, BigDecimal weight) {
HPKC010 hpkc010 = new HPKC010();
hpkc010.setCompanyCode(companyCode);
......@@ -167,7 +173,7 @@ public class ServiceHPKC010 extends ServiceBase {
hpkc010.setUpdatedTime(time);
return hpkc010;
}
@OperationLogAnnotation(operModul = "实时库存管理",operType = "设置",operDesc = "生成库存对象")
private void generatorBaseInfo(HPKC010 hpkc010) {
String whName = "";
Integer inventType = new Integer(0);
......@@ -216,6 +222,7 @@ public class ServiceHPKC010 extends ServiceBase {
* @param amout
* @param weight
*/
@OperationLogAnnotation(operModul = "实时库存管理",operType = "校验",operDesc = "校验库存变更请求参数")
private void checkUpdateStockParam(String companyCode, String whCode, Long inventRecordId
, BigDecimal amout, BigDecimal weight){
if(StringUtils.isBlank(companyCode)){
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC010A.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.hp.constant.HPSqlConstant;
import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.LogUtils;
......@@ -23,6 +24,7 @@ public class ServiceHPKC010A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "备份数据")
public EiInfo backup(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC011.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -37,6 +38,7 @@ public class ServiceHPKC011 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "产品库存管理",operType = "查润",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
HPKC011 HPKC011 = new HPKC011();
EiInfo outInfo = super.initLoad(inInfo, HPKC011);
......@@ -52,6 +54,7 @@ public class ServiceHPKC011 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "产品库存管理",operType = "查润",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -66,6 +69,7 @@ public class ServiceHPKC011 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "产品库存管理",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -90,6 +94,7 @@ public class ServiceHPKC011 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "产品库存管理",operType = "修改",operDesc = "更新库存")
public EiInfo updateStock(EiInfo inInfo){
String whCode = inInfo.getString("whCode");
String prodNo = inInfo.getString("prodNo");
......@@ -166,7 +171,7 @@ public class ServiceHPKC011 extends ServiceBase {
hpkc011.setUpdatedTime(time);
return hpkc011;
}
@OperationLogAnnotation(operModul = "产品库存管理",operType = "设置",operDesc = "生成库存对象")
private void generatorBaseInfo(HPKC011 hpkc011) {
EiInfo inInfo = new EiInfo();
try {
......@@ -209,6 +214,7 @@ public class ServiceHPKC011 extends ServiceBase {
* @param amout
* @param weight
*/
@OperationLogAnnotation(operModul = "产品库存管理",operType = "校验",operDesc = "校验库存变更请求参数")
private void checkUpdateStockParam(String companyCode, String whCode, String prodNo
, BigDecimal amout, BigDecimal weight){
if(StringUtils.isBlank(companyCode)){
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC011A.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.hp.constant.HPSqlConstant;
import com.baosight.hpjx.util.DateUtils;
import com.baosight.hpjx.util.LogUtils;
......@@ -23,6 +24,7 @@ public class ServiceHPKC011A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "备份数据")
public EiInfo backup(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC099.java
package com.baosight.hpjx.hp.kc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.hp.sc.domain.HPSC005;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
......@@ -14,6 +15,7 @@ public class ServiceHPKC099 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "生产订单",operType = "查询 ",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
HPSC005 HPSC005 = new HPSC005();
inInfo.set("inqu_status-0-status", "1");
......@@ -26,6 +28,7 @@ public class ServiceHPKC099 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "生产订单",operType = "查询 ",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ001.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
......@@ -22,6 +23,7 @@ public class ServiceHPPZ001 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "客商类型",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
Thppz001 hppz001 = new Thppz001();
EiInfo outInfo = super.initLoad(inInfo, hppz001);
......@@ -33,6 +35,7 @@ public class ServiceHPPZ001 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "客商类型",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/
......@@ -44,6 +47,7 @@ public class ServiceHPPZ001 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "客商类型",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......@@ -76,6 +80,7 @@ public class ServiceHPPZ001 extends ServiceBase {
/**
* 修改操作.
*/
@OperationLogAnnotation(operModul = "客商类型",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
......@@ -103,6 +108,7 @@ public class ServiceHPPZ001 extends ServiceBase {
/**
* 删除操作.
*/
@OperationLogAnnotation(operModul = "客商类型",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo eiInfo) {
Thppz001 hppz001 = new Thppz001();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ002.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.CompanyTypeEnum;
import com.baosight.hpjx.common.InitiateModeEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -36,6 +37,7 @@ public class ServiceHPPZ002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "供应商档案",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.setBlock(CompanyTypeEnum.generatorEiBlock());
......@@ -53,6 +55,7 @@ public class ServiceHPPZ002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "供应商档案",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -69,6 +72,7 @@ public class ServiceHPPZ002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "供应商档案",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
CommonMethod.creatorInfo(inInfo, EiConstant.resultBlock);
......@@ -97,6 +101,7 @@ public class ServiceHPPZ002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "供应商档案",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
CommonMethod.creatorInfo(inInfo, EiConstant.resultBlock);
try {
......@@ -121,6 +126,7 @@ public class ServiceHPPZ002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "供应商档案",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ003.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.CompanyTypeEnum;
import com.baosight.hpjx.common.InitiateModeEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -33,6 +34,7 @@ public class ServiceHPPZ003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "客户档案",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.setBlock(CompanyTypeEnum.generatorEiBlock());
......@@ -50,6 +52,7 @@ public class ServiceHPPZ003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "客户档案",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -66,6 +69,7 @@ public class ServiceHPPZ003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "客户档案",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -93,6 +97,7 @@ public class ServiceHPPZ003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "客户档案",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -116,6 +121,7 @@ public class ServiceHPPZ003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "客户档案",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ004.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InitiateModeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -36,6 +37,7 @@ public class ServiceHPPZ004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货类型",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.setBlock(InitiateModeEnum.generatorEiBlock());
......@@ -52,6 +54,7 @@ public class ServiceHPPZ004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货类型",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -68,6 +71,7 @@ public class ServiceHPPZ004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货类型",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -95,6 +99,7 @@ public class ServiceHPPZ004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货类型",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -117,6 +122,7 @@ public class ServiceHPPZ004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货类型",operType = "查询",operDesc = "判断存货名称是否存在，如果存在返回编码，否则新增并返回编码")
public EiInfo checkAndSave(EiInfo inInfo){
String inventType = inInfo.getString("inventType");
String inventName = inInfo.getString("inventName");
......@@ -150,6 +156,7 @@ public class ServiceHPPZ004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货类型",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -177,6 +184,7 @@ public class ServiceHPPZ004 extends ServiceBase {
* @param eiInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货类型",operType = "查询",operDesc = "下拉框")
public EiInfo queryComboBox(EiInfo eiInfo) {
Map map = new HashMap();
map.put("inventType", eiInfo.getString("inventType"));
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ005.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.hp.pz.domain.HPPZ005;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
......@@ -14,7 +15,7 @@ import java.util.Date;
import java.util.Map;
public class ServiceHPPZ005 extends ServiceBase {
@OperationLogAnnotation(operModul = "配置管理",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
HPPZ005 hppz005 = new HPPZ005();
EiInfo outInfo = super.initLoad(inInfo, hppz005);
......@@ -26,6 +27,7 @@ public class ServiceHPPZ005 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/
......@@ -37,6 +39,7 @@ public class ServiceHPPZ005 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......@@ -69,6 +72,7 @@ public class ServiceHPPZ005 extends ServiceBase {
/**
* 修改操作.
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
......@@ -96,6 +100,7 @@ public class ServiceHPPZ005 extends ServiceBase {
/**
* 删除操作.
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo eiInfo) {
HPPZ005 hppz005 = new HPPZ005();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InitiateModeEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -36,6 +37,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null,false);
......@@ -50,6 +52,7 @@ public class ServiceHPPZ006 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -66,6 +69,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "新增 ",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -95,6 +99,7 @@ public class ServiceHPPZ006 extends ServiceBase {
*
* @param resultRows
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "校验 ",operDesc = "校验保存的数据")
private void checkSaveData(List<Map> resultRows) {
for (int i = 0; i < resultRows.size(); i++) {
HPPZ006 fPz006 = new HPPZ006();
......@@ -119,6 +124,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "修改 ",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -145,6 +151,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "删除 ",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -166,6 +173,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "判断存货档案是否存在，如果存在返回ID，否则新增并返回ID")
public EiInfo checkAndSave(EiInfo inInfo){
inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_INVENT_TYPE,inInfo.getString("inventType"));
inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_INVENT_CODE,inInfo.getString("inventCode"));
......@@ -207,6 +215,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "规格下拉框")
public EiInfo queryComboBoxSpec(EiInfo inInfo) {
try {
List<DdynamicEnum> list = new ArrayList<>();
......@@ -224,6 +233,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param eiInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "存货名称下拉框")
public EiInfo queryMaterialComboBox(EiInfo eiInfo) {
Map map = EiInfoUtils.getFirstRow(eiInfo);
if (ObjectUtils.isEmpty(map.get("inventType"))) {
......@@ -245,6 +255,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "下拉框")
public EiInfo queryComboBoxAll(EiInfo inInfo) {
try {
List<DdynamicEnum> list = new ArrayList<>();
......@@ -262,6 +273,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "单位下拉框")
public EiInfo queryComboBoxUnit(EiInfo inInfo) {
try {
List<DdynamicEnum> list = new ArrayList<>();
......@@ -279,6 +291,7 @@ public class ServiceHPPZ006 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框")
public EiInfo queryPrdtComboBox(EiInfo inInfo) {
try {
List<DdynamicEnum> list = new ArrayList<>();
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
......@@ -31,6 +32,7 @@ public class ServiceHPPZ007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "仓库档案",operType = "查询 ",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true);
......@@ -47,6 +49,7 @@ public class ServiceHPPZ007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "仓库档案",operType = "查询 ",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -60,6 +63,7 @@ public class ServiceHPPZ007 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "仓库档案",operType = "新增 ",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -87,6 +91,7 @@ public class ServiceHPPZ007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "仓库档案",operType = "修改 ",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -110,6 +115,7 @@ public class ServiceHPPZ007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "仓库档案",operType = "删除 ",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -131,6 +137,7 @@ public class ServiceHPPZ007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "仓库档案",operType = "查询 ",operDesc = "根据仓库CODE找对象")
public EiInfo queryByWhCode(EiInfo inInfo) {
Map params = new HashMap<>();
params.put("whCode", inInfo.getString("whCode"));
......@@ -145,6 +152,7 @@ public class ServiceHPPZ007 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "仓库档案",operType = "查询",operDesc = "下拉框")
public EiInfo queryComboBox(EiInfo inInfo) {
List<DdynamicEnum> list = new ArrayList<>();
list.add(DdynamicEnum.WH_RECORD_BLOCK_ID);
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ008.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
......@@ -22,6 +23,7 @@ public class ServiceHPPZ008 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "库存预警值档案",operType = "查询 ",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
Thppz008 hppz008 = new Thppz008();
EiInfo outInfo = super.initLoad(inInfo, hppz008);
......@@ -33,6 +35,7 @@ public class ServiceHPPZ008 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "库存预警值档案",operType = "查询 ",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/
......@@ -44,6 +47,7 @@ public class ServiceHPPZ008 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "库存预警值档案",operType = "新增 ",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......@@ -79,6 +83,7 @@ public class ServiceHPPZ008 extends ServiceBase {
/**
* 修改操作.
*/
@OperationLogAnnotation(operModul = "库存预警值档案",operType = "修改 ",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
......@@ -106,6 +111,7 @@ public class ServiceHPPZ008 extends ServiceBase {
/**
* 删除操作.
*/
@OperationLogAnnotation(operModul = "库存预警值档案",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo eiInfo) {
Thppz008 hppz008 = new Thppz008();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ009.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
......@@ -36,6 +37,7 @@ public class ServiceHPPZ009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ009().eiMetadata);
......@@ -51,6 +53,7 @@ public class ServiceHPPZ009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -67,6 +70,7 @@ public class ServiceHPPZ009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "插入",operDesc = "保存")
public EiInfo save(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -96,6 +100,7 @@ public class ServiceHPPZ009 extends ServiceBase {
*
* @param resultRows
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "校验",operDesc = "校验保存的数据")
private void checkSaveData(List<Map> resultRows) {
// 数据校验
for (int i = 0; i < resultRows.size(); i++) {
......@@ -113,6 +118,7 @@ public class ServiceHPPZ009 extends ServiceBase {
* @param fPz009
* @throws Exception
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "新增",operDesc = "新增企业信息")
private void add(HPPZ009 fPz009) throws Exception {
// 生成企业编码
fPz009.setCompanyCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.COMPANY_CODE));
......@@ -132,6 +138,7 @@ public class ServiceHPPZ009 extends ServiceBase {
*
* @param fPz009
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "修改",operDesc = "修改")
private void modify(HPPZ009 fPz009) {
DaoUtils.update("HPPZ009.update", fPz009);
}
......@@ -142,6 +149,7 @@ public class ServiceHPPZ009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -168,6 +176,7 @@ public class ServiceHPPZ009 extends ServiceBase {
*
* @param hppz009
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "新增",operDesc = "初始化用户")
private void initUser(HPPZ009 hppz009) throws Exception {
String companyCode = hppz009.getCompanyCode();
Map inInfoRowMap = new HashMap();
......@@ -196,6 +205,7 @@ public class ServiceHPPZ009 extends ServiceBase {
*
* @param hppz009
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "新增",operDesc = "用户关联角色")
private void insertGroupMember(HPPZ009 hppz009) {
String companyCode = hppz009.getCompanyCode();
Map inInfoRowMap = new HashMap();
......@@ -221,6 +231,7 @@ public class ServiceHPPZ009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "修改",operDesc = "修改操作")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -246,6 +257,7 @@ public class ServiceHPPZ009 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "企业管理",operType = "删除",operDesc = "删除操作")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ010.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPSqlConstant;
......@@ -35,6 +36,7 @@ public class ServiceHPPZ010 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPPZ010().eiMetadata);
......@@ -50,6 +52,7 @@ public class ServiceHPPZ010 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "查询",operDesc = "查询数据列表")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -66,6 +69,7 @@ public class ServiceHPPZ010 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "新增",operDesc = "保存操作")
public EiInfo save(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -95,6 +99,7 @@ public class ServiceHPPZ010 extends ServiceBase {
*
* @param resultRows
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "校验",operDesc = "校验保存的数据")
private void checkSaveData(List<Map> resultRows) {
// 数据校验
for (int i = 0; i < resultRows.size(); i++) {
......@@ -111,6 +116,7 @@ public class ServiceHPPZ010 extends ServiceBase {
* @param fPz009
* @throws Exception
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "新增",operDesc = "新增企业信息")
private void add(HPPZ009 fPz009) throws Exception {
// 生成企业编码
fPz009.setCompanyCode(SequenceGenerator.getNextSequence("COMPANY_CODE"));
......@@ -127,6 +133,7 @@ public class ServiceHPPZ010 extends ServiceBase {
*
* @param fPz009
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "修改",operDesc = "修改数据")
private void modify(HPPZ009 fPz009) {
DaoUtils.update("HPPZ009.update", fPz009);
}
......@@ -137,6 +144,7 @@ public class ServiceHPPZ010 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "新增",operDesc = "新增操作")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -163,6 +171,7 @@ public class ServiceHPPZ010 extends ServiceBase {
*
* @param hppz009
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "新增",operDesc = "初始化用户")
private void initUser(HPPZ009 hppz009) throws Exception {
String companyCode = hppz009.getCompanyCode();
Map inInfoRowMap = new HashMap();
......@@ -191,6 +200,7 @@ public class ServiceHPPZ010 extends ServiceBase {
*
* @param hppz009
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "查询",operDesc = "用户关联角色")
private void insertGroupMember(HPPZ009 hppz009) {
String companyCode = hppz009.getCompanyCode();
Map inInfoRowMap = new HashMap();
......@@ -216,6 +226,7 @@ public class ServiceHPPZ010 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "修改",operDesc = "修改操作")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -241,6 +252,7 @@ public class ServiceHPPZ010 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "配置管理",operType = "删除",operDesc = "删除操作")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ011.java
package com.baosight.hpjx.hp.pz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -37,6 +38,7 @@ public class ServiceHPPZ011 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......@@ -56,6 +58,7 @@ public class ServiceHPPZ011 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -72,6 +75,7 @@ public class ServiceHPPZ011 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "新增",operDesc = "保存操作")
public EiInfo save(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -112,6 +116,7 @@ public class ServiceHPPZ011 extends ServiceBase {
*
* @param resultRows
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "校验",operDesc = "校验保存的数据")
private void checkSaveData(List<Map> resultRows) {
// 数据校验
for (int i = 0; i < resultRows.size(); i++) {
......@@ -127,6 +132,7 @@ public class ServiceHPPZ011 extends ServiceBase {
*
* @param fPz011
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "新增",operDesc = "新增企业信息")
private void add(HPPZ011 fPz011) {
fPz011.setDeleteFlag(CommonConstant.YesNo.NO_0);
DaoUtils.insert(HPPZ011.INSERT, fPz011);
......@@ -137,6 +143,7 @@ public class ServiceHPPZ011 extends ServiceBase {
*
* @param fPz011
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "修改",operDesc = "修改数据")
private void modify(HPPZ011 fPz011) {
DaoUtils.update(HPPZ011.UPDATE, fPz011);
}
......@@ -147,6 +154,7 @@ public class ServiceHPPZ011 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "删除",operDesc = "删除操作")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -168,6 +176,7 @@ public class ServiceHPPZ011 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "查询",operDesc = "下拉框")
public EiInfo queryComboBox(EiInfo inInfo) {
try {
List<DdynamicEnum> list = new ArrayList<>();
......@@ -178,7 +187,7 @@ public class ServiceHPPZ011 extends ServiceBase {
}
return inInfo;
}
@OperationLogAnnotation(operModul = "厂区管理",operType = "查询",operDesc = "下拉框")
public EiInfo queryComboBoxAll(EiInfo inInfo) {
try {
List<DdynamicEnum> list = new ArrayList<>();
......@@ -194,6 +203,7 @@ public class ServiceHPPZ011 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "厂区管理",operType = "查询",operDesc = "下拉框")
public EiInfo queryGroupComboBox(EiInfo inInfo) {
try {
List<DdynamicEnum> list = new ArrayList<>();
......
src/main/java/com/baosight/hpjx/hp/rz/domian/HPRZ001.java 0 → 100644
/**
* Generate time : 2024-02-23 15:28:50
* Version : 1.0
*/
package com.baosight.hpjx.hp.rz.domian;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase;
import java.util.HashMap;
import java.util.Map;
import com.baosight.iplat4j.core.util.StringUtils;
/**
* SysOperationLog
*
*/
public class HPRZ001 extends DaoEPBase {
private Long id = 0L; /* 主键id*/
private String companyCode = " "; /* 企业编码*/
private String createdBy = " "; /* 创建人*/
private String createdName = " "; /* 创建人名称*/
private String createdTime = " "; /* 创建时间*/
private String operModul = " "; /* 操作模块*/
private String operType = " "; /* 操作类型*/
private String operDesc = " "; /* 操作说明*/
private String operContent = " "; /* 操作内容*/
public static final String QUERY = "HPRZ001.query";
/**
* initialize the metadata
*/
public void initMetaData() {
EiColumn eiColumn;
eiColumn = new EiColumn("id");
eiColumn.setPrimaryKey(true);
eiColumn.setDescName("主键id");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("companyCode");
eiColumn.setDescName("企业编码");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("createdBy");
eiColumn.setDescName("创建人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("createdName");
eiColumn.setDescName("创建人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("createdTime");
eiColumn.setDescName("创建时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("operModul");
eiColumn.setDescName("操作模块");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("operType");
eiColumn.setDescName("操作类型");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("operDesc");
eiColumn.setDescName("操作说明");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn("operContent");
eiColumn.setDescName("操作内容");
eiMetadata.addMeta(eiColumn);
}
/**
* the constructor
*/
public HPRZ001() {
initMetaData();
}
/**
* get the id - 主键id
* @return the id
*/
public Long getId() {
return this.id;
}
/**
* set the id - 主键id
*/
public void setId(Long id) {
this.id = id;
}
/**
* get the companyCode - 企业编码
* @return the companyCode
*/
public String getCompanyCode() {
return this.companyCode;
}
/**
* set the companyCode - 企业编码
*/
public void setCompanyCode(String companyCode) {
this.companyCode = companyCode;
}
/**
* get the createdBy - 创建人
* @return the createdBy
*/
public String getCreatedBy() {
return this.createdBy;
}
/**
* set the createdBy - 创建人
*/
public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}
/**
* get the createdName - 创建人名称
* @return the createdName
*/
public String getCreatedName() {
return this.createdName;
}
/**
* set the createdName - 创建人名称
*/
public void setCreatedName(String createdName) {
this.createdName = createdName;
}
/**
* get the createdTime - 创建时间
* @return the createdTime
*/
public String getCreatedTime() {
return this.createdTime;
}
/**
* set the createdTime - 创建时间
*/
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
/**
* get the operModul - 操作模块
* @return the operModul
*/
public String getOperModul() {
return this.operModul;
}
/**
* set the operModul - 操作模块
*/
public void setOperModul(String operModul) {
this.operModul = operModul;
}
/**
* get the operType - 操作类型
* @return the operType
*/
public String getOperType() {
return this.operType;
}
/**
* set the operType - 操作类型
*/
public void setOperType(String operType) {
this.operType = operType;
}
/**
* get the operDesc - 操作说明
* @return the operDesc
*/
public String getOperDesc() {
return this.operDesc;
}
/**
* set the operDesc - 操作说明
*/
public void setOperDesc(String operDesc) {
this.operDesc = operDesc;
}
/**
* get the operContent - 操作内容
* @return the operContent
*/
public String getOperContent() {
return this.operContent;
}
/**
* set the operContent - 操作内容
*/
public void setOperContent(String operContent) {
this.operContent = operContent;
}
/**
* get the value from Map
*/
public void fromMap(Map map) {
setId(NumberUtils.toLong(StringUtils.toString(map.get("id")), id));
setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("companyCode")), companyCode));
setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdBy")), createdBy));
setCreatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdName")), createdName));
setCreatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("createdTime")), createdTime));
setOperModul(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("operModul")), operModul));
setOperType(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("operType")), operType));
setOperDesc(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("operDesc")), operDesc));
setOperContent(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("operContent")), operContent));
}
/**
* set the value to Map
*/
public Map toMap() {
Map map = new HashMap();
map.put("id",StringUtils.toString(id, eiMetadata.getMeta("id")));
map.put("companyCode",StringUtils.toString(companyCode, eiMetadata.getMeta("companyCode")));
map.put("createdBy",StringUtils.toString(createdBy, eiMetadata.getMeta("createdBy")));
map.put("createdName",StringUtils.toString(createdName, eiMetadata.getMeta("createdName")));
map.put("createdTime",StringUtils.toString(createdTime, eiMetadata.getMeta("createdTime")));
map.put("operModul",StringUtils.toString(operModul, eiMetadata.getMeta("operModul")));
map.put("operType",StringUtils.toString(operType, eiMetadata.getMeta("operType")));
map.put("operDesc",StringUtils.toString(operDesc, eiMetadata.getMeta("operDesc")));
map.put("operContent",StringUtils.toString(operContent, eiMetadata.getMeta("operContent")));
return map;
}
}
\ No newline at end of file
src/main/java/com/baosight/hpjx/hp/rz/service/ServiceHPRZ001.java 0 → 100644
package com.baosight.hpjx.hp.rz.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.InventTypeEnum;
import com.baosight.hpjx.core.security.UserSessionUtils;
import com.baosight.hpjx.hp.rz.domian.HPRZ001;
import com.baosight.hpjx.util.*;
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.impl.ServiceBase;
import org.apache.commons.collections.MapUtils;
import java.math.BigDecimal;
import java.util.*;
/**
* @author wan
* @date 2024年02月23日 16:18
*/
public class ServiceHPRZ001 extends ServiceBase {
/**
* 画面初始化
*
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "日志查询",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BLOCK_ID), queryMap);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.OPER_MODUL_BLOCK_ID), queryMap);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.OPER_TYPE_BLOCK_ID), queryMap);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPRZ001().eiMetadata);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败");
}
return inInfo;
}
/**
* 查询操作
*
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "日志查询",operType = "查询",operDesc = "查询操作")
@Override
public EiInfo query(EiInfo inInfo) {
try {
inInfo = super.query(inInfo, HPRZ001.QUERY, new HPRZ001());
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
return inInfo;
}
/**
* 查询操作模块下拉框
*
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "日志查询",operType = "查询",operDesc = "操作模块下拉框")
public EiInfo queryOperModulComboBox(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
queryMap.put("companyCode", UserSessionUtils.getCompanyCode());
List<DdynamicEnum> list = new ArrayList<>();
list.add(DdynamicEnum.OPER_MODUL_BLOCK_ID);
CommonMethod.initBlock(inInfo, list, queryMap);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询企业失败");
}
return inInfo;
}
/**
* 查询操作类型下拉框
*
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "日志查询",operType = "查询",operDesc = "操作类型下拉框")
public EiInfo queryOperTypeComboBox(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
queryMap.put("companyCode", UserSessionUtils.getCompanyCode());
List<DdynamicEnum> list = new ArrayList<>();
list.add(DdynamicEnum.OPER_TYPE_BLOCK_ID);
CommonMethod.initBlock(inInfo, list, queryMap);
} catch (Exception e) {
LogUtils.setMsg(inInfo, e, "查询企业失败");
}
return inInfo;
}
}
src/main/java/com/baosight/hpjx/hp/rz/sql/HPRZ001.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<!-- table information
Generate time : 2024-02-23 15:28:50
Version : 1.0
tableName :hpjx.sys_operation_log
ID BIGINT NOT NULL primarykey,
COMPANY_CODE VARCHAR NOT NULL,
CREATED_BY VARCHAR,
CREATED_NAME VARCHAR,
CREATED_TIME VARCHAR,
OPER_MODUL VARCHAR,
OPER_TYPE VARCHAR,
OPER_DESC VARCHAR,
OPER_CONTENT VARCHAR
-->
<sqlMap namespace="HPRZ001">
<select id="query" parameterClass="java.util.HashMap"
resultClass="com.baosight.hpjx.hp.rz.domian.HPRZ001">
SELECT
ID as "id", <!-- 主键id -->
COMPANY_CODE as "companyCode", <!-- 企业编码 -->
CREATED_BY as "createdBy", <!-- 创建人 -->
CREATED_NAME as "createdName", <!-- 创建人名称 -->
CREATED_TIME as "createdTime", <!-- 创建时间 -->
OPER_MODUL as "operModul", <!-- 操作模块 -->
OPER_TYPE as "operType", <!-- 操作类型 -->
OPER_DESC as "operDesc", <!-- 操作说明 -->
OPER_CONTENT as "operContent" <!-- 操作内容 -->
FROM hpjx.sys_operation_log WHERE 1=1
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdName">
CREATED_NAME LIKE CONCAT('%',CONCAT( #createdName#,'%'))
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateFrom">
CREATED_TIME >= #createdDateFrom#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateTo">
CREATED_TIME <![CDATA[<=]]> #createdDateTo#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="operModul">
OPER_MODUL = #operModul#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="operType">
OPER_TYPE = #operType#
</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.sys_operation_log WHERE 1=1
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdName">
CREATED_NAME LIKE CONCAT('%',CONCAT( #createdName#,'%'))
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateFrom">
CREATED_TIME >= #createdDateFrom#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdDateTo">
CREATED_TIME <![CDATA[<=]]> #createdDateTo#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="operModul">
OPER_MODUL = #operModul#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="operType">
OPER_TYPE = #operType#
</isNotEmpty>
</select>
<!--
<isNotEmpty prepend=" AND " property="id">
ID = #id#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdBy">
CREATED_BY = #createdBy#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdName">
CREATED_NAME = #createdName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="createdTime">
CREATED_TIME = #createdTime#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="operModul">
OPER_MODUL = #operModul#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="operType">
OPER_TYPE = #operType#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="operDesc">
OPER_DESC = #operDesc#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="operContent">
OPER_CONTENT = #operContent#
</isNotEmpty>
-->
<insert id="insert">
INSERT INTO hpjx.sys_operation_log (ID, <!-- 主键id -->
COMPANY_CODE, <!-- 企业编码 -->
CREATED_BY, <!-- 创建人 -->
CREATED_NAME, <!-- 创建人名称 -->
CREATED_TIME, <!-- 创建时间 -->
OPER_MODUL, <!-- 操作模块 -->
OPER_TYPE, <!-- 操作类型 -->
OPER_DESC, <!-- 操作说明 -->
OPER_CONTENT <!-- 操作内容 -->
)
VALUES (#id#, #companyCode#, #createdBy#, #createdName#, #createdTime#, #operModul#, #operType#, #operDesc#, #operContent#)
</insert>
<delete id="delete">
DELETE FROM hpjx.sys_operation_log WHERE
ID = #id#
</delete>
<update id="update">
UPDATE hpjx.sys_operation_log
SET
COMPANY_CODE = #companyCode#, <!-- 企业编码 -->
CREATED_BY = #createdBy#, <!-- 创建人 -->
CREATED_NAME = #createdName#, <!-- 创建人名称 -->
CREATED_TIME = #createdTime#, <!-- 创建时间 -->
OPER_MODUL = #operModul#, <!-- 操作模块 -->
OPER_TYPE = #operType#, <!-- 操作类型 -->
OPER_DESC = #operDesc#, <!-- 操作说明 -->
OPER_CONTENT = #operContent# <!-- 操作内容 -->
WHERE
ID = #id#
</update>
<!-- 查询操作模块 -->
<select id="queryOperModulComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
SELECT
distinct OPER_MODUL as "operModul" <!-- 操作模块 -->
FROM hpjx.sys_operation_log WHERE 1=1
</select>
<!-- 查询操作类型 -->
<select id="queryOperTypeComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
SELECT
distinct OPER_TYPE as "operType" <!-- 操作类型 -->
FROM hpjx.sys_operation_log WHERE 1=1
</select>
</sqlMap>
\ No newline at end of file
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -46,6 +47,7 @@ public class ServiceHPSC002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map<String, Object> map = new HashMap<>();
......@@ -63,6 +65,7 @@ public class ServiceHPSC002 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -76,6 +79,7 @@ public class ServiceHPSC002 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "新增",operDesc = "新增操作")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -127,6 +131,7 @@ public class ServiceHPSC002 extends ServiceBase {
/**
* 修改操作.
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "修改",operDesc = "修改操作")
public EiInfo update(EiInfo inInfo) {
try {
HPSC002 hppz002 = new HPSC002();
......@@ -163,6 +168,7 @@ public class ServiceHPSC002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "删除",operDesc = "删除操作")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -204,6 +210,7 @@ public class ServiceHPSC002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "指定树节点")
public EiInfo queryTreeRoot(EiInfo inInfo) {
Long projId = NumberUtils.toLong(inInfo.get("projId"));
Map queryMap = new HashMap();
......@@ -217,7 +224,7 @@ public class ServiceHPSC002 extends ServiceBase {
inInfo.set("root",root);
return inInfo;
}
@OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "树查询服务")
//树查询服务
public EiInfo queryTreeNode(EiInfo inInfo) {
//1 获取参数
......@@ -251,6 +258,7 @@ public class ServiceHPSC002 extends ServiceBase {
*
* @param id
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "修改",operDesc = "修改节点状态，是叶子或非叶子节点")
public void checkTreeNodeLeaf(String id) {
//1 获取参数
Map queryMap = new HashMap();
......@@ -267,6 +275,7 @@ public class ServiceHPSC002 extends ServiceBase {
/**
* 提交 撤回.
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "提交",operDesc = "提交 撤回")
public EiInfo check(EiInfo eiInfo) {
HPSC002 hppz002 = new HPSC002();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
......@@ -349,6 +358,7 @@ public class ServiceHPSC002 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "绑定",operDesc = "绑定附件")
public EiInfo bindDocIdById(EiInfo inInfo) {
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
try {
......@@ -375,6 +385,7 @@ public class ServiceHPSC002 extends ServiceBase {
*
* @param id 生产ID
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "新增",operDesc = "生成生产计划")
public void autoPlanInfo(String id) {
String planNo;
HPSC002 dbSc002 = HPSCTools.HpSc002.get(Long.parseLong(id));
......@@ -415,6 +426,7 @@ public class ServiceHPSC002 extends ServiceBase {
* @param inInfo 形参
* @return 返回集合
*/
@OperationLogAnnotation(operModul = "物料清单",operType = "查询",operDesc = "部件类型下拉框")
public EiInfo queryPrdtTypeBox(EiInfo inInfo) {
try {
List<DdynamicEnum> list = new ArrayList<>();
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002A.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
......@@ -38,6 +39,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
// 查询物料ID所对应的项目名称和部件名称
......@@ -76,6 +78,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -92,6 +95,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "新增操作")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -115,6 +119,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "删除操作")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002B.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.sc.domain.HPSC002;
import com.baosight.hpjx.hp.sc.domain.HPSC002A;
......@@ -27,6 +28,7 @@ public class ServiceHPSC002B extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
// 查询物料ID所对应的项目名称和部件名称
......@@ -51,6 +53,7 @@ public class ServiceHPSC002B extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -67,6 +70,7 @@ public class ServiceHPSC002B extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -90,6 +94,7 @@ public class ServiceHPSC002B extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.HPConstants;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -47,6 +48,7 @@ public class ServiceHPSC003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID,DdynamicEnum.INVENT_NAME_BLOCK_ID),
new HashMap<String,Object>(){{put("inventType",4);}});
......@@ -59,6 +61,7 @@ public class ServiceHPSC003 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -76,6 +79,7 @@ public class ServiceHPSC003 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......@@ -108,6 +112,7 @@ public class ServiceHPSC003 extends ServiceBase {
/**
* 修改操作.
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
HPSC003 HPSC003 = new HPSC003();
......@@ -137,6 +142,7 @@ public class ServiceHPSC003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "修改",operDesc = "修改计划明细")
public EiInfo updatePlanDetail(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(CommonConstant.Field.DETAIL).getRows();
......@@ -170,6 +176,7 @@ public class ServiceHPSC003 extends ServiceBase {
* @param eiInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "查询",operDesc = "根据ID获取详情")
public EiInfo getInfo(EiInfo eiInfo) {
Map map = new HashMap();
String id = eiInfo.get("id").toString();
......@@ -185,6 +192,7 @@ public class ServiceHPSC003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "提交",operDesc = "提交生产计划")
public EiInfo submitPlan(EiInfo inInfo) {
try {
Long id = Long.parseLong(inInfo.getString("id"));
......@@ -218,6 +226,7 @@ public class ServiceHPSC003 extends ServiceBase {
* @param dbSc003
* @param dbSc004
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "新增",operDesc = "生成任务订单")
private HPSC005 addSc005(HPSC003 dbSc003, HPSC004 dbSc004) {
HPSC005 newSc005 = BeanUtils.copy(dbSc003, HPSC005.class);
newSc005.setProdOrderNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.HPSC005_PROD_NO));
......@@ -250,6 +259,7 @@ public class ServiceHPSC003 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "查询",operDesc = "部件下拉框")
public EiInfo queryInventComboBox(EiInfo inInfo) {
List<DdynamicEnum> list = new ArrayList<>();
list.add(DdynamicEnum.INVENT_RECORD_BLOCK_ID);
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC004.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.sc.domain.HPSC003;
......@@ -26,6 +27,7 @@ public class ServiceHPSC004 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
HPSC004 HPSC004 = new HPSC004();
EiInfo outInfo = super.initLoad(inInfo, HPSC004);
......@@ -37,6 +39,8 @@ public class ServiceHPSC004 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/
......@@ -48,6 +52,7 @@ public class ServiceHPSC004 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "新增",operDesc = "新增操作")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -75,6 +80,7 @@ public class ServiceHPSC004 extends ServiceBase {
/**
* 修改操作.
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "修改",operDesc = "修改操作")
public EiInfo update(EiInfo inInfo) {
try {
HPSC004 HPSC004 = new HPSC004();
......@@ -99,6 +105,7 @@ public class ServiceHPSC004 extends ServiceBase {
/**
* 删除操作.
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "删除",operDesc = "删除操作")
public EiInfo delete(EiInfo eiInfo) {
HPSC004 HPSC004 = new HPSC004();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
......@@ -121,7 +128,7 @@ public class ServiceHPSC004 extends ServiceBase {
eiInfo.setMsg("删除成功！");
return eiInfo;
}
@OperationLogAnnotation(operModul = "生产计划",operType = "查询",operDesc = "查询明细")
public EiInfo queryDetail(EiInfo inInfo){
HPSC004 HPSC004 = new HPSC004();
EiInfo outInfo = new EiInfo();
......@@ -141,6 +148,7 @@ public class ServiceHPSC004 extends ServiceBase {
* @param eiInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "提交",operDesc = "计划提交验证")
public EiInfo inspectDetail(EiInfo eiInfo) {
Map map = new HashMap();
String id = eiInfo.get("id").toString();
......@@ -156,6 +164,7 @@ public class ServiceHPSC004 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产计划",operType = "查询",operDesc = "部件下拉框")
public EiInfo queryInventComboBox(EiInfo inInfo) {
List<DdynamicEnum> list = new ArrayList<>();
list.add(DdynamicEnum.SUB_INVENT_RECORD_BLOCK_ID);
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.hp.sc.domain.HPSC005;
import com.baosight.hpjx.util.CommonMethod;
......@@ -27,6 +28,7 @@ public class ServiceHPSC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产订单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC005().eiMetadata);
......@@ -42,6 +44,7 @@ public class ServiceHPSC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产订单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -61,6 +64,7 @@ public class ServiceHPSC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产订单",operType = "查询",operDesc = "项目下拉框")
public EiInfo queryProjComboBox(EiInfo inInfo) {
List<DdynamicEnum> list = new ArrayList<>();
list.add(DdynamicEnum.PROJ_PROD_BLOCK_ID);
......@@ -74,6 +78,7 @@ public class ServiceHPSC005 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产订单",operType = "查询",operDesc = "生产组下拉框")
public EiInfo queryOrgComboBox(EiInfo inInfo) {
List<DdynamicEnum> list = new ArrayList<>();
list.add(DdynamicEnum.ORG_PROD_BLOCK_ID);
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005A.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.ProdOrderStatusEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -41,6 +42,7 @@ public class ServiceHPSC005A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
......@@ -61,6 +63,7 @@ public class ServiceHPSC005A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -77,6 +80,7 @@ public class ServiceHPSC005A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "新增操作")
public EiInfo save(EiInfo inInfo) {
try {
Map detailMap = EiInfoUtils.getFirstRow(inInfo, CommonConstant.Field.DETAIL);
......@@ -119,6 +123,7 @@ public class ServiceHPSC005A extends ServiceBase {
* @param dbSc005
* @param fSc005a
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "新增")
private void add(HPSC005 dbSc005, HPSC005A fSc005a) {
String prodOrderNo = dbSc005.getProdOrderNo();
// 数据校验
......@@ -143,6 +148,7 @@ public class ServiceHPSC005A extends ServiceBase {
* @param fSc005a
* @param mapSc005a
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "修改",operDesc = "修改数据")
private void modify(HPSC005 dbSc005, HPSC005A fSc005a, Map<String, HPSC005A> mapSc005a) {
String prodOrderNo = dbSc005.getProdOrderNo();
// 数据校验
......@@ -164,6 +170,7 @@ public class ServiceHPSC005A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "删除",operDesc = "删除操作")
public EiInfo delete(EiInfo inInfo) {
try {
Map detailMap = EiInfoUtils.getFirstRow(inInfo, CommonConstant.Field.DETAIL);
......@@ -197,6 +204,7 @@ public class ServiceHPSC005A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "刷新",operDesc = "刷新主订单信息")
private EiInfo refreshOrderInfo(EiInfo inInfo, String prodOrderNo) {
HPSC005 dbSc005 = HPSCTools.HpSc005.get(prodOrderNo);
inInfo.addBlock(CommonConstant.Field.DETAIL).addRow(dbSc005);
......@@ -209,6 +217,7 @@ public class ServiceHPSC005A extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "分派")
public EiInfo assign(EiInfo inInfo) {
try {
List<String> orderIds = (List<String>) inInfo.get("ids");
......@@ -257,6 +266,7 @@ public class ServiceHPSC005A extends ServiceBase {
*
* @param fSc005a
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "设置",operDesc = "设置基础信息")
private void setBaseInfo(HPSC005A fSc005a) {
// 厂区名称
fSc005a.setFactoryName(HPPZTools.HpPz011.getFactoryName(fSc005a.getFactoryCode()));
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005B.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.hp.sc.domain.HPSC005B;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.LogUtils;
......@@ -24,6 +25,7 @@ public class ServiceHPSC005B extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
......@@ -41,6 +43,7 @@ public class ServiceHPSC005B extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005C.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.pz.domain.HPPZ011;
......@@ -35,6 +36,7 @@ public class ServiceHPSC005C extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
......@@ -55,6 +57,7 @@ public class ServiceHPSC005C extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
package com.baosight.hpjx.hp.sc.service;
import cn.hutool.core.bean.BeanUtil;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.common.HPConstants;
import com.baosight.hpjx.core.constant.CommonConstant;
......@@ -37,6 +38,7 @@ public class ServiceHPSC006 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "生产下料",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
HPSC005 HPSC005 = new HPSC005();
......@@ -52,6 +54,7 @@ public class ServiceHPSC006 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "生产下料",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
HPSC005 HPSC005 = new HPSC005();
......@@ -62,7 +65,7 @@ public class ServiceHPSC006 extends ServiceBase {
return outInfo;
}
@OperationLogAnnotation(operModul = "生产下料",operType = "查询",operDesc = "查询明细")
public EiInfo queryDetail(EiInfo inInfo){
HPSC006 HPSC006 = new HPSC006();
EiInfo outInfo = new EiInfo();
......@@ -80,6 +83,7 @@ public class ServiceHPSC006 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "生产下料",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -121,6 +125,7 @@ public class ServiceHPSC006 extends ServiceBase {
/**
* 修改操作.
*/
@OperationLogAnnotation(operModul = "生产下料",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
HPSC006 HPSC006 = new HPSC006();
......@@ -158,6 +163,7 @@ public class ServiceHPSC006 extends ServiceBase {
/**
* 删除操作.
*/
@OperationLogAnnotation(operModul = "生产下料",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo eiInfo) {
HPSC006 HPSC006 = new HPSC006();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
......@@ -185,6 +191,7 @@ public class ServiceHPSC006 extends ServiceBase {
/**
* 绑定附件
*/
@OperationLogAnnotation(operModul = "生产下料",operType = "绑定",operDesc = "绑定附件")
public EiInfo bindDocIdById(EiInfo eiInfo) {
HPSC006 HPSC006 = new HPSC006();
EiBlock eiBlock = eiInfo.getBlock(EiConstant.resultBlock);
......@@ -215,6 +222,7 @@ public class ServiceHPSC006 extends ServiceBase {
* @param eiInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产下料",operType = "新增",operDesc = "分派")
public EiInfo assign(EiInfo eiInfo) {
try {
String ids = eiInfo.get("ids").toString();
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC007.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -31,6 +32,7 @@ public class ServiceHPSC007 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "下料登记",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
......@@ -52,6 +54,7 @@ public class ServiceHPSC007 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "下料登记",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/
......@@ -63,6 +66,7 @@ public class ServiceHPSC007 extends ServiceBase {
/**
* 新增操作.
*/
@OperationLogAnnotation(operModul = "下料登记",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -120,6 +124,7 @@ public class ServiceHPSC007 extends ServiceBase {
/**
* 修改操作.
*/
@OperationLogAnnotation(operModul = "下料登记",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
HPSC006 HPSC006 = new HPSC006();
......@@ -178,6 +183,7 @@ public class ServiceHPSC007 extends ServiceBase {
/**
* 删除操作.
*/
@OperationLogAnnotation(operModul = "下料登记",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
HPSC006 HPSC006 = new HPSC006();
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC011.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.security.UserSessionUtils;
import com.baosight.hpjx.hp.sc.domain.HPSC001;
......@@ -21,6 +22,7 @@ public class ServiceHPSC011 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "项目档案",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
inInfo.setCell(EiConstant.queryBlock, 0, "status", 1);
......@@ -40,6 +42,7 @@ public class ServiceHPSC011 extends ServiceBase {
/**
* 查询操作.
*/
@OperationLogAnnotation(operModul = "项目档案",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
/* 调用EI查询方法.*/
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC098.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.hp.pz.domain.HPPZ011;
import com.baosight.hpjx.util.CommonMethod;
......@@ -24,6 +25,7 @@ public class ServiceHPSC098 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "组织机构",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
......@@ -43,6 +45,7 @@ public class ServiceHPSC098 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "组织机构",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC099.java
package com.baosight.hpjx.hp.sc.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceBase;
......@@ -12,6 +13,7 @@ public class ServiceHPSC099 extends ServiceBase {
/**
* 画面初始化.
*/
@OperationLogAnnotation(operModul = "附件上传",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
return inInfo;
}
......@@ -20,6 +22,7 @@ public class ServiceHPSC099 extends ServiceBase {
/**
* 附件上传.
*/
@OperationLogAnnotation(operModul = "附件上传",operType = "上传",operDesc = "附件上传")
public EiInfo form(EiInfo inInfo) {
return inInfo;
}
......
src/main/java/com/baosight/hpjx/hp/xs/service/ServiceHPXSUser.java
package com.baosight.hpjx.hp.xs.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.security.UserSessionUtils;
import com.baosight.hpjx.hp.xs.domain.User;
......@@ -28,6 +29,7 @@ public class ServiceHPXSUser extends ServiceBase {
* @param eiInfo
* @return
*/
@OperationLogAnnotation(operModul = "用户信息",operType = "查询",operDesc = "获取用户信息")
public EiInfo getUser(EiInfo eiInfo) {
EiInfo outInfo = new EiInfo();
int status = 0;
......@@ -62,6 +64,7 @@ public class ServiceHPXSUser extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "用户信息",operType = "查询",operDesc = "查询用户下拉框")
public EiInfo queryComboBox(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
......@@ -81,6 +84,7 @@ public class ServiceHPXSUser extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "用户信息",operType = "查询",operDesc = "查询用户的企业下拉框")
public EiInfo queryCompanyComboBox(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
......
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java
package com.baosight.hpjx.hp.zl.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -36,6 +37,7 @@ public class ServiceHPZL001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "质量巡检单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.PROJ_RECORD_BLOCK_ID), null);
......@@ -56,6 +58,7 @@ public class ServiceHPZL001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "质量巡检单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -76,6 +79,7 @@ public class ServiceHPZL001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "质量巡检单",operType = "新增",operDesc = "新增")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -108,6 +112,7 @@ public class ServiceHPZL001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "质量巡检单",operType = "修改",operDesc = "修改")
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -136,6 +141,7 @@ public class ServiceHPZL001 extends ServiceBase {
*
* @param fZl001
*/
@OperationLogAnnotation(operModul = "质量巡检单",operType = "设置",operDesc = "设置基础信息")
private void setBaseInfo(HPZL001 fZl001) {
// 项目名称
// fZl001.setProjName(HPSCTools.HpSc001.get(fZl001.getProjCode()).getProjName());
......@@ -156,6 +162,7 @@ public class ServiceHPZL001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "质量巡检单",operType = "删除",operDesc = "删除")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......@@ -181,6 +188,7 @@ public class ServiceHPZL001 extends ServiceBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "质量巡检单",operType = "修改",operDesc = "已处理")
public EiInfo doProcess(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001A.java
package com.baosight.hpjx.hp.zl.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.sc.domain.HPSC002;
......@@ -31,6 +32,7 @@ public class ServiceHPZL001A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "初始化")
public EiInfo initLoad(EiInfo inInfo) {
try {
// 查询物料ID所对应的项目名称和部件名称
......@@ -53,6 +55,7 @@ public class ServiceHPZL001A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -69,6 +72,7 @@ public class ServiceHPZL001A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "新增操作")
@Override
public EiInfo insert(EiInfo inInfo) {
try {
......@@ -96,6 +100,7 @@ public class ServiceHPZL001A extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "删除操作")
public EiInfo delete(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001B.java
package com.baosight.hpjx.hp.zl.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.ProdOrderStatusEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
......@@ -43,6 +44,7 @@ public class ServiceHPZL001B extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "初始化")
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
......@@ -59,6 +61,7 @@ public class ServiceHPZL001B extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "查询")
@Override
public EiInfo query(EiInfo inInfo) {
try {
......@@ -78,6 +81,7 @@ public class ServiceHPZL001B extends ServiceEPBase {
* @param inInfo
* @return
*/
@OperationLogAnnotation(operModul = "生产任务查询",operType = "新增",operDesc = "生成巡检单")
public EiInfo select(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
......
src/main/webapp/HP/RZ/HPRZ001.js 0 → 100644
$(function() {
IPLATUI.EFGrid.result = {
pageable: {
pageSize: 20,
pageSizes: [10, 20, 50, 70, 100],
},
}
// 查询
$("#QUERY").on("click", query);
});
/**
* 查询
*/
function query () {
resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
}
/**
* 页面加载时执行
*/
$(window).load(function () {
// 查询
query();
});
src/main/webapp/HP/RZ/HPRZ001.jsp 0 → 100644
<!DOCTYPE html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<EF:EFPage title="日志查询">
<EF:EFRegion id="inqu" title="查询条件">
<div class="row">
<EF:EFSelect cname="企业编码" ename="inqu_status-0-companyCode" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="company_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFInput cname="创建人名称" ename="inqu_status-0-createdName" colWidth="3"/>
<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
format="yyyyMMdd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan>
</div>
<div class="row">
<EF:EFSelect cname="操作模块" ename="inqu_status-0-operModul" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="oper_modul_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFSelect cname="操作类型" ename="inqu_status-0-operType" colWidth="3" filter="contains" defultValue="">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="oper_type_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div>
</EF:EFRegion>
<EF:EFRegion id="result" title="明细信息">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
<EF:EFColumn ename="id" cname="主键id" hidden="true"/>
<EF:EFColumn ename="companyCode" cname="企业编码" enable="false" readonly="true" width="100" align="center"/>
<EF:EFColumn ename="createdName" cname="创建人名称" enable="false" readonly="true" width="100" align="center"/>
<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" readonly="true" width="120" align="center"/>
<EF:EFColumn ename="operModul" cname="操作模块" enable="false" readonly="true" width="100" align="center"/>
<EF:EFColumn ename="operType" cname="操作类型" enable="false" readonly="true" width="80" align="center"/>
<EF:EFColumn ename="operDesc" cname="操作说明" enable="false" readonly="true" width="100" align="center"/>
<EF:EFColumn ename="operContent" cname="操作内容" enable="false" readonly="true" width="800" align="center"/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
<script>
var ctx = "${ctx}";
</script>
<script src="${ctx}/HP/RZ/HPRZ001.js"></script>
src/main/webapp/HP/SC/HPSC003.jsp
......@@ -8,7 +8,7 @@
<EF:EFPage title="生产计划">
<EF:EFRegion id="inqu" title="查询条件" align-item="center">
<div class="row">
<EF:EFInput cname="项目编号" blockId="inqu_status" ename="projCode" row="0" colWidth="3"/>
<%--<EF:EFInput cname="项目编号" blockId="inqu_status" ename="projCode" row="0" colWidth="3"/>--%>
<EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3"/>
<EF:EFInput cname="部件名称" blockId="inqu_status" ename="prdtName" row="0" colWidth="3"/>
<EF:EFInput cname="生产计划单号" blockId="inqu_status" ename="planInfoNo" row="0" colWidth="3"/>
......@@ -27,20 +27,20 @@
<EF:EFGrid blockId="result" autoDraw="no">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
<EF:EFColumn enable="false" ename="projCode" cname="项目号" readonly="true"/>
<EF:EFColumn enable="false" ename="projName" cname="项目名称" readonly="true"/>
<EF:EFColumn enable="false" ename="planInfoNo" cname="生产计划单号" readonly="true"/>
<EF:EFColumn enable="false" ename="projCode" cname="项目号" readonly="true" hidden="true"/>
<EF:EFColumn enable="false" ename="planInfoNo" cname="生产计划单号" readonly="true" width="100"/>
<EF:EFColumn enable="false" ename="projName" cname="项目名称" width="120" readonly="true"/>
<EF:EFComboColumn ename="prdtType" cname="部件类型" hidden = 'true' width="90" align="center" enable="false">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="prdtCode" cname="部件编码" readonly="true" hidden = "true"/>
<EF:EFColumn enable="false" ename="prdtName" cname="部件名称" readonly="true"/>
<EF:EFColumn enable="false" ename="spec" cname="规格" readonly="true"/>
<EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" width="150" editType="date"
<EF:EFColumn enable="false" ename="prdtCode" cname="部件编码" readonly="true" hidden = "true" />
<EF:EFColumn enable="false" ename="prdtName" cname="部件名称" readonly="true" width="120"/>
<EF:EFColumn enable="false" ename="spec" cname="规格" readonly="true" align="center" width="100"/>
<EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true" width="100"/>
<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" width="100" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required='true'/>
<EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" readonly="true"/>
<EF:EFComboColumn enable="false" ename="status" cname="状态">
<EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" width="80" readonly="true" align="center"/>
<EF:EFComboColumn enable="false" ename="status" cname="状态" width="60" align="center">
<EF:EFOption label="未提交" value="0"/>
<EF:EFOption label="已提交" value="1"/>
</EF:EFComboColumn>
......@@ -54,25 +54,25 @@
<EF:EFColumn ename="companyCode" cname="企业编码" hidden="true"/>
<EF:EFColumn ename="projCode" cname="项目编码" hidden="true"/>
<EF:EFColumn ename="parentId" cname="父ID" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" align="center"/>
<EF:EFComboColumn ename="prdtType" cname="零件类型" width="90" align="center" readonly="true">
<EF:EFCodeOption codeName="hpjx.hpkc.inventType"/>
</EF:EFComboColumn>
<EF:EFColumn enable="false" ename="prdtCode" cname="零件编码" hidden = "true"/>
<EF:EFColumn enable="false" ename="prdtName" readonly="true" cname="零件名称"/>
<EF:EFColumn enable="false" ename="spec" cname="规格" readonly="true"/>
<EF:EFColumn enable="false" ename="spec" cname="规格" align="center" readonly="true"/>
<EF:EFColumn enable="false" ename="remark" cname="备注" readonly="true"/>
<EF:EFColumn enable="false" ename="num" readonly="true" cname="数量"/>
<EF:EFColumn enable="false" ename="unitWt" readonly="true" cname="单重"/>
<EF:EFColumn ename="totalWt" cname="总重" enable="false"/>
<EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" width="150" editType="date"
<EF:EFColumn enable="false" ename="num" readonly="true" width="80" align="right" cname="数量"/>
<EF:EFColumn enable="false" ename="unitWt" readonly="true" width="80" align="right" cname="单重"/>
<EF:EFColumn ename="totalWt" cname="总重" width="80" align="right" enable="false"/>
<EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" width="100" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" width="150" editType="date"
<EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" width="100" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
<EF:EFColumn ename="actualCompletionDate" cname="完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
<EF:EFColumn ename="actualCompletionDate" cname="完成时间" editType="date" dateFormat="yyyy/MM/dd" width="100"
enable="false"/>
<EF:EFColumn enable="false" ename="actualCompletionNum" cname="完成数量" readonly="true"/>
<EF:EFColumn enable="false" ename="actualCompletionUnitWt" cname="完成总重" readonly="true"/>
<EF:EFColumn enable="false" ename="actualCompletionNum" width="80" align="right" cname="完成数量" readonly="true"/>
<EF:EFColumn enable="false" ename="actualCompletionUnitWt" width="80" align="right" cname="完成总重" readonly="true"/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
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