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

派工单人员问题

Browse Source
This commit is contained in:
Ledo 2025-06-27 21:51:21 +08:00
parent 5721d201bd
commit 0c04b14352
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java
View File

@ -44,6 +44,14 @@ public interface MaterialPlanBoomMapper extends BaseMapperX<MaterialPlanBoomDO>
Long hasPurchase(Map map);
Long hasPurYard(Map map);
default int updateSetNull(List<Long> ids){
UpdateWrapper<MaterialPlanBoomDO> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("supplier_id",null).set("estimated_price",null)
.set("purchase_amount",null).set("arrive_time",null).set("mat_rest",null)
.in("id",ids);
return update(updateWrapper);
}
default PageResult<MaterialPlanBoomDO> selectPage(MaterialPlanBoomPageReqVO reqVO) {
MPJLambdaWrapper<MaterialPlanBoomDO> query = new MPJLambdaWrapper<>();
query.selectAll(MaterialPlanBoomDO.class)

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java
View File

@ -45,7 +45,7 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX<PurchaseOrder
.leftJoin(ProjectOrderDO.class,"po",ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId)
.leftJoin(PurchaseOrderMakeDO.class,"pom",PurchaseOrderMakeDO::getId,PurchaseOrderMakeDetailDO::getPurchaseOrderId)
.eq(PurchaseOrderMakeDO::getGoodsType,1)
.disableSubLogicDel();
.eq(PurchaseOrderMakeDO::getStatus,2);
if (!StringUtils.isEmpty(reqVO.getProjectName())){
query.like(ProjectOrderDO::getProjectName, reqVO.getProjectName());
}

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplanboom/MaterialPlanBoomServiceImpl.java
View File

@ -224,6 +224,7 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService {
}
}else{
//去库存，要同时删掉：供应商、采购数量、预估总价、预计到货日期
List<MaterialPlanBoomDO> materialPlanBoomDOList = updateReqVO.getMaterialPlanBoomDOList();
List<Long> ids = new ArrayList<>();
@ -243,7 +244,7 @@ public class MaterialPlanBoomServiceImpl implements MaterialPlanBoomService {
throw exception(PURCHASE_ORDER_MAKE_DETAIL_IS_STORAGE);
}
materialPlanBoomMapper.updateBatch(materialPlanBoomDOList);
materialPlanBoomMapper.updateSetNull(ids);
}

13
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
View File

@ -1514,7 +1514,6 @@ const onAddItem = () => {
}else{
if(formData.value.taskDispatchDetails != null && formData.value.taskDispatchDetails.length > 0){
var it = formData.value.taskDispatchDetails [0]
console.log(it)
if(it.startTime != null){
row.startTime = it.startTime
}
@ -1545,6 +1544,17 @@ const onAddItem = () => {
}
});
if(formData.value.taskDispatchDetails != null && formData.value.taskDispatchDetails.length > 0){
for(var i = 0 ; i < formData.value.taskDispatchDetails.length ; i ++ ){
var item = formData.value.taskDispatchDetails[i];
for(var j = 0 ; j < list.length ; j ++ ){
var item1 = list[j];
if(item.procedureId == item1.procedureId){
item1.dispatchType = item.dispatchType
}
}
}
}
formData.value.taskDispatchDetails = list;
}else{
formData.value.taskDispatchDetails = []
@ -1677,6 +1687,7 @@ const onDeleteItem = async (row,index) => {
message.success(t('common.delSuccess'))
}
const handleOutsourcingChange= async (row: any) => {
console.log('ss')
if(row.isOutsourcing == false){
row.dispatchType = 1
row.postId = ''