Browse Source

修改TPM维修工单 确认按钮功能,增加取消工单按钮

java8
赵宏斌 5 months ago
parent
commit
82503fa281
  1. 8
      src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
  2. 2
      src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
  3. 2
      src/main/java/com/xujie/sys/modules/pms/service/EamService.java
  4. 5
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
  5. 5
      src/main/resources/mapper/pms/EamMapper.xml

8
src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@ -2262,6 +2262,14 @@ public class EamController {
eamService.confirmDefectOrder(inData);
return R.ok();
}
/**
* 维修确认-取消工单
*/
@PostMapping("/cancelDefectOrder")
public R cancelDefectOrder(@RequestBody EamWorkOrderInData inData){
eamService.cancelDefectOrder(inData);
return R.ok();
}
/**
* 获取用户Role

2
src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@ -501,4 +501,6 @@ public interface EamMapper {
void deleteCoreComponents(EamWorkOrderCoreComponentsData inData);
List<EamAdminData> getConfirmButtonOperator();
void cancelDefectOrder(EamWorkOrderInData inData);
}

2
src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@ -1194,4 +1194,6 @@ public interface EamService {
void deleteCoreComponents(EamWorkOrderCoreComponentsData inData);
List<EamAdminData> getConfirmButtonOperator();
void cancelDefectOrder(EamWorkOrderInData inData);
}

5
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@ -3967,6 +3967,11 @@ public class EamServiceImpl implements EamService {
return list;
}
@Override
public void cancelDefectOrder(EamWorkOrderInData inData) {
eamMapper.cancelDefectOrder(inData);
}
/**
* 员工考勤vs报工工时
*/

5
src/main/resources/mapper/pms/EamMapper.xml

@ -3430,6 +3430,11 @@
delete from eam_workOrder_coreComponents
WHERE site = #{site} and bu_no = #{buNo} and OrderNo = #{orderNo} and partNo = #{partNo}
</delete>
<update id="cancelDefectOrder">
update eam_workOrder
set Status = '已取消'
where site = #{site} AND bu_no = #{buNo} AND OrderNo = #{orderNo} and FunctionType = #{functionType}
</update>
<update id="updateInventoryStock" parameterType="com.xujie.sys.modules.pms.data.InventoryStockData">
update inventory_stock

Loading…
Cancel
Save