yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
guochaojie 2 months ago
parent 98b9654b91 d83a577ad8
commit a02f2c7668
16 changed files with 430 additions and 217 deletions
Show Stats Download Patch File Download Diff File

6
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDayWorkService.java
Unescape View File

@ -47,4 +47,10 @@ public interface YysDayWorkService extends IService<YysDayWorkEntity> {
* @return * @return
*/ */
String sure(ConfirmResponse request); String sure(ConfirmResponse request);
void syncIsForzen(String id);
String isFrozen(String id);
String cancelFrozen(String id);
} }

3
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysMonthlyProductionService.java
Unescape View File

@ -35,4 +35,7 @@ public interface YysMonthlyProductionService extends IService<YysMonthlyProducti
// 查询未进行MPR运算的计划 // 查询未进行MPR运算的计划
List<YysMonthlyProductionEntity> getUnMPRList(String month); List<YysMonthlyProductionEntity> getUnMPRList(String month);
String isFrozen(String id);
String cancelFrozen(String id);
} }

345
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDayWorkServiceImpl.java
Unescape View File

@ -28,7 +28,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
*
* yysDayWork * yysDayWork
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -36,7 +35,7 @@ import java.util.stream.Collectors;
* 日期： 2024-08-19 * 日期： 2024-08-19
*/ */
@Service @Service
public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayWorkEntity> implements YysDayWorkService{ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayWorkEntity> implements YysDayWorkService {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -62,112 +61,115 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
private YysRequisitionReportService yysRequisitionReportService; private YysRequisitionReportService yysRequisitionReportService;
@Override @Override
public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination){ public List<YysDayWorkEntity> getList(YysDayWorkPagination yysDayWorkPagination) {
return getTypeList(yysDayWorkPagination,yysDayWorkPagination.getDataType()); return getTypeList(yysDayWorkPagination, yysDayWorkPagination.getDataType());
} }
/** 列表查询 */
/**
* 列表查询
*/
@Override @Override
public List<YysDayWorkEntity> getTypeList(YysDayWorkPagination yysDayWorkPagination,String dataType){ public List<YysDayWorkEntity> getTypeList(YysDayWorkPagination yysDayWorkPagination, String dataType) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList =new ArrayList<>(); List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? YysDayWorkConstant.getAppColumnData() : YysDayWorkConstant.getColumnData(); String columnData = !isPc ? YysDayWorkConstant.getAppColumnData() : YysDayWorkConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0; int total = 0;
int yysDayWorkNum =0; int yysDayWorkNum = 0;
QueryWrapper<YysDayWorkEntity> yysDayWorkQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysDayWorkEntity> yysDayWorkQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp = "";
if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>(); List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>(); List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysDayWorkPagination.getSuperQueryJson(); String queryJson = yysDayWorkPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<YysDayWorkEntity> yysDayWorkSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysDayWorkEntity> yysDayWorkSuperWrapper = new QueryWrapper<>();
yysDayWorkSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayWorkSuperWrapper,YysDayWorkEntity.class,queryJson,"0")); yysDayWorkSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayWorkSuperWrapper, YysDayWorkEntity.class, queryJson, "0"));
int yysDayWorkNum1 = yysDayWorkSuperWrapper.getExpression().getNormal().size(); int yysDayWorkNum1 = yysDayWorkSuperWrapper.getExpression().getNormal().size();
if (yysDayWorkNum1>0){ if (yysDayWorkNum1 > 0) {
List<String> yysDayWorkList =this.list(yysDayWorkSuperWrapper).stream().map(YysDayWorkEntity::getId).collect(Collectors.toList()); List<String> yysDayWorkList = this.list(yysDayWorkSuperWrapper).stream().map(YysDayWorkEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysDayWorkList); allSuperList.addAll(yysDayWorkList);
intersectionSuperList.add(yysDayWorkList); intersectionSuperList.add(yysDayWorkList);
superNum++; superNum++;
} }
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or //and or
if(superOp.equalsIgnoreCase("and")){ if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{ } else {
allSuperIDlist = allSuperList; allSuperIDlist = allSuperList;
} }
} }
List<String> allRuleIDlist = new ArrayList<>(); List<String> allRuleIDlist = new ArrayList<>();
String ruleOp =""; String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)){ if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>(); List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>(); List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0; int ruleNum = 0;
QueryWrapper<YysDayWorkEntity> yysDayWorkSuperWrapper = new QueryWrapper<>(); QueryWrapper<YysDayWorkEntity> yysDayWorkSuperWrapper = new QueryWrapper<>();
yysDayWorkSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayWorkSuperWrapper,YysDayWorkEntity.class,ruleJson,"0")); yysDayWorkSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayWorkSuperWrapper, YysDayWorkEntity.class, ruleJson, "0"));
int yysDayWorkNum1 = yysDayWorkSuperWrapper.getExpression().getNormal().size(); int yysDayWorkNum1 = yysDayWorkSuperWrapper.getExpression().getNormal().size();
if (yysDayWorkNum1>0){ if (yysDayWorkNum1 > 0) {
List<String> yysDayWorkList =this.list(yysDayWorkSuperWrapper).stream().map(YysDayWorkEntity::getId).collect(Collectors.toList()); List<String> yysDayWorkList = this.list(yysDayWorkSuperWrapper).stream().map(YysDayWorkEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysDayWorkList); allRuleList.addAll(yysDayWorkList);
intersectionRuleList.add(yysDayWorkList); intersectionRuleList.add(yysDayWorkList);
ruleNum++; ruleNum++;
} }
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or //and or
if(ruleOp.equalsIgnoreCase("and")){ if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{ } else {
allRuleIDlist = allRuleList; allRuleIDlist = allRuleList;
} }
} }
boolean pcPermission = false; boolean pcPermission = false;
boolean appPermission = false; boolean appPermission = false;
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object yysDayWorkObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayWorkQueryWrapper,YysDayWorkEntity.class,yysDayWorkPagination.getMenuId(),"0")); Object yysDayWorkObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayWorkQueryWrapper, YysDayWorkEntity.class, yysDayWorkPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysDayWorkObj)){ if (ObjectUtil.isEmpty(yysDayWorkObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysDayWorkQueryWrapper = (QueryWrapper<YysDayWorkEntity>)yysDayWorkObj; yysDayWorkQueryWrapper = (QueryWrapper<YysDayWorkEntity>) yysDayWorkObj;
if( yysDayWorkQueryWrapper.getExpression().getNormal().size()>0){ if (yysDayWorkQueryWrapper.getExpression().getNormal().size() > 0) {
yysDayWorkNum++; yysDayWorkNum++;
} }
} }
} }
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysDayWorkObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayWorkQueryWrapper,YysDayWorkEntity.class,yysDayWorkPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysDayWorkObj)){
return new ArrayList<>();
} else {
yysDayWorkQueryWrapper = (QueryWrapper<YysDayWorkEntity>)yysDayWorkObj;
if( yysDayWorkQueryWrapper.getExpression().getNormal().size()>0){
yysDayWorkNum++;
}
} }
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysDayWorkObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayWorkQueryWrapper, YysDayWorkEntity.class, yysDayWorkPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysDayWorkObj)) {
return new ArrayList<>();
} else {
yysDayWorkQueryWrapper = (QueryWrapper<YysDayWorkEntity>) yysDayWorkObj;
if (yysDayWorkQueryWrapper.getExpression().getNormal().size() > 0) {
yysDayWorkNum++;
}
}
} }
} }
if(isPc){ if (isPc) {
if(ObjectUtil.isNotEmpty(yysDayWorkPagination.getManufactureTime())){ if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getManufactureTime())) {
yysDayWorkNum++; yysDayWorkNum++;
List ManufactureTimeList = JsonUtil.getJsonToList(yysDayWorkPagination.getManufactureTime(),String.class); List ManufactureTimeList = JsonUtil.getJsonToList(yysDayWorkPagination.getManufactureTime(), String.class);
Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0))); Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1))); Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
yysDayWorkQueryWrapper.lambda().ge(YysDayWorkEntity::getManufactureTime, new Date(fir)) yysDayWorkQueryWrapper.lambda().ge(YysDayWorkEntity::getManufactureTime, new Date(fir))
.le(YysDayWorkEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); .le(YysDayWorkEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
} }
@ -186,74 +188,74 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
yysDayWorkNum++; yysDayWorkNum++;
String value = yysDayWorkPagination.getProductName() instanceof List ? String value = yysDayWorkPagination.getProductName() instanceof List ?
JsonUtil.getObjectToString(yysDayWorkPagination.getProductName()) : JsonUtil.getObjectToString(yysDayWorkPagination.getProductName()) :
String.valueOf(yysDayWorkPagination.getProductName()); String.valueOf(yysDayWorkPagination.getProductName());
yysDayWorkQueryWrapper.lambda().like(YysDayWorkEntity::getProductName,value); yysDayWorkQueryWrapper.lambda().like(YysDayWorkEntity::getProductName, value);
} }
if(ObjectUtil.isNotEmpty(yysDayWorkPagination.getDeviceName())){ if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getDeviceName())) {
yysDayWorkNum++; yysDayWorkNum++;
String value = yysDayWorkPagination.getDeviceName() instanceof List ? String value = yysDayWorkPagination.getDeviceName() instanceof List ?
JsonUtil.getObjectToString(yysDayWorkPagination.getDeviceName()) : JsonUtil.getObjectToString(yysDayWorkPagination.getDeviceName()) :
String.valueOf(yysDayWorkPagination.getDeviceName()); String.valueOf(yysDayWorkPagination.getDeviceName());
yysDayWorkQueryWrapper.lambda().like(YysDayWorkEntity::getDeviceName,value); yysDayWorkQueryWrapper.lambda().like(YysDayWorkEntity::getDeviceName, value);
} }
if(ObjectUtil.isNotEmpty(yysDayWorkPagination.getProductionStatus())){ if (ObjectUtil.isNotEmpty(yysDayWorkPagination.getProductionStatus())) {
yysDayWorkNum++; yysDayWorkNum++;
List<String> idList = new ArrayList<>(); List<String> idList = new ArrayList<>();
try { try {
String[][] productionStatus = JsonUtil.getJsonToBean(yysDayWorkPagination.getProductionStatus(),String[][].class); String[][] productionStatus = JsonUtil.getJsonToBean(yysDayWorkPagination.getProductionStatus(), String[][].class);
for(int i=0;i<productionStatus.length;i++){ for (int i = 0; i < productionStatus.length; i++) {
if(productionStatus[i].length>0){ if (productionStatus[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(productionStatus[i]))); idList.add(JsonUtil.getObjectToString(Arrays.asList(productionStatus[i])));
} }
} }
}catch (Exception e1){ } catch (Exception e1) {
try { try {
List<String> productionStatus = JsonUtil.getJsonToList(yysDayWorkPagination.getProductionStatus(),String.class); List<String> productionStatus = JsonUtil.getJsonToList(yysDayWorkPagination.getProductionStatus(), String.class);
if(productionStatus.size()>0){ if (productionStatus.size() > 0) {
idList.addAll(productionStatus); idList.addAll(productionStatus);
} }
}catch (Exception e2){ } catch (Exception e2) {
idList.add(String.valueOf(yysDayWorkPagination.getProductionStatus())); idList.add(String.valueOf(yysDayWorkPagination.getProductionStatus()));
} }
} }
yysDayWorkQueryWrapper.lambda().and(t->{ yysDayWorkQueryWrapper.lambda().and(t -> {
idList.forEach(tt->{ idList.forEach(tt -> {
t.like(YysDayWorkEntity::getProductionStatus, tt).or(); t.like(YysDayWorkEntity::getProductionStatus, tt).or();
}); });
}); });
} }
} }
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList); List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){ if (total > 0) {
if (intersection.size()==0){ if (intersection.size() == 0) {
intersection.add("jnpfNullList"); intersection.add("jnpfNullList");
} }
yysDayWorkQueryWrapper.lambda().in(YysDayWorkEntity::getId, intersection); yysDayWorkQueryWrapper.lambda().in(YysDayWorkEntity::getId, intersection);
} }
//是否有高级查询 //是否有高级查询
if (StringUtil.isNotEmpty(superOp)){ if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size()==0){ if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList"); allSuperIDlist.add("jnpfNullList");
} }
List<String> finalAllSuperIDlist = allSuperIDlist; List<String> finalAllSuperIDlist = allSuperIDlist;
yysDayWorkQueryWrapper.lambda().and(t->t.in(YysDayWorkEntity::getId, finalAllSuperIDlist)); yysDayWorkQueryWrapper.lambda().and(t -> t.in(YysDayWorkEntity::getId, finalAllSuperIDlist));
} }
//是否有数据过滤查询 //是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){ if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size()==0){ if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList"); allRuleIDlist.add("jnpfNullList");
} }
List<String> finalAllRuleIDlist = allRuleIDlist; List<String> finalAllRuleIDlist = allRuleIDlist;
yysDayWorkQueryWrapper.lambda().and(t->t.in(YysDayWorkEntity::getId, finalAllRuleIDlist)); yysDayWorkQueryWrapper.lambda().and(t -> t.in(YysDayWorkEntity::getId, finalAllRuleIDlist));
} }
//假删除标志 //假删除标志
yysDayWorkQueryWrapper.lambda().isNull(YysDayWorkEntity::getDeleteMark); yysDayWorkQueryWrapper.lambda().isNull(YysDayWorkEntity::getDeleteMark);
@ -276,79 +278,88 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
// } // }
// } // }
if("0".equals(dataType)){ if ("0".equals(dataType)) {
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<YysDayWorkEntity> page=new Page<>(yysDayWorkPagination.getCurrentPage(), yysDayWorkPagination.getPageSize()); Page<YysDayWorkEntity> page = new Page<>(yysDayWorkPagination.getCurrentPage(), yysDayWorkPagination.getPageSize());
IPage<YysDayWorkEntity> userIPage=this.page(page, yysDayWorkQueryWrapper); IPage<YysDayWorkEntity> userIPage = this.page(page, yysDayWorkQueryWrapper);
return yysDayWorkPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return yysDayWorkPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<YysDayWorkEntity> list = new ArrayList(); List<YysDayWorkEntity> list = new ArrayList();
return yysDayWorkPagination.setData(list, list.size()); return yysDayWorkPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(yysDayWorkQueryWrapper); return this.list(yysDayWorkQueryWrapper);
} }
} }
@Override @Override
public YysDayWorkEntity getInfo(String id){ public YysDayWorkEntity getInfo(String id) {
QueryWrapper<YysDayWorkEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<YysDayWorkEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysDayWorkEntity::getId,id); queryWrapper.lambda().eq(YysDayWorkEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(YysDayWorkEntity entity){ public void create(YysDayWorkEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, YysDayWorkEntity entity){ public boolean update(String id, YysDayWorkEntity entity) {
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(YysDayWorkEntity entity){ public void delete(YysDayWorkEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override @Override
public String checkForm(YysDayWorkForm form,int i) { public String checkForm(YysDayWorkForm form, int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id=""; String id = "";
String countRecover = ""; String countRecover = "";
if (isUp){ if (isUp) {
id = form.getId(); id = form.getId();
} }
//主表字段验证 //主表字段验证
if(StringUtil.isEmpty(form.getProductName())){ if (StringUtil.isEmpty(form.getProductName())) {
return "产品名称不能为空"; return "产品名称不能为空";
} }
if(StringUtil.isNotEmpty(form.getProductName())){ if (StringUtil.isNotEmpty(form.getProductName())) {
form.setProductName(form.getProductName().trim()); form.setProductName(form.getProductName().trim());
QueryWrapper<YysDayWorkEntity> productNameWrapper=new QueryWrapper<>(); QueryWrapper<YysDayWorkEntity> productNameWrapper = new QueryWrapper<>();
productNameWrapper.lambda().eq(YysDayWorkEntity::getProductName,form.getProductName()); productNameWrapper.lambda().eq(YysDayWorkEntity::getProductName, form.getProductName());
//假删除标志 //假删除标志
productNameWrapper.lambda().isNull(YysDayWorkEntity::getDeleteMark); productNameWrapper.lambda().isNull(YysDayWorkEntity::getDeleteMark);
if (isUp){ if (isUp) {
productNameWrapper.lambda().ne(YysDayWorkEntity::getId, id); productNameWrapper.lambda().ne(YysDayWorkEntity::getId, id);
} }
if((int) this.count(productNameWrapper)>0){ if ((int) this.count(productNameWrapper) > 0) {
countRecover = "产品名称不能重复"; countRecover = "产品名称不能重复";
} }
} }
if(StringUtil.isEmpty(form.getModels())){ if (StringUtil.isEmpty(form.getModels())) {
return "规格型号不能为空"; return "规格型号不能为空";
} }
if(StringUtil.isEmpty(form.getMeasurementUnit())){ if (StringUtil.isEmpty(form.getMeasurementUnit())) {
return "计量单位不能为空"; return "计量单位不能为空";
} }
return countRecover; return countRecover;
} }
/** /**
* 新增修改数据(事务回滚) * 新增修改数据(事务回滚)
* @param id *
* @param yysDayWorkForm * @param id
* @return * @param yysDayWorkForm
*/ * @return
*/
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(YysDayWorkForm yysDayWorkForm, String id, boolean isSave) throws Exception { public void saveOrUpdate(YysDayWorkForm yysDayWorkForm, String id, boolean isSave) throws Exception {
@ -365,6 +376,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
entity.setId(mainId); entity.setId(mainId);
entity.setVersion(0); entity.setVersion(0);
entity.setDeliveryTime(entity.getManufactureTime()); entity.setDeliveryTime(entity.getManufactureTime());
entity.setIsFrozen("否");
} else { } else {
entity.setLastModifyTime(DateUtil.getNowDate()); entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId()); entity.setLastModifyUserId(userInfo.getUserId());
@ -389,6 +401,8 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
//查询所有待确认的数据 //查询所有待确认的数据
LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YysDayWorkEntity::getIsConfirm, request.getFlag()); wrapper.eq(YysDayWorkEntity::getIsConfirm, request.getFlag());
wrapper.eq(YysDayWorkEntity::getIsFrozen, "否");
wrapper.isNull(YysDayWorkEntity::getDeleteMark);
List<YysDayWorkEntity> root = this.list(wrapper); List<YysDayWorkEntity> root = this.list(wrapper);
if (CollectionUtils.isEmpty(root)) { if (CollectionUtils.isEmpty(root)) {
return Collections.emptyList(); return Collections.emptyList();
@ -479,7 +493,7 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
} }
if ((prodResult && requisitionResult) || (packResult && requisitionResult)) { if ((prodResult && requisitionResult) || (packResult && requisitionResult)) {
//修改是否完工状态 //修改是否完工状态
CompletableFuture.runAsync(()->{ CompletableFuture.runAsync(() -> {
YysDayWorkEntity entity = this.getById(request.getId()); YysDayWorkEntity entity = this.getById(request.getId());
entity.setIsConfirm("2"); entity.setIsConfirm("2");
entity.setProductionStatus("2"); entity.setProductionStatus("2");
@ -489,4 +503,29 @@ public class YysDayWorkServiceImpl extends ServiceImpl<YysDayWorkMapper, YysDayW
} }
return "确认失败"; return "确认失败";
} }
@Override
public void syncIsForzen(String id) {
LambdaQueryWrapper<YysDayWorkEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YysDayWorkEntity::getMonthId, id);
List<YysDayWorkEntity> list = this.list(wrapper);
list.forEach(obj -> obj.setIsFrozen("是"));
this.updateBatchById(list);
}
@Override
public String isFrozen(String id) {
YysDayWorkEntity entity = this.getById(id);
entity.setIsFrozen("是");
this.updateById(entity);
return "冻结成功";
}
@Override
public String cancelFrozen(String id) {
YysDayWorkEntity entity = this.getById(id);
entity.setIsFrozen("否");
this.updateById(entity);
return "取消冻结成功";
}
} }

25
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMonthlyProductionServiceImpl.java
Unescape View File

@ -17,6 +17,7 @@ import jnpf.model.yysmonthlyproduction.YysMonthlyProductionConstant;
import jnpf.model.yysmonthlyproduction.YysMonthlyProductionForm; import jnpf.model.yysmonthlyproduction.YysMonthlyProductionForm;
import jnpf.model.yysmonthlyproduction.YysMonthlyProductionPagination; import jnpf.model.yysmonthlyproduction.YysMonthlyProductionPagination;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
import jnpf.service.YysDayWorkService;
import jnpf.service.YysMonthlyProductionService; import jnpf.service.YysMonthlyProductionService;
import jnpf.util.*; import jnpf.util.*;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
@ -28,6 +29,7 @@ import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -46,6 +48,9 @@ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProdu
@Autowired @Autowired
private UserProvider userProvider; private UserProvider userProvider;
@Autowired
private YysDayWorkService yysDayWorkService;
@Override @Override
public List<YysMonthlyProductionEntity> getList(YysMonthlyProductionPagination yysMonthlyProductionPagination) { public List<YysMonthlyProductionEntity> getList(YysMonthlyProductionPagination yysMonthlyProductionPagination) {
return getTypeList(yysMonthlyProductionPagination, yysMonthlyProductionPagination.getDataType()); return getTypeList(yysMonthlyProductionPagination, yysMonthlyProductionPagination.getDataType());
@ -321,6 +326,7 @@ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProdu
entity.setCreatorUserId(userInfo.getUserId()); entity.setCreatorUserId(userInfo.getUserId());
entity.setId(mainId); entity.setId(mainId);
entity.setVersion(0); entity.setVersion(0);
entity.setIsFrozen("否");
} else { } else {
YysMonthlyProductionEntity byId = this.getById(yysMonthlyProductionForm.getId()); YysMonthlyProductionEntity byId = this.getById(yysMonthlyProductionForm.getId());
boolean isProductNameChanged = !byId.getProductName().equals(yysMonthlyProductionForm.getProductName()); boolean isProductNameChanged = !byId.getProductName().equals(yysMonthlyProductionForm.getProductName());
@ -350,4 +356,23 @@ public class YysMonthlyProductionServiceImpl extends ServiceImpl<YysMonthlyProdu
.orderByDesc(YysMonthlyProductionEntity::getDeliveryTime); .orderByDesc(YysMonthlyProductionEntity::getDeliveryTime);
return this.list(); return this.list();
} }
@Override
public String isFrozen(String id) {
YysMonthlyProductionEntity entity = this.getById(id);
entity.setIsFrozen("是");
boolean result = this.updateById(entity);
if (result){
CompletableFuture.runAsync(()->yysDayWorkService.syncIsForzen(id));
}
return "冻结成功";
}
@Override
public String cancelFrozen(String id) {
YysMonthlyProductionEntity entity = this.getById(id);
entity.setIsFrozen("否");
this.updateById(entity);
return "取消冻结成功";
}
} }

93
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDayWorkController.java
Unescape View File

@ -1,60 +1,49 @@
package jnpf.controller; package jnpf.controller;
import cn.hutool.core.util.ObjectUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import cn.afterturn.easypoi.excel.ExcelImportUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.xuyanwu.spring.file.storage.FileInfo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult; import jnpf.base.ActionResult;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.exception.DataException; import jnpf.base.model.ColumnDataModel;
import jnpf.permission.entity.UserEntity; import jnpf.base.util.VisualUtils;
import jnpf.service.*; import jnpf.base.vo.DownloadVO;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.yysdaywork.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity; import jnpf.entity.YysDayWorkEntity;
import jnpf.entity.YysMonthlyProductionEntity;
import java.io.IOException; import jnpf.model.visualJson.config.HeaderModel;
import java.util.stream.Collectors; import jnpf.model.yysdaywork.*;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel; import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel; import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel; import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel; import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo; import jnpf.service.YysDayWorkService;
import jnpf.service.YysMonthlyProductionService;
import jnpf.util.*;
import lombok.Cleanup; import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel; import lombok.extern.slf4j.Slf4j;
import jnpf.base.model.ColumnDataModel; import org.apache.commons.collections4.MapUtils;
import jnpf.base.util.VisualUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* yysDayWork * yysDayWork
@ -80,8 +69,7 @@ public class YysDayWorkController {
private YysDayWorkService yysDayWorkService; private YysDayWorkService yysDayWorkService;
@Autowired @Autowired
private YysClassesService yysClassesService; private YysMonthlyProductionService yysMonthlyProductionService;
@Autowired @Autowired
private ConfigValueUtil configValueUtil; private ConfigValueUtil configValueUtil;
@ -97,9 +85,14 @@ public class YysDayWorkController {
public ActionResult list(@RequestBody YysDayWorkPagination yysDayWorkPagination) throws IOException { public ActionResult list(@RequestBody YysDayWorkPagination yysDayWorkPagination) throws IOException {
List<YysDayWorkEntity> list = yysDayWorkService.getList(yysDayWorkPagination); List<YysDayWorkEntity> list = yysDayWorkService.getList(yysDayWorkPagination);
List<Map<String, Object>> realList = new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
List<YysMonthlyProductionEntity> list1 = yysMonthlyProductionService.list();
Map<String, String> collect = list1.stream().collect(Collectors.toMap(YysMonthlyProductionEntity::getId, YysMonthlyProductionEntity::getIsFrozen));
for (YysDayWorkEntity entity : list) { for (YysDayWorkEntity entity : list) {
Map<String, Object> yysDayWorkMap = JsonUtil.entityToMap(entity); Map<String, Object> yysDayWorkMap = JsonUtil.entityToMap(entity);
yysDayWorkMap.put("id", yysDayWorkMap.get("id")); yysDayWorkMap.put("id", yysDayWorkMap.get("id"));
if (MapUtils.isNotEmpty(collect) && collect.containsKey(entity.getMonthId())) {
yysDayWorkMap.put("f_isFrozen", collect.getOrDefault(entity.getMonthId(), ""));
}
//副表数据 //副表数据
//子表数据 //子表数据
realList.add(yysDayWorkMap); realList.add(yysDayWorkMap);
@ -570,4 +563,16 @@ public class YysDayWorkController {
return ActionResult.fail(result); return ActionResult.fail(result);
} }
@Operation(summary = "冻结")
@GetMapping("/isFrozen/{id}")
public ActionResult isFrozen(@PathVariable("id") String id) {
return ActionResult.success(yysDayWorkService.isFrozen(id));
}
@Operation(summary = "解冻")
@GetMapping("/cancelFrozen/{id}")
public ActionResult cancelFrozen(@PathVariable("id") String id) {
return ActionResult.success(yysDayWorkService.cancelFrozen(id));
}
} }

14
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMonthlyProductionController.java
Unescape View File

@ -531,6 +531,18 @@ public class YysMonthlyProductionController {
return ActionResult.success(yysMonthlyProductionMap); return ActionResult.success(yysMonthlyProductionMap);
} }
@Operation(summary = "冻结")
@GetMapping("/isFrozen/{id}")
public ActionResult isFrozen(@PathVariable("id") String id) {
return ActionResult.success(yysMonthlyProductionService.isFrozen(id));
}
@Operation(summary = "解冻")
@GetMapping("/cancelFrozen/{id}")
public ActionResult cancelFrozen(@PathVariable("id") String id) {
return ActionResult.success(yysMonthlyProductionService.cancelFrozen(id));
}
@PostMapping("/mrp/{month}") @PostMapping("/mrp/{month}")
@Operation(summary = "MRP运算") @Operation(summary = "MRP运算")
public ActionResult MRP(@PathVariable String month) { public ActionResult MRP(@PathVariable String month) {
@ -545,7 +557,7 @@ public class YysMonthlyProductionController {
return ActionResult.fail("月份不能为空"); return ActionResult.fail("月份不能为空");
} }
List<YysMonthlyProductionEntity> unMPRList = yysMonthlyProductionService.getUnMPRList(month); List<YysMonthlyProductionEntity> unMPRList = yysMonthlyProductionService.getUnMPRList(month);
if(unMPRList.size() == 0) return ActionResult.fail("没有需要生成MRP的月度生产计划"); if (unMPRList.size() == 0) return ActionResult.fail("没有需要生成MRP的月度生产计划");
// 获取没有生成MRP的月度生产计划 // 获取没有生成MRP的月度生产计划
Set<String> productIds = unMPRList.stream().map(YysMonthlyProductionEntity::getProductId).collect(Collectors.toSet()); Set<String> productIds = unMPRList.stream().map(YysMonthlyProductionEntity::getProductId).collect(Collectors.toSet());

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDayWorkEntity.java
Unescape View File

@ -48,6 +48,8 @@ public class YysDayWorkEntity {
private String isConfirm; private String isConfirm;
@TableField("DELIVERY_TIME") @TableField("DELIVERY_TIME")
private Date deliveryTime; private Date deliveryTime;
@TableField(value = "IS_FROZEN" , updateStrategy = FieldStrategy.IGNORED)
private String isFrozen;
@TableField("F_CREATOR_TIME") @TableField("F_CREATOR_TIME")
private Date creatorTime; private Date creatorTime;
@TableField("F_CREATOR_USER_ID") @TableField("F_CREATOR_USER_ID")

4
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysMonthlyProductionEntity.java
Unescape View File

@ -32,6 +32,10 @@ public class YysMonthlyProductionEntity {
private String currentInventory; private String currentInventory;
@TableField(value = "PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "PLAN_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
private String planNumber; private String planNumber;
@TableField(value = "IS_MRP" , updateStrategy = FieldStrategy.IGNORED)
private String isMrp;
@TableField(value = "IS_FROZEN" , updateStrategy = FieldStrategy.IGNORED)
private String isFrozen;
@TableField(value = "DELIVERY_TIME" , updateStrategy = FieldStrategy.IGNORED) @TableField(value = "DELIVERY_TIME" , updateStrategy = FieldStrategy.IGNORED)
private Date deliveryTime; private Date deliveryTime;
@TableField("F_CREATOR_TIME") @TableField("F_CREATOR_TIME")

3
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaywork/YysDayWorkForm.java
Unescape View File

@ -59,4 +59,7 @@ public class YysDayWorkForm {
/** 生产状态 **/ /** 生产状态 **/
@JsonProperty("productionStatus") @JsonProperty("productionStatus")
private Object productionStatus; private Object productionStatus;
/** 是否冻结 **/
@JsonProperty("isFrozen")
private String isFrozen;
} }

3
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysmonthlyproduction/YysMonthlyProductionForm.java
Unescape View File

@ -44,4 +44,7 @@ public class YysMonthlyProductionForm {
/** 交期 **/ /** 交期 **/
@JsonProperty("deliveryTime") @JsonProperty("deliveryTime")
private String deliveryTime; private String deliveryTime;
/** 是否冻结 **/
@JsonProperty("isFrozen")
private String isFrozen;
} }

1
jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/form.vue
Unescape View File

@ -196,6 +196,7 @@ export default {
sort: 1, sort: 1,
productionStatus: '1', productionStatus: '1',
version: 0, version: 0,
isFrozen:undefined,
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:

87
jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/index.vue
Unescape View File

@ -66,37 +66,37 @@
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border> :span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center"> <el-table-column prop="manufactureTime" label="生产日期" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="deviceCode" label="设备编码" align="center"> <el-table-column prop="deviceCode" label="设备编码" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="deviceName" label="设备名称" align="center"> <el-table-column prop="deviceName" label="设备名称" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="sort" label="顺序号" align="center"> <el-table-column prop="sort" label="顺序号" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.sort"> <template slot-scope="scope" v-if="scope.row.sort">
<JnpfNumber v-model="scope.row.sort" :thousands="false" /> <JnpfNumber v-model="scope.row.sort" :thousands="false" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="post" label="班次" align="center"> <el-table-column prop="post" label="班次" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="开始时间" align="center"> <el-table-column prop="startTime" label="开始时间" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="endTime" label="结束时间" align="center"> <el-table-column prop="endTime" label="结束时间" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="productCode" label="产品编码" align="center"> <el-table-column prop="productCode" label="产品编码" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="productName" label="产品名称" align="center"> <el-table-column prop="productName" label="产品名称" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="models" label="规格型号" align="center"> <el-table-column prop="models" label="规格型号" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="measurementUnit" label="计量单位" align="center"> <el-table-column prop="measurementUnit" label="计量单位" align="center" width="150">
</el-table-column> </el-table-column>
<el-table-column prop="planNumber" label="计量数量" align="center"> <el-table-column prop="planNumber" label="计量数量" align="center" width="150">
<template slot-scope="scope" v-if="scope.row.planNumber"> <template slot-scope="scope" v-if="scope.row.planNumber">
<JnpfNumber v-model="scope.row.planNumber" :thousands="false" /> <JnpfNumber v-model="scope.row.planNumber" :thousands="false" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产状态" prop="productionStatus" align="center"> <el-table-column label="生产状态" prop="productionStatus" align="center" width="150">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
{{ scope.row.productionStatus }} {{ scope.row.productionStatus }}
</template> --> </template> -->
@ -105,7 +105,13 @@
<el-tag type="success" v-else-if="scope.row.productionStatus == '已完工'">已完工</el-tag> <el-tag type="success" v-else-if="scope.row.productionStatus == '已完工'">已完工</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column prop="isFrozen" label="是否冻结" align="center" width="150">
<template slot-scope="scope">
<el-tag v-if="scope.row.isFrozen == '是'">是</el-tag>
<el-tag type="success" v-else-if="scope.row.isFrozen == '否'">否</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑 <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button> </el-button>
@ -113,6 +119,12 @@
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情 <el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button> </el-button>
<el-button type="text" v-show="scope.row.isFrozen == '否'"
@click="isFrozen(scope.row.id, scope.row.manufactureTime)">冻结
</el-button>
<el-button type="text" v-show="scope.row.f_isFrozen == '否' && scope.row.isFrozen == '是' "
@click="cancelForzen(scope.row.id)">取消冻结
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
@ -225,6 +237,53 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query)) this.queryData = JSON.parse(JSON.stringify(this.query))
}, },
methods: { methods: {
isFrozen(id, time) {
if (time != null) {
const targetDate = new Date(time);
// 获取当前日期
const today = new Date();
if (targetDate.getTime() < today.getTime()) {
this.$message.error('生产日期小于当前日期，不允许冻结');
return
}
}
this.$confirm('此操作将冻结该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysDayWork/isFrozen/${id}`,
method: 'GET'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
cancelForzen(id) {
this.$confirm('此操作将取消冻结该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysDayWork/cancelFrozen/${id}`,
method: 'GET'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {

2
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialclass/index.vue
Unescape View File

@ -51,7 +51,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="className" label="分类名称" align="center"> <el-table-column prop="className" label="分类名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="parentClassification" label="上级分类" align="center"> <el-table-column prop="parentClassname" label="上级分类" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="enableStatus" label="启用状态" align="center"> <el-table-column prop="enableStatus" label="启用状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">

1
jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/form.vue
Unescape View File

@ -133,6 +133,7 @@ export default {
currentInventory: undefined, currentInventory: undefined,
deliveryTime: undefined, deliveryTime: undefined,
version: 0, version: 0,
isFrozen:undefined,
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:

56
jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/index.vue
Unescape View File

@ -32,9 +32,9 @@
</el-button> </el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()">导入 <el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()">导入
</el-button> </el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-add" @click="handelUpload()">智能排产 <el-button type="success" icon="icon-ym el-icon-data-line" @click="handelUpload()">智能排产
</el-button> </el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-add" @click="handelUpload()">MRP运算 <el-button type="success" icon="icon-ym el-icon-data-analysis" @click="handelUpload()">MRP运算
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -66,7 +66,13 @@
</el-table-column> </el-table-column>
<el-table-column prop="deliveryTime" label="交期" align="center"> <el-table-column prop="deliveryTime" label="交期" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column prop="isFrozen" label="是否冻结" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.isFrozen == '是'">是</el-tag>
<el-tag type="success" v-else-if="scope.row.isFrozen == '否'">否</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑 <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button> </el-button>
@ -74,6 +80,11 @@
</el-button> </el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情 <el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button> </el-button>
<el-button type="text" v-show="scope.row.isFrozen == '否'" @click="isFrozen(scope.row.id)">冻结
</el-button>
<el-button type="text" v-show="scope.row.isFrozen == '是'"
@click="cancelForzen(scope.row.id)">取消冻结
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
@ -112,6 +123,7 @@ import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery' import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson' import superQueryJson from './superQueryJson'
import { CANCELED } from 'dropzone';
export default { export default {
components: { components: {
@ -179,6 +191,44 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query)) this.queryData = JSON.parse(JSON.stringify(this.query))
}, },
methods: { methods: {
isFrozen(id) {
this.$confirm('此操作将冻结该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysMonthlyProduction/isFrozen/${id}`,
method: 'GET'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
cancelForzen(id) {
this.$confirm('此操作将取消冻结该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysMonthlyProduction/cancelFrozen/${id}`,
method: 'GET'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {

2
jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierclass/index.vue
Unescape View File

@ -51,7 +51,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="className" label="分类名称" align="center"> <el-table-column prop="className" label="分类名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="parentClassification" label="上级分类" align="center"> <el-table-column prop="parentClassname" label="上级分类" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="enableStatus" label="启用状态" align="center"> <el-table-column prop="enableStatus" label="启用状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">

Write Preview
Loading…
Cancel
Save