下料报工
This commit is contained in:
z
parent
0275ee21b5
commit
8a5f47f569
@ -1,6 +1,7 @@
|
||||
package com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster;
|
||||
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.plansub.vo.PlanSubRespVO;
|
||||
@ -9,10 +10,12 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.zjpgmaster.vo.ZjPgMaste
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.bgmasterline.BgMasterLineDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.bgmasterline.BgMasterLineMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.procedure.ProcedureMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper;
|
||||
@ -31,6 +34,7 @@ import javax.servlet.http.*;
|
||||
import java.util.*;
|
||||
import java.io.IOException;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
@ -68,6 +72,8 @@ public class PgMasterController {
|
||||
|
||||
@Resource
|
||||
private BgMasterLineMapper bgMasterLineMapper;
|
||||
@Resource
|
||||
private ProcedureMapper procedureMapper;
|
||||
|
||||
|
||||
@GetMapping("/getBomMx")
|
||||
@ -170,7 +176,7 @@ public class PgMasterController {
|
||||
wrapper.eq(TaskDispatchDetailDO::getCheckYn,0);
|
||||
List<TaskDispatchDetailDO> detailDOS = taskDispatchDetailMapper.selectList(wrapper);
|
||||
if (ObjectUtil.isEmpty(detailDOS)){
|
||||
return error(400,"该零件没有需要检验工序");
|
||||
return error(400,"该零件所有工序都没有过程检");
|
||||
}else {
|
||||
LambdaQueryWrapper<TaskDispatchDetailDO> wrapper1 = new LambdaQueryWrapper<>();
|
||||
wrapper1.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDO.getId());
|
||||
@ -179,8 +185,22 @@ public class PgMasterController {
|
||||
List<TaskDispatchDetailDO> list = taskDispatchDetailMapper.selectList(wrapper1);
|
||||
if (ObjectUtil.isNotEmpty( list)){
|
||||
if (list.size()==detailDOS.size()){
|
||||
return error(400,"该零件已全部检验完成");
|
||||
return error(400,"零件已全部检验完成");
|
||||
}else{
|
||||
List<TaskDispatchDetailDO> collect1 = detailDOS.stream().filter(item -> item.getProcedureStatus() != 2).collect(Collectors.toList());
|
||||
List<Long> collect = collect1.stream().map(TaskDispatchDetailDO::getProcedureId).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<ProcedureDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
lambdaQueryWrapper.in(ProcedureDO::getId, collect);
|
||||
List<ProcedureDO> procedureDOS = procedureMapper.selectList(lambdaQueryWrapper);
|
||||
// 转换为 Map<id, name>
|
||||
Map<Long, String> procedureNameMap = procedureDOS.stream()
|
||||
.collect(Collectors.toMap(
|
||||
ProcedureDO::getId,
|
||||
ProcedureDO::getName,
|
||||
(existing, replacement) -> existing
|
||||
));
|
||||
List<TaskDispatchDetailDO> collect2 = collect1.stream().filter(item -> item.getReportProcess() == 1).collect(Collectors.toList());
|
||||
List<TaskDispatchDetailDO> collect3 = collect1.stream().filter(item -> item.getReportProcess() != 1).collect(Collectors.toList());
|
||||
return error(400,"该零件没有报工完成,请联系报工人员！");
|
||||
}
|
||||
}else{
|
||||
|
||||
@ -111,4 +111,6 @@ public class ProcessDesignPageReqVO extends PageParam {
|
||||
private Integer isOverProcess;
|
||||
@Schema(description = "状态")
|
||||
private Integer isOverPro;
|
||||
@Schema(description = "设计日期")
|
||||
private String designDate;
|
||||
}
|
||||
|
||||
@ -109,8 +109,8 @@ public class TaskInReportController {
|
||||
@PostMapping("/add")
|
||||
@Operation(summary = "小程序下料报工")
|
||||
@PreAuthorize("@ss.hasPermission('heli:task-in-report:create')")
|
||||
public CommonResult<Long> addTaskInReport(@Valid @RequestBody TaskInReportSaveReqVO createReqVO) {
|
||||
return success(taskInReportService.addTaskInReport(createReqVO));
|
||||
public CommonResult<Boolean> addTaskInReport(@Valid @RequestBody TaskInReportSaveReqVO createReqVO) {
|
||||
return taskInReportService.addTaskInReport(createReqVO);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -314,4 +314,6 @@ public class TaskDispatchDetailDO extends BaseDO {
|
||||
private BigDecimal reportPrice;
|
||||
@TableField(exist = false)
|
||||
private BigDecimal price;
|
||||
@TableField(exist = false)
|
||||
private Long compositionId;
|
||||
}
|
||||
|
||||
@ -21,6 +21,7 @@ import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@ -295,6 +296,20 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
|
||||
.or()
|
||||
.apply("u6.nickname like concat('%', {0}, '%') and t.process_design_type = {1}", reqVO.getOwnerName(), ProcessDesignTypeEnum.CASTING_DRAWING.name());
|
||||
}
|
||||
if ( ObjectUtil.isNotEmpty(reqVO.getDesignDate())) {
|
||||
String designDate = reqVO.getDesignDate();
|
||||
query.and(q -> {
|
||||
q.apply("(t.process_design_type = {0} AND (a.craft_start_date >= {1} or a.craft_end_date >= {2}))", ProcessDesignTypeEnum.BLUEPRINT_FOUNDRY_TECHNOLOGY.name(), designDate, designDate)
|
||||
.or()
|
||||
.apply("(t.process_design_type = {0} AND( b.start_blank_date >= {1} or b.blank_date >= {2}))", ProcessDesignTypeEnum.BLUEPRINT_WORKBLANK.name(), designDate, designDate)
|
||||
.or()
|
||||
.apply("(t.process_design_type = {0} AND (b.start_two_dim_Date >= {1} or b.two_dim_date >= {2}))", ProcessDesignTypeEnum.BLUEPRINT_2D.name(), designDate, designDate)
|
||||
.or()
|
||||
.apply("(t.process_design_type = {0} AND (b.start_three_dim_date >= {1} or b.three_dim_date >= {2}))", ProcessDesignTypeEnum.BLUEPRINT_3D.name(), designDate, designDate)
|
||||
.or()
|
||||
.apply("(t.process_design_type = {0} AND (a.cast_start_date >= {1} or a.cast_end_date >= {2}))", ProcessDesignTypeEnum.CASTING_DRAWING.name(), designDate, designDate);
|
||||
});
|
||||
}
|
||||
return selectPage(reqVO, query);
|
||||
}
|
||||
default PageResult<ProcessDesignDO> getExportExcel(ProcessDesignPageReqVO reqVO){
|
||||
|
||||
@ -1022,6 +1022,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
|
||||
.select("e.name as procedureName")
|
||||
.select("g.name as compositionName","g.density as density")
|
||||
.select("g.price as price")
|
||||
.select("g.id as compositionId")
|
||||
.selectSum(TaskInReportDO::getWeight, "weight")
|
||||
.selectSum(TaskInReportDO::getReportPrice, "reportPrice")
|
||||
.leftJoin(TaskDispatchDO.class, "a", TaskDispatchDO::getId, TaskDispatchDetailDO::getDispatchId)
|
||||
|
||||
@ -21,6 +21,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipMan
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantask.PlanTaskDO;
|
||||
@ -42,6 +43,8 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.equipmanufacture.EquipManufact
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.fpuserdetail.FpUserDetailMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplan.MaterialPlanMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterLineMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.plansub.PlanSubMapper;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.mysql.plantask.PlanTaskMapper;
|
||||
@ -149,6 +152,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
||||
private CustomerMapper customerMapper;
|
||||
@Resource
|
||||
private CompositionMapper compositionMapper;
|
||||
@Resource
|
||||
private PgMasterLineMapper pgMasterLineMapper;
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Long createTaskDispatch(TaskDispatchSaveReqVO createReqVO) {
|
||||
@ -1068,7 +1073,11 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
|
||||
// bdgzsomthingMapper.updateById(bdgzsomthingDO);
|
||||
// }
|
||||
// }
|
||||
if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && taskDispatchDetailDO.getTestYn().equals("N")&&taskDispatchDetailDO.getCheckYn()==0){
|
||||
LambdaQueryWrapper<PgMasterLineDO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(PgMasterLineDO::getDispatchDetailId, taskDispatchDetailDO.getId());
|
||||
wrapper.last("limit 1");
|
||||
PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectOne(wrapper);
|
||||
if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && taskDispatchDetailDO.getTestYn().equals("N")&&taskDispatchDetailDO.getCheckYn()==0&&ObjectUtil.isEmpty(pgMasterLineDO)){
|
||||
pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId(),taskDispatchDO.getBomDetailId(),taskDispatchDetailDO);
|
||||
}
|
||||
// if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isBomDetailProductionOver){
|
||||
|
||||
@ -2,6 +2,8 @@ package com.chanko.yunxi.mes.module.heli.service.taskinreport;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.*;
|
||||
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
|
||||
import com.chanko.yunxi.mes.module.heli.controller.admin.taskinreport.vo.*;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskinreport.TaskInReportDO;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
|
||||
@ -61,5 +63,5 @@ public interface TaskInReportService {
|
||||
|
||||
List<TaskInReportDO> getList(TaskInReportPageReqVO pageReqVO);
|
||||
|
||||
Long addTaskInReport(TaskInReportSaveReqVO createReqVO);
|
||||
CommonResult<Boolean> addTaskInReport(TaskInReportSaveReqVO createReqVO);
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@ package com.chanko.yunxi.mes.module.heli.service.taskinreport;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.formal.FormalDO;
|
||||
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
|
||||
@ -132,7 +133,10 @@ public class TaskInReportServiceImpl implements TaskInReportService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long addTaskInReport(TaskInReportSaveReqVO createReqVO) {
|
||||
public CommonResult<Boolean> addTaskInReport(TaskInReportSaveReqVO createReqVO) {
|
||||
TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(createReqVO.getDispatchDetailId());
|
||||
if (ObjectUtil.isEmpty(taskDispatchDetailDO)) return CommonResult.error(400,"该派工单不存在，请退出刷新界面!");
|
||||
if (2==taskDispatchDetailDO.getInReportProcess()) return CommonResult.error(400,"该派工单已报工完成，请刷新界面!");
|
||||
TaskInReportDO taskInReport = BeanUtils.toBean(createReqVO, TaskInReportDO.class);
|
||||
taskInReport.setOwner(getLoginUser().getId());
|
||||
taskInReport.setReportTime(LocalDateTime.now());
|
||||
|
||||
@ -4,14 +4,14 @@ NODE_ENV=production
|
||||
VITE_DEV=false
|
||||
|
||||
# 请求路径https://nxhs.cjyx.cc/admin-api http://192.168.1.87:8080 https://star.hz-hl.com
|
||||
VITE_BASE_URL='https://nxhs.cjyx.cc'
|
||||
VITE_BASE_URL='http://192.168.1.87:8080'
|
||||
|
||||
|
||||
# 上传路径 http://218.75.46.166:8080
|
||||
VITE_UPLOAD_URL='https://nxhs.cjyx.cc/admin-api/infra/file/upload'
|
||||
VITE_UPLOAD_URL='http://192.168.1.87:8080/admin-api/infra/file/upload'
|
||||
|
||||
# 上传路径
|
||||
VITE_UPLOAD_BATCH_URL='https://nxhs.cjyx.cc/admin-api/infra/file/uploadBatch'
|
||||
VITE_UPLOAD_BATCH_URL='http://192.168.1.87:8080/admin-api/infra/file/uploadBatch'
|
||||
|
||||
# 接口前缀
|
||||
VITE_API_BASEPATH=
|
||||
|
||||
@ -12,6 +12,15 @@
|
||||
:inline="true"
|
||||
label-width="110px"
|
||||
>
|
||||
<el-form-item label="设计日期" prop="designDate" >
|
||||
<el-date-picker
|
||||
v-model="queryParams.designDate"
|
||||
type="date"
|
||||
value-format="x"
|
||||
class="!w-240px"
|
||||
placeholder="选择设计日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目编号" prop="projectCode">
|
||||
<el-input
|
||||
v-model="queryParams.projectCode"
|
||||
@ -177,6 +186,7 @@ import * as ProcessDesignApi from '@/api/heli/processdesign'
|
||||
import {useCommonStateWithOut} from "@/store/modules/common";
|
||||
import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
|
||||
import {ref} from "vue";
|
||||
import dayjs from "dayjs";
|
||||
|
||||
|
||||
defineOptions({ name: 'ProcessDesign3D' })
|
||||
@ -206,6 +216,7 @@ const queryParams = reactive({
|
||||
ownerName:undefined,
|
||||
processDesignType:undefined,
|
||||
isOverProcess:undefined,
|
||||
designDate:undefined
|
||||
})
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
@ -322,8 +333,13 @@ const handleExport = async () => {
|
||||
// return {} // 未开始保持透明背景
|
||||
// }
|
||||
// }
|
||||
const setDefaultDate = () => {
|
||||
queryParams.designDate = dayjs().startOf('day').format('YYYY-MM-DD')
|
||||
|
||||
}
|
||||
/** 初始化 **/
|
||||
onMounted(() => {
|
||||
setDefaultDate()
|
||||
getList()
|
||||
})
|
||||
</script>
|
||||
|
||||
@ -267,7 +267,7 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form
|
||||
|
||||
<el-table-column fixed label="外协" align="center" width="60">
|
||||
<template #default="{ row }">
|
||||
<el-checkbox class="large-checkbox" v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="getDisabledState2(row)||row.flag"/>
|
||||
<el-checkbox class="large-checkbox" v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="getDisabledState2(row)||row.statusFlag"/>
|
||||
<!-- <el-checkbox class="large-checkbox" v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="getDisabledState2(row)"/>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -482,7 +482,7 @@ v-model="row.deviceModel"
|
||||
<!-- v-if="'detail' != active && ((scope.row.purchaseNo ==null || scope.row.purchaseNo=='') && scope.row.reportProcess == 0&&formData.dispatchStatus != 2)&&!flag" link type="danger"-->
|
||||
|
||||
<el-button
|
||||
v-if="'detail' != active && ((scope.row.purchaseNo ==null || scope.row.purchaseNo=='') && scope.row.reportProcess == 0&&formData.dispatchStatus != 2)&&!scope.row.flag" link type="danger"
|
||||
v-if="'detail' != active && ((scope.row.purchaseNo ==null || scope.row.purchaseNo=='') && scope.row.reportProcess == 0&&formData.dispatchStatus != 2)&&!scope.row.statusFlag" link type="danger"
|
||||
size="small" @click.prevent="onDeleteItem(scope.row,scope.$index)">
|
||||
删除
|
||||
</el-button>
|
||||
@ -1318,7 +1318,7 @@ const resetForm = () => {
|
||||
}
|
||||
|
||||
const subFormLoading = ref(false) // 子表单的加载中
|
||||
const flag = ref(false) // 是否下料报工
|
||||
const statusFlag = ref(false) // 是否下料报工
|
||||
const subFormRules = reactive({
|
||||
procedureName: [{
|
||||
required: true,
|
||||
@ -1399,7 +1399,7 @@ const queryData = async (id?: number) => {
|
||||
checkList.value.push(items.name)
|
||||
disabledLabels.value.push(items.name)
|
||||
if ((items.name=='下料1'||items.name=='下料2')&&item.inReportProcess!=0&& !item.isOutsourcing){
|
||||
item.flag=true
|
||||
item.statusFlag=true
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@ -93,7 +93,7 @@ const getListData = async () => {
|
||||
// 数组追加
|
||||
dataList.value.push(...data.list)
|
||||
// 分页条件
|
||||
if (queryParams.pageNo < data.total) {
|
||||
if (queryParams.pageNo < data.pageNo) {
|
||||
// 页码累加
|
||||
queryParams.pageNo++
|
||||
isFinish.value = false
|
||||
@ -102,9 +102,7 @@ const getListData = async () => {
|
||||
// 分页已结束
|
||||
isFinish.value = true
|
||||
}
|
||||
if (data.msg){
|
||||
isFinish.value = false
|
||||
}
|
||||
|
||||
} catch (e){
|
||||
// if(e.data.data==null && e.data.msg){ 2025/11/17 处理成功才调用
|
||||
// //等待三秒再次打开扫码窗口
|
||||
@ -113,6 +111,7 @@ const getListData = async () => {
|
||||
// }, delay.value * 1000);
|
||||
// }
|
||||
} finally {
|
||||
isFinish.value = true
|
||||
isLoading.value = false
|
||||
queryParams.type=0
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
getTaskDetailAPI,
|
||||
postOperateAPI,
|
||||
getListWxAPI,
|
||||
getXLTaskDetailAPI, getTaskInRepotPageAPI, verificationAPI, handleOkAPI, productionCompletedAPI
|
||||
getXLTaskDetailAPI, getTaskInRepotPageAPI, verificationAPI, handleOkAPI, productionCompletedAPI, getCompositionAPI
|
||||
} from '@/services/productionReport'
|
||||
const popup = ref<UniHelper.UniPopupInstance>()
|
||||
const userStore = useLoginStore()
|
||||
@ -19,12 +19,10 @@
|
||||
text: item.label
|
||||
}))
|
||||
|
||||
const userId = userStore.userInfo.userId
|
||||
const isShowStart = ref(false)
|
||||
const isCancel = ref(true)
|
||||
|
||||
|
||||
const isShowEnd = ref(false)
|
||||
|
||||
|
||||
const length = ref()
|
||||
const widht = ref()
|
||||
@ -37,7 +35,6 @@
|
||||
|
||||
let isLoading = ref(false)
|
||||
const historyList = ref([])
|
||||
const formObj = ref({})
|
||||
// 历史明细
|
||||
const getData = async () => {
|
||||
// 发送请求
|
||||
@ -58,7 +55,7 @@
|
||||
// 详情
|
||||
const getDetailData = async (id) => {
|
||||
// 发送请求
|
||||
// isLoading.value = true
|
||||
isLoading.value = true
|
||||
const params = {
|
||||
id,
|
||||
}
|
||||
@ -72,11 +69,6 @@
|
||||
onLoad(async (options : any) => {
|
||||
await getDetailData(options.id)
|
||||
await getData()
|
||||
const obj = historyList.value[0]
|
||||
// 最新的报工是否完成
|
||||
if (obj && obj?.workTime == null && obj.endTime) {
|
||||
popupShow.value = true
|
||||
}
|
||||
})
|
||||
|
||||
// 生产完成
|
||||
@ -108,54 +100,58 @@
|
||||
}
|
||||
// 提交报工
|
||||
const handleOk = async () => {
|
||||
if (length.value==null||length.value==''){
|
||||
if (length.value==null||length.value=='' ||length.value<=0){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '请输入长度',
|
||||
title: '长(直径)不能为空,请确认',
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
if (hight.value==null||hight.value=='' ||hight.value<=0){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '高度不能为空,请确认！',
|
||||
})
|
||||
return
|
||||
}
|
||||
if (weight.value==null||weight.value=='' ||weight.value<=0 ){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '重量不能为空,请确认！',
|
||||
})
|
||||
return
|
||||
}
|
||||
if (reportPrice.value==null||reportPrice.value=='' || reportPrice.value<=0){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '总价不能为空,请确认！',
|
||||
})
|
||||
return
|
||||
}
|
||||
// if (matType.value==null||matType.value==''){
|
||||
// uni.showToast({
|
||||
// icon: 'none',
|
||||
// duration: 3000,
|
||||
// title: '请选择物料类型',
|
||||
// })
|
||||
// return
|
||||
// }
|
||||
if (matType.value=='1'||matType.value=='3'){
|
||||
if (widht.value==null||widht.value==''){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '请输入宽度',
|
||||
title: '物料类型是块料或方料,宽度不能为空，请确认！ ',
|
||||
})
|
||||
return
|
||||
}
|
||||
if (hight.value==null||hight.value==''){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '请输入高度',
|
||||
})
|
||||
return
|
||||
}
|
||||
if (weight.value==null||weight.value==''){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '请输入重量',
|
||||
})
|
||||
return
|
||||
}
|
||||
if (reportPrice.value==null||reportPrice.value==''){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '请输入总价',
|
||||
})
|
||||
return
|
||||
}
|
||||
if (matType.value==null||matType.value==''){
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
duration: 3000,
|
||||
title: '请选择物料类型',
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
const params = {
|
||||
dispatchDetailId: detailInfo.value?.id,
|
||||
length: length.value,
|
||||
@ -177,17 +173,6 @@
|
||||
matType.value = '1'
|
||||
await getDetailData(detailInfo.value.id)
|
||||
await getData()
|
||||
}
|
||||
const handleStart = async () => {
|
||||
const params = {
|
||||
id: detailInfo.value.id,
|
||||
}
|
||||
const data = await postOperateAPI(params)
|
||||
// const pages = getCurrentPages(); // 获取当前页面栈
|
||||
// const currentPage = pages[pages.length - 1]; // 当前页面
|
||||
// const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
|
||||
// uni.reLaunch({ url }); // 重新加载当前页面
|
||||
|
||||
}
|
||||
const popupShow = ref(false)
|
||||
const cancel = () => {
|
||||
@ -208,9 +193,11 @@
|
||||
});
|
||||
}
|
||||
const handleLengthChange =async (val) => {
|
||||
console.log(val)
|
||||
if (val){
|
||||
length.value = parseFloat(val).toFixed(2)
|
||||
var newPrice = await getCompositionAPI(detailInfo.value.compositionId);
|
||||
console.log(newPrice)
|
||||
console.log(newPrice.price)
|
||||
if (matType.value == '1' || matType.value == '3') {
|
||||
if (widht.value > 0 && hight.value > 0) {
|
||||
var rawResult = length.value * widht.value * hight.value * detailInfo.value.density / 1000000;
|
||||
@ -218,7 +205,7 @@
|
||||
var price = weight.value * detailInfo.value.price;
|
||||
reportPrice.value = price.toFixed(2)
|
||||
}
|
||||
} else {
|
||||
} else if (matType.value=='2'){
|
||||
if (hight.value > 0) {
|
||||
const radius = length.value / 2;
|
||||
const radiusSquared = radius * radius;
|
||||
@ -256,7 +243,7 @@
|
||||
var price = weight.value * detailInfo.value.price;
|
||||
reportPrice.value= price.toFixed(2)
|
||||
}
|
||||
}else {
|
||||
}else if (matType.value=='2') {
|
||||
if (length.value>0){
|
||||
const radius = length.value / 2;
|
||||
const radiusSquared = radius * radius;
|
||||
@ -280,9 +267,14 @@
|
||||
}
|
||||
}
|
||||
const onClear= async (type)=>{
|
||||
if (type=='weight'){
|
||||
reportPrice.value=parseFloat("0").toFixed(2)
|
||||
} else{
|
||||
weight.value=parseFloat("0").toFixed(2)
|
||||
reportPrice.value=parseFloat("0").toFixed(2)
|
||||
}
|
||||
uni.hideKeyboard()
|
||||
weight.value=0.00
|
||||
reportPrice.value= 0.00
|
||||
|
||||
}
|
||||
// 新增
|
||||
const handleAdd = async () => {
|
||||
@ -294,7 +286,6 @@
|
||||
popup.value?.open()
|
||||
}
|
||||
const handleClose =async ()=>{
|
||||
// uni.hideKeyboard() // 如果有键盘，先隐藏键盘
|
||||
length.value = ''
|
||||
widht.value = ''
|
||||
hight.value = ''
|
||||
@ -375,41 +366,41 @@
|
||||
<view class="product-row">
|
||||
<view class="row-item">
|
||||
<view class="label">报工日期：</view>
|
||||
<view class="val high-color">{{ item.reportTimeStr }}</view>
|
||||
<view class="val">{{ item.reportTimeStr }}</view>
|
||||
</view>
|
||||
<view class="row-item">
|
||||
<view class="label">报工人：</view>
|
||||
<view class="val high-color">{{ item.ownerName }}</view>
|
||||
<view class="val ">{{ item.ownerName }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="product-row">
|
||||
<view class="row-item">
|
||||
<view class="label">物料类型：</view>
|
||||
<view class="val high-color">{{ item.matType }}</view>
|
||||
<view class="val">{{ item.matType }}</view>
|
||||
</view>
|
||||
<view class="row-item">
|
||||
<view class="label">长(直径)：</view>
|
||||
<view class="val high-color">{{ item.length }} mm</view>
|
||||
<view class="val ">{{ item.length }} mm</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="product-row">
|
||||
<view class="row-item">
|
||||
<view class="label">宽度：</view>
|
||||
<view class="val high-color">{{ item.widht }} mm</view>
|
||||
<view class="val">{{ item.widht }} mm</view>
|
||||
</view>
|
||||
<view class="row-item">
|
||||
<view class="label">高度：</view>
|
||||
<view class="val high-color">{{ item.hight }} mm</view>
|
||||
<view class="val">{{ item.hight }} mm</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="product-row">
|
||||
<view class="row-item">
|
||||
<view class="label">重量：</view>
|
||||
<view class="val high-color">{{ item.weight }} Kg</view>
|
||||
<view class="val high-color">{{ item.weight }} <span class="val">Kg</span></view>
|
||||
</view>
|
||||
<view class="row-item">
|
||||
<view class="label">总价：</view>
|
||||
<view class="val high-color">{{ item.reportPrice }} 元</view>
|
||||
<view class="val high-color">{{ item.reportPrice }} <span class="val">元</span></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="tip-index">
|
||||
@ -442,7 +433,7 @@
|
||||
<view class="cont">
|
||||
<view class="item">
|
||||
<view class="label"><span class="star">*</span>物料类型：</view>
|
||||
<uni-data-select class="val" v-model="matType" :clearable="false"
|
||||
<uni-data-select class="val" v-model="matType" clearable
|
||||
:localdata="unitDict" placeholder="请选择物料类型">
|
||||
</uni-data-select>
|
||||
<view class="unit" ></view>
|
||||
@ -479,7 +470,7 @@
|
||||
<view class="unit" >元</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="ok" @click="handleOk">确定</view>
|
||||
<view class="ok" @click="handleOk">保存</view>
|
||||
</uni-popup>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -118,3 +118,10 @@ export const productionCompletedAPI = (data: Object) => {
|
||||
data,
|
||||
})
|
||||
}
|
||||
// 派工任务详情
|
||||
export const getCompositionAPI = (id: number) => {
|
||||
return http<any[]>({
|
||||
method: 'GET',
|
||||
url: `/heli/composition/get/?id=${id}`,
|
||||
})
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user