licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产计划插活顺延

Browse Source
This commit is contained in:
think 2025-01-17 15:09:39 +08:00
parent 1c7a165bea
commit 4f5a89a9e9
6 changed files with 86 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plansub/PlanSubController.java
View File

@ -63,6 +63,16 @@ public class PlanSubController {
}
@GetMapping("/getSearchRlTs")
@Operation(summary = "查询设置的负责人设计时间是否和其他项目冲突")
@Parameter(name = "names", description = "负责人", required = true)
@PreAuthorize("@ss.hasPermission('heli:material-plan:delete')")
public CommonResult<Integer> getSearchRlTs(@RequestParam("startDateTime") String startDateTime,@RequestParam("endDateTime") String endDateTime) {
Integer planSubDOList = planSubService.getSearchRlTs(startDateTime,endDateTime);
return success(planSubDOList);
}
@GetMapping("/getOwnderMp")
@Operation(summary = "查询设置的负责人设计时间是否和其他项目冲突")
@Parameter(name = "names", description = "负责人", required = true)

16
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/shopCalendar/ShopCalendarMapper.java
View File

@ -49,6 +49,22 @@ public interface ShopCalendarMapper extends BaseMapperX<ShopCalendarDO> {
return selectPage(reqVO, query);
}
default List<ShopCalendarDO> getSearchRlTs(String startDateTime,String endDateTime ) {
MPJLambdaWrapper<ShopCalendarDO> query = new MPJLambdaWrapper<>();
try {
query.selectAll(ShopCalendarDO.class);
query.ne(ShopCalendarDO::getIfjiejiari,"true");
query.between(ShopCalendarDO::getDates,startDateTime,endDateTime)
;
return selectList(query);
} catch (Exception e) {
// 处理异常，例如记录日志或抛出自定义异常
System.out.println("发生了一个异常: " + e.getMessage());
}
return selectList(query);
}
default List<ShopCalendarDO> searchRllists(String Dates,Long tianShu ) {
MPJLambdaWrapper<ShopCalendarDO> query = new MPJLambdaWrapper<>();
try {

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubService.java
View File

@ -60,6 +60,8 @@ public interface PlanSubService {
*/
List<PlanSubDO> searchOwner(String name,String dateOne, String dateTwo,String id,int type);
Integer getSearchRlTs(String startDateTime,String endDateTime);
List<ShopCalendarDO> serarchRl(String endDateTime, Long tianShu);
/**

8
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plansub/PlanSubServiceImpl.java
View File

@ -74,6 +74,14 @@ public class PlanSubServiceImpl implements PlanSubService {
return planSubMapper.selectById(id);
}
@Override
public Integer getSearchRlTs(String startDateTime,String endDateTime){
List<ShopCalendarDO> shopCalendarDOS =shopCalendarMapper.getSearchRlTs(startDateTime,endDateTime);
int a = shopCalendarDOS.size();
return a;
}
@Override
public List<ShopCalendarDO> serarchRl(String endDateTime,Long tianShu){
List<ShopCalendarDO> shopCalendarDOS =shopCalendarMapper.searchRllists(endDateTime,tianShu);

5
mes-ui/mes-ui-admin-vue3/src/api/heli/plansub/index.ts
View File

@ -37,6 +37,11 @@ export const getOwnderPlanChaHuo = async (ownder: number,dateOne: string ,dateTw
export const getOwnderPlanSub = async (endDateTime: string,tianShu: number ) => {
return await request.get({ url: `/heli/plan-sub/getSearchRl?endDateTime=` + endDateTime+`&tianShu=`+tianShu})
}
//计算工时
export const getSearchRlTsS = async (startDateTime: string,endDateTime: string ) => {
return await request.get({ url: `/heli/plan-sub/getSearchRlTs?startDateTime=` + startDateTime+`&endDateTime=`+endDateTime})
}
/* export const getOwnderPlanSub = async (ownder: number,dateOne: string ,dateTwo: string,id: number,type: number) => {
return await request.get({ url: `/heli/plan-sub/getOwnderMp?names=` + ownder+`&dateOne=`+dateOne+`&dateTwo=`+dateTwo+`&id=`+id+`&type=`+type})
} */

27
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue
View File

@ -749,6 +749,7 @@ const clouse = () => {
/* 计算设计天数 */
const handleDateChange = (index, startBlankDate,blankDate,num,ownder,id) =>{
dataListShuju.value = [];
if (typeof startBlankDate === 'undefined' || startBlankDate === null || startBlankDate === '') {
message.error("请选择开始日期，否则无法计算设计天数")
return;
@ -763,7 +764,11 @@ const handleDateChange = (index, startBlankDate,blankDate,num,ownder,id) =>{
message.error("开始时间必须早于结束时间，否则无法计算设计天数，请检查")
return;
}
//
//调用查询天数的后端接口
getSearchRlTs(startBlankDate,blankDate,index,num,ownder);
//计算天数
// 将日期字符串转换为Date对象
@ -774,10 +779,18 @@ const handleDateChange = (index, startBlankDate,blankDate,num,ownder,id) =>{
const timeDiff = Math.abs(date2.getTime() - date1.getTime());
const diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
const tianshu = diffDays+1;
//"1":毛坯设计；"2"：2D设计；"3"：3D设计
}
const getSearchRlTs = async(startDateTime:string,endDateTime:string,index:number ,num:string,ownder:number) => {
let data = await PlanSubApi.getSearchRlTsS(formatDate(startDateTime,'YYYY-MM-DD'),formatDate(endDateTime,'YYYY-MM-DD'));
if(num === "1"){
//调用接口查询检索设计时间是否冲突
formData.value.projectPlanSubs[index].blankNum = tianshu;
formData.value.projectPlanSubs[index].blankNum = data;
// formatDate(startBlankDate,'YYYY-MM-DD')
@ -791,7 +804,7 @@ const handleDateChange = (index, startBlankDate,blankDate,num,ownder,id) =>{
}else if(num === "2"){
//调用接口查询检索设计时间是否冲突
formData.value.projectPlanSubs[index].twoDimNum = tianshu;
formData.value.projectPlanSubs[index].twoDimNum = data;
if(ownder){
prod.value.projectPlanSubs = JSON.parse(JSON.stringify(formData.value.projectPlanSubs));
@ -799,7 +812,7 @@ const handleDateChange = (index, startBlankDate,blankDate,num,ownder,id) =>{
}
}else{
formData.value.projectPlanSubs[index].threeDimNum = tianshu;
formData.value.projectPlanSubs[index].threeDimNum = data;
if(ownder){
prod.value.projectPlanSubs = JSON.parse(JSON.stringify(formData.value.projectPlanSubs));
getOwnderListss(index)
@ -807,10 +820,8 @@ const handleDateChange = (index, startBlankDate,blankDate,num,ownder,id) =>{
}
}
//选择3D
const getOwnderListss = async (index: number) => {
/* const dataListShuju = []; */