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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
z 2025-02-21 11:27:43 +08:00
commit 1d54d58346
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java
View File

@ -58,6 +58,7 @@ public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
.leftJoin(PlanTaskBomDO.class, "i", wrapper -> wrapper.eq(PlanTaskBomDO::getTaskId, PlanTaskDO::getId).eq(PlanTaskBomDO::getBomDetailId, TaskDispatchDO::getBomDetailId)) .leftJoin(PlanTaskBomDO.class, "i", wrapper -> wrapper.eq(PlanTaskBomDO::getTaskId, PlanTaskDO::getId).eq(PlanTaskBomDO::getBomDetailId, TaskDispatchDO::getBomDetailId))
.leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, PlanTaskBomDO::getOwner) .leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, PlanTaskBomDO::getOwner)
.orderByDesc(TaskDispatchDO::getId) .orderByDesc(TaskDispatchDO::getId)
.eq(ProjectOrderSubDO::getDeleted,0)
.disableSubLogicDel(); .disableSubLogicDel();
query.like(!StringUtils.isEmpty(reqVO.getCode()), TaskDispatchDO::getCode, reqVO.getCode()) query.like(!StringUtils.isEmpty(reqVO.getCode()), TaskDispatchDO::getCode, reqVO.getCode())

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java
View File

@ -452,6 +452,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
deliverAmount = deliverOrderSubDOList.stream().mapToInt(DeliverOrderSubDO::getAmount).sum(); deliverAmount = deliverOrderSubDOList.stream().mapToInt(DeliverOrderSubDO::getAmount).sum();
} }
projectOrderSubDO.setDeliverAmount(deliverAmount); projectOrderSubDO.setDeliverAmount(deliverAmount);
}); });
} }

4
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthing
import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipManufactureDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipManufactureDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO; 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.dataobject.taskdispatch.TaskDispatchDetailDO;
@ -268,7 +269,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
for (TaskDispatchDO taskDispatchDO : list) { for (TaskDispatchDO taskDispatchDO : list) {
Integer num ; Integer num ;
if (numMap.get(taskDispatchDO.getProjectSubId())==null){ if (numMap.get(taskDispatchDO.getProjectSubId())==null){
num = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId()).getAmount(); ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId());
num = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId()).getAmount();
numMap.put(taskDispatchDO.getProjectSubId(),num); numMap.put(taskDispatchDO.getProjectSubId(),num);
}else { }else {
num= numMap.get(taskDispatchDO.getProjectSubId()); num= numMap.get(taskDispatchDO.getProjectSubId());

2
mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/detail.vue
View File

@ -922,7 +922,7 @@ const queryData = async (type: string, id?: number) => {
sub.saleOrderSubId = sub.id sub.saleOrderSubId = sub.id
sub.id = '' sub.id = ''
sub.saleOrderCode = sub.projectOrderCode sub.saleOrderCode = sub.projectOrderCode
sub.amounts = sub.amount - sub.deliverAmount sub.amount = sub.amount - sub.deliverAmount
}) })
formData.value.deliverOrderSubs = formData.value.deliverOrderSubs.concat( formData.value.deliverOrderSubs = formData.value.deliverOrderSubs.concat(
subList subList

2
mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue
View File

@ -37,7 +37,7 @@ v-for="dicts in getIntDictOptions(DICT_TYPE.HELI_SHENHE)" :key="dicts.value"
<script setup lang="ts"> <script setup lang="ts">
import * as ShenheApi from '@/api/heli/shenhe' import * as ShenheApi from '@/api/heli/shenhe'
import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict' import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue' import UserSelect from '@/views/heli/hlvuestyle/userSelectAll.vue'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗