jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

增加包装条码现品票打印类

Browse Source
tags/yfai-mes-ext-v1.0
yxw 1 year ago
parent 3ec57a1497
commit b2d40c433d
6 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/jx/IJxRepairJudgeTypeService.java
Unescape Escape View File

@ -41,7 +41,7 @@ public interface IJxRepairJudgeTypeService {
* @param userName
*/
@ApiOperation(value = "根据ID启用或禁用维修判定类型", notes = "根据ID启用或禁用维修判定类型")
int updateRepairJudgeTypeValidById(BatchIdModel model, String userName);
int updateRepairJudgeTypeValidById(String[] ids, int status, String userName);
/**
* 根据ID启用或禁用维修判定类型

6
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/ManageCodeController.java
Unescape Escape View File

@ -99,13 +99,13 @@ public class ManageCodeController {
@PutMapping(value = "/update-status-batch")
@ApiOperation(value = "批量禁用/启用详情", notes = "批量禁用/启用详情")
public ResultBean updateMesManageCodeStatus(String[] idsStr, int status) {
public ResultBean updateMesManageCodeStatus(String[] ids, int status) {
try {
ConvertBean.modelSafeArrayNumber(idsStr, true);
ConvertBean.modelSafeArrayNumber(ids, true);
//登陆用户
SessionUser user = AuthUtil.getSessionUser();
manageCodeService.updateMesManageCodeStatus(idsStr, status, user.getUserName());
manageCodeService.updateMesManageCodeStatus(ids, status, user.getUserName());
return ResultBean.success("修改成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {

12
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/jx/RepairJudgeTypeController.java
Unescape Escape View File

@ -96,19 +96,19 @@ public class RepairJudgeTypeController extends MesBaseController {
}
}
@PutMapping(value = "/update-status-batch")
@PostMapping(value = "/update-status-batch")
@ApiOperation(value = "批量禁用/启用详情", notes = "批量禁用/启用详情")
public ResultBean updateMesRepairJudgeTypeStatus(@RequestBody BatchIdModel model) {
public ResultBean updateMesRepairJudgeTypeStatus(String[] ids, int status) {
try {
ValidatorBean.checkNotNull(model.getStatus(), "未有启用禁用标志");
ValidatorBean.checkNotNull(model.getIds(), "未选择启用/禁用资源");
ValidatorBean.checkNotNull(status, "未有启用禁用标志");
ValidatorBean.checkNotNull(ids, "未选择启用/禁用资源");
ConvertBean.modelSafeArrayNumber(model.getIds(), true);
ConvertBean.modelSafeArrayNumber(ids, true);
//登陆用户
SessionUser user = AuthUtil.getSessionUser();
repairJudgeTypeService.updateRepairJudgeTypeValidById(model, user.getUserName());
repairJudgeTypeService.updateRepairJudgeTypeValidById(ids, status, user.getUserName());
return ResultBean.success("修改成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {

6
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/JxMesRepairJudgeTypeService.java
Unescape Escape View File

@ -106,14 +106,14 @@ public class JxMesRepairJudgeTypeService implements IJxRepairJudgeTypeService {
}
@Override
public int updateRepairJudgeTypeValidById(BatchIdModel model, String userName) {
public int updateRepairJudgeTypeValidById(String[] ids, int status, String userName) {
StringBuffer wheres = new StringBuffer();
HqlPack.getInPack(String.join(",", model.getIds()), MesExtConstWords.ID, wheres);
HqlPack.getInPack(String.join(",", ids), MesExtConstWords.ID, wheres);
int num = repairJudgeTypeRepository.updateByHqlWhere(
wheres.toString(),
new String[]{MesExtConstWords.SYSTEM_SYNC_STATUS, MesExtConstWords.IS_VALID, MesExtConstWords.MODIFY_USER, MesExtConstWords.MODIFY_DATE_TIME},
new Object[]{MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), model.getStatus(), userName, TimeTool.getNowTime(true)}
new Object[]{MesExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue(), status, userName, TimeTool.getNowTime(true)}
);
return num;
}

22
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/jx/ManageCodeExcelService.java
Unescape Escape View File

@ -141,13 +141,7 @@ public class ManageCodeExcelService implements IExcelImportExtService {
}
//校验管理码
if (!StringUtils.isEmpty(manageCode)) {
if (!manageCodeMap.containsKey(manageCode)) {
errorNum++;
cellNum += "A;";
errorInfo += "第A列数据无效;";
}
} else {
if (StringUtils.isEmpty(manageCode)) {
errorNum++;
cellNum += "A;";
errorInfo += "第A列数据必填;";
@ -172,17 +166,19 @@ public class ManageCodeExcelService implements IExcelImportExtService {
//校验唯一性 不重复
if (!manageCodeByOnlyMap.containsKey(key)) {
manageCodeByOnlyMap.put(key, String.valueOf(rowNum));
//根据管理码查询替代信息中是否存在数据
if (StringUtils.isEmpty(errorInfo) && !CollectionUtils.isEmpty(manageCodeMap) && manageCodeMap.containsKey(key)) {
errorNum++;
cellNum += "A;";
errorInfo += "第A列数据已经存在数据库;";
}
//if (StringUtils.isEmpty(errorInfo) && !CollectionUtils.isEmpty(manageCodeMap) && manageCodeMap.containsKey(key)) {
// errorNum++;
// cellNum += "A;";
// errorInfo += "第A列数据已经存在数据库;";
//}
//校验是否已经存在数据库
if (!CollectionUtils.isEmpty(manageCodeMap) && manageCodeMap.containsKey(key)) isExist = true;
if (StringUtils.isEmpty(errorInfo) && !CollectionUtils.isEmpty(manageCodeMap) && manageCodeMap.containsKey(key)) isExist = true;
} else {
errorNum++;
cellNum += "A;";

2
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java
Unescape Escape View File

@ -819,7 +819,7 @@ public class MesExtHqlPack {
}
public static DdlPackBean getMesManageCode(MesManageCode manageCode) {
DdlPackBean packBean = getAllBaseData(manageCode.getOrganizeCode());
DdlPackBean packBean = getAllBaseDataByNormalPro(manageCode.getOrganizeCode(), manageCode.getIsValid());
DdlPreparedPack.getStringLikerPack(manageCode.getManageCode(), MesExtConstWords.MANAGE_CODE, packBean);
DdlPreparedPack.getStringLikerPack(manageCode.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);
DdlPreparedPack.getStringLikerPack(manageCode.getWorkCenterName(), MesExtConstWords.WORK_CENTER_NAME, packBean);

Write Preview
Loading…
Cancel
Save