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

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java

@@ -50,7 +50,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "生产入库单-生产任务查询-初始化")
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005.java

@@ -117,7 +117,6 @@ public class ServiceHPKC005 extends ServiceBase {
 	 *
 	 * @param fKc005
 	 */
-	@OperationLogAnnotation(operModul = "库存盘点单",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(HPKC005 fKc005) {
 		// 去除日期字符串中的-
 		fKc005.setReceiptDate(StringUtil.removeHorizontalLine(fKc005.getReceiptDate()));

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC006.java

@@ -146,7 +146,6 @@ 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();
@@ -164,7 +163,6 @@ public class ServiceHPKC006 extends ServiceBase {
 	 *
 	 * @param fKc006
 	 */
-	@OperationLogAnnotation(operModul = "其他入库单",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(HPKC006 fKc006) {
 		// 去除日期字符串中的-
 		fKc006.setReceiptDate(StringUtil.removeHorizontalLine(fKc006.getReceiptDate()));

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007.java

@@ -167,7 +167,6 @@ 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();
@@ -185,7 +184,6 @@ public class ServiceHPKC007 extends ServiceBase {
 	 *
 	 * @param fKc007
 	 */
-	@OperationLogAnnotation(operModul = "其他出库单",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(HPKC007 fKc007) {
 		// 去除日期字符串中的-
 		fKc007.setReceiptDate(StringUtil.removeHorizontalLine(fKc007.getReceiptDate()));

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC009.java

@@ -170,7 +170,6 @@ public class ServiceHPKC009 extends ServiceBase {
 	 *
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存收发存",operType = "插入",operDesc = "统计库存收发存")
 	private List<HPKC009> statData(Map queryMap) {
 		List<HPKC009> newKc009s = new ArrayList<>();
 		// 1.1、期末库存
@@ -288,7 +287,6 @@ 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());
@@ -323,7 +321,6 @@ 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

@@ -164,7 +164,6 @@ public class ServiceHPKC009A extends ServiceBase {
 	 *
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "统计库存收发存")
 	private List<HPKC009A> statData(Map queryMap) {
 		List<HPKC009A> newKc009As = new ArrayList<>();
 		// 1.1、期末库存
@@ -236,7 +235,6 @@ 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());
@@ -285,7 +283,6 @@ 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

@@ -182,8 +182,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);
@@ -232,7 +231,6 @@ 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/ServiceHPKC011.java

@@ -171,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 {
@@ -214,7 +214,6 @@ 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/pz/service/ServiceHPPZ006.java

@@ -105,7 +105,6 @@ 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();

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ009.java

@@ -100,7 +100,6 @@ 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++) {
@@ -118,7 +117,6 @@ 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));
@@ -138,7 +136,6 @@ public class ServiceHPPZ009 extends ServiceBase {
 	 *
 	 * @param fPz009
 	 */
-	@OperationLogAnnotation(operModul = "企业管理",operType = "修改",operDesc = "修改")
 	private void modify(HPPZ009 fPz009) {
 		DaoUtils.update("HPPZ009.update", fPz009);
 	}
@@ -176,7 +173,6 @@ 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();
@@ -205,7 +201,6 @@ public class ServiceHPPZ009 extends ServiceBase {
 	 *
 	 * @param hppz009
 	 */
-	@OperationLogAnnotation(operModul = "企业管理",operType = "新增",operDesc = "用户关联角色")
 	private void insertGroupMember(HPPZ009 hppz009) {
 		String companyCode = hppz009.getCompanyCode();
 		Map inInfoRowMap = new HashMap();

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ010.java

@@ -99,7 +99,6 @@ 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++) {
@@ -116,7 +115,6 @@ 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"));
@@ -133,7 +131,6 @@ public class ServiceHPPZ010 extends ServiceBase {
 	 *
 	 * @param fPz009
 	 */
-	@OperationLogAnnotation(operModul = "配置管理",operType = "修改",operDesc = "修改数据")
 	private void modify(HPPZ009 fPz009) {
 		DaoUtils.update("HPPZ009.update", fPz009);
 	}
@@ -171,7 +168,6 @@ 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();
@@ -200,7 +196,6 @@ public class ServiceHPPZ010 extends ServiceBase {
 	 *
 	 * @param hppz009
 	 */
-	@OperationLogAnnotation(operModul = "配置管理",operType = "查询",operDesc = "用户关联角色")
 	private void insertGroupMember(HPPZ009 hppz009) {
 		String companyCode = hppz009.getCompanyCode();
 		Map inInfoRowMap = new HashMap();

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ011.java

@@ -116,7 +116,6 @@ 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++) {
@@ -132,7 +131,6 @@ 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);
@@ -143,7 +141,6 @@ public class ServiceHPPZ011 extends ServiceBase {
 	 *
 	 * @param fPz011
 	 */
-	@OperationLogAnnotation(operModul = "厂区管理",operType = "修改",operDesc = "修改数据")
 	private void modify(HPPZ011 fPz011) {
 		DaoUtils.update(HPPZ011.UPDATE, fPz011);
 	}

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java

@@ -226,7 +226,6 @@ 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));

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005A.java

@@ -123,7 +123,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param dbSc005
 	 * @param fSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "生产订单-拆单派工A-新增")
 	private void add(HPSC005 dbSc005, HPSC005A fSc005a) {
 		String prodOrderNo = dbSc005.getProdOrderNo();
 		// 数据校验
@@ -148,7 +147,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param fSc005a
 	 * @param mapSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "修改",operDesc = "生产订单-拆单派工A-修改数据")
 	private void modify(HPSC005 dbSc005, HPSC005A fSc005a, Map<String, HPSC005A> mapSc005a) {
 		String prodOrderNo = dbSc005.getProdOrderNo();
 		// 数据校验
@@ -204,7 +202,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "刷新",operDesc = "生产订单-拆单派工A-刷新主订单信息")
 	private EiInfo refreshOrderInfo(EiInfo inInfo, String prodOrderNo) {
 		HPSC005 dbSc005 = HPSCTools.HpSc005.get(prodOrderNo);
 		inInfo.addBlock(CommonConstant.Field.DETAIL).addRow(dbSc005);
@@ -266,7 +263,6 @@ public class ServiceHPSC005A extends ServiceBase {
 	 *
 	 * @param fSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "设置",operDesc = "生产订单-拆单派工A-设置基础信息")
 	private void setBaseInfo(HPSC005A fSc005a) {
 		// 厂区名称
 		fSc005a.setFactoryName(HPPZTools.HpPz011.getFactoryName(fSc005a.getFactoryCode()));

src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java

@@ -141,7 +141,6 @@ public class ServiceHPZL001 extends ServiceBase {
 	 *
 	 * @param fZl001
 	 */
-	@OperationLogAnnotation(operModul = "质量巡检单",operType = "设置",operDesc = "设置基础信息")
 	private void setBaseInfo(HPZL001 fZl001) {
 		// 项目名称
 //		fZl001.setProjName(HPSCTools.HpSc001.get(fZl001.getProjCode()).getProjName());