|
@@ -137,6 +137,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:inspecion:list')")
|
|
|
@GetMapping("/list")
|
|
|
+ @Log(title = "查询序检列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo list(BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
|
|
|
if (bizProcessInspecion.getStartTime() != null) {
|
|
@@ -161,6 +162,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//交检审核列表
|
|
|
@PostMapping("/examineList")
|
|
|
+ @Log(title = "查询交检审核列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo examineList(@RequestBody BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
|
|
|
if (bizProcessInspecion.getStartTime() != null) {
|
|
@@ -220,6 +222,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//修改交检审核状态
|
|
|
@PutMapping("/updateAdoptStatus")
|
|
|
+ @Log(title = "修改交检审核状态", businessType = BusinessType.UPDATE)
|
|
|
public AjaxResult updateAdoptStatus(@RequestBody BizProcessInspecion bizProcessInspecion) {
|
|
|
Long userId = SecurityUtils.getLoginUser().getUserId();
|
|
|
bizProcessInspecion.setAdoptId(userId);
|
|
@@ -233,6 +236,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:inspecion:list')")
|
|
|
@GetMapping("/outsourcedlist")
|
|
|
+ @Log(title = "查询序检主列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo outsourcedlist(BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
if (bizProcessInspecion.getStartTime() != null) {
|
|
|
Date startTimeDate = bizProcessInspecion.getStartTime();
|
|
@@ -258,6 +262,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
* 查询产品信息
|
|
|
*/
|
|
|
@PostMapping("/getProductConsult")
|
|
|
+ @Log(title = "查询产品信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getProductConsult(@RequestBody BizLot lot) throws NoSuchFieldException, IllegalAccessException {
|
|
|
BizProduct product = bizProductService.getById(lot.getProductId());
|
|
|
if (product == null) {
|
|
@@ -318,6 +323,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
// processInspecion.setLot(lot);
|
|
|
// return success(processInspecion);
|
|
|
// }
|
|
|
+ @Log(title = "查询序检详情", businessType = BusinessType.SELECT)
|
|
|
@PostMapping("/selectInspecion")
|
|
|
public AjaxResult selectInspecion(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
List<Long> inspectionIds = new ArrayList<>();
|
|
@@ -362,6 +368,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//判断载具
|
|
|
@PostMapping("/checkCarrier")
|
|
|
+ @Log(title = "判断检测载具是否可用", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult checkCarrier(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
String carrierCode = dayworkCarrier.getCarrierCode();
|
|
|
BizCarrier carrier = bizCarrierService.query().eq("code", carrierCode).eq("is_inspection", 1).one();
|
|
@@ -383,6 +390,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//根据检测载具查询检测信息
|
|
|
@PostMapping("getInspectionInfoByInspectionCarrierCode")
|
|
|
+ @Log(title = "根据检测载具查询检测信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getInspectionInfoByInspectionCarrierCode(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
String carrierCode = dayworkCarrier.getCarrierCode();
|
|
|
BizCarrier carrier = bizCarrierService.query().eq("code", carrierCode).eq("is_inspection", 1).one();
|
|
@@ -466,6 +474,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/selectOutsourcedInspecion")
|
|
|
+ @Log(title = "获取外协检查信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult selectOutsourcedInspecionV1(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
List<Long> inspectionIds = new ArrayList<>();
|
|
|
inspectionIds.add(processInspecion.getId());
|
|
@@ -642,6 +651,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/getProcessInspectionByDayworkId")
|
|
|
+ @Log(title = "获取质检信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getProcessInspectionByDayworkId(@RequestBody BizProcessInspecion processInspecion) {
|
|
|
|
|
|
List<BizProcessInspecion> processInspecionList = bizProcessInspecionService.getInspection(processInspecion);
|
|
@@ -727,6 +737,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
*/
|
|
|
@PostMapping("/saveProcessInspecion")
|
|
|
@Transactional
|
|
|
+ @Log(title = "新增序检信息", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveProcessInspecion(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//根据lot信息保存序检表
|
|
|
BizDaywork daywork = bizDayworkService.query().eq("lot_code", processInspecion.getLot().getLotCode()).one();
|
|
@@ -1046,6 +1057,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
@Transactional
|
|
|
@PostMapping("/saveOutsourcedInspecion")
|
|
|
+ @Log(title = "新增外协序检信息", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveOutsourcedInspectionV4(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
// // 判断是否已有未确认外协检查
|
|
|
// if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {
|
|
@@ -1496,6 +1508,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
@Transactional
|
|
|
@PostMapping("/saveOnSiteInspection")
|
|
|
+ @Log(title = "新增巡检信息", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveOnSiteInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
|
|
|
throw new RuntimeException("检测载具已解绑,移交仪器室,请绑定载具");
|
|
@@ -1738,6 +1751,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
@Transactional
|
|
|
@PostMapping("/saveFirstInspection")
|
|
|
+ @Log(title = "新增首序检信息", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveFirstInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
|
|
|
throw new RuntimeException("检测载具已解绑,移交仪器室,请绑定载具");
|
|
@@ -1983,6 +1997,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//查找该检查是否已经移交给了仪器室
|
|
|
@PostMapping("/getInstrumentRoomInspection")
|
|
|
+ @Log(title = "判断检查是否交给仪器室", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getInstrumentRoomInspection(@RequestBody BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
List<BizProcessInspecion> list = bizProcessInspecionService.query().eq("from_id", bizProcessInspecion.getId()).eq("type", "instrumentRoomInspection").list();
|
|
|
return success(list);
|
|
@@ -2008,6 +2023,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
*/
|
|
|
// @PostMapping("/getCarrierInfo")
|
|
|
@PostMapping("/getCarrierInfoProcess")
|
|
|
+ @Log(title = "判断箱号是否为检查载具", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getCarrierInfo(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
// List<BizDayworkCarrier> list = bizDayworkCarrierService.query().eq("carrier_code",dayworkCarrier.getCarrierCode()).eq("deleted",0).eq("is_changed",0).list();
|
|
|
dayworkCarrier.setIsChanged(0);
|
|
@@ -2036,6 +2052,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/getCarrierInfo")
|
|
|
+ @Log(title = "获取载具信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getCarrierInfoByType(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
// 判断是哪种箱
|
|
|
String carrierCode = dayworkCarrier.getCarrierCode();
|
|
@@ -2077,6 +2094,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//首件扫码专用
|
|
|
@PostMapping("/getFirstCarrierInfo")
|
|
|
+ @Log(title = "为首序检获取载具信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getFirstCarrierInfo(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
// 判断是哪种箱
|
|
|
String carrierCode = dayworkCarrier.getCarrierCode();
|
|
@@ -2117,6 +2135,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
//交检
|
|
|
@Transactional
|
|
|
@PostMapping("/saveDeliveryInspection")
|
|
|
+ @Log(title = "新增交检信息", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveDeliveryInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
|
|
|
throw new RuntimeException("检测载具已解绑,移交仪器室,请绑定载具");
|
|
@@ -2357,6 +2376,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
//仪器室检转到其他仪器室
|
|
|
@Transactional
|
|
|
@PostMapping("/updateChamberId")
|
|
|
+ @Log(title = "转移仪器室", businessType = BusinessType.UPDATE)
|
|
|
public AjaxResult updateChamberId(@RequestBody BizProcessInspecion bizProcessInspecion) {
|
|
|
BizProcessInspecion processInspection = bizProcessInspecionService.query().eq("id", bizProcessInspecion.getId()).one();
|
|
|
processInspection.setInspectionChamberId(bizProcessInspecion.getInspectionChamberId());
|
|
@@ -2373,6 +2393,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
//仪器室检
|
|
|
@Transactional
|
|
|
@PostMapping("/saveInstrumentRoomInspection")
|
|
|
+ @Log(title = "新增仪器室检查", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveInstrumentRoomInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//根据lot信息保存序检表
|
|
|
BizDaywork daywork = bizDayworkService.query().eq("lot_code", processInspecion.getLot().getLotCode()).one();
|
|
@@ -2523,6 +2544,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
//该方法只在首件送检时选择仪器室时使用
|
|
|
@Transactional
|
|
|
@PostMapping("/saveFirstInstrumentRoomInspection")
|
|
|
+ @Log(title = "新增首序送检仪器室", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveFirstInstrumentRoomInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
|
|
|
throw new RuntimeException("检测载具已解绑,移交仪器室,请绑定载具");
|
|
@@ -2648,6 +2670,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
//出厂检
|
|
|
@Transactional
|
|
|
@PostMapping("/saveFactoryInspection")
|
|
|
+ @Log(title = "出厂检人员新增出厂检", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveFactoryInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
|
|
|
throw new RuntimeException("检测载具已解绑,移交仪器室,请绑定载具");
|
|
@@ -2829,6 +2852,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
//没有出厂检权限新增
|
|
|
@Transactional
|
|
|
@PostMapping("/saveFirstFactoryInspection")
|
|
|
+ @Log(title = "普通员工新增出厂检", businessType = BusinessType.INSERT)
|
|
|
public AjaxResult saveFirstFactoryInspection(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
if (processInspecion.getFlag() != null && processInspecion.getFlag() && (processInspecion.getIsInspectionCarrierChanged() != null && processInspecion.getIsInspectionCarrierChanged().equals(1))) {
|
|
|
throw new RuntimeException("检测载具已解绑,移交仪器室,请绑定载具");
|
|
@@ -2914,6 +2938,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
* 根据箱号查询批次信息
|
|
|
*/
|
|
|
@PostMapping("/getLotOutsourcedInfo")
|
|
|
+ @Log(title = "根据箱号查询批次信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getLotOutsourcedInfo(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
List<String> codes = new ArrayList<>();
|
|
|
codes.add("27110");
|
|
@@ -3014,6 +3039,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//解绑检测载具
|
|
|
@PostMapping("/unbindInspectionCarrier")
|
|
|
+ @Log(title = "解绑检测载具", businessType = BusinessType.UPDATE)
|
|
|
public AjaxResult unbindInspectionCarrier(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
List<BizDayworkCarrier> carrierList = bizDayworkCarrierService.query().eq("carrier_code", dayworkCarrier.getCarrierCode()).eq("is_changed", 0).list();
|
|
|
//操作检查表
|
|
@@ -3067,6 +3093,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('business:inspection:list')")
|
|
|
@PostMapping("/getLotInfo")
|
|
|
+ @Log(title = "根据箱号查询批次信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getLotInfo(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//根据箱号查询当前绑定信息
|
|
|
dayworkCarrier = bizDayworkCarrierService.getByCarrierCode(dayworkCarrier);
|
|
@@ -3152,6 +3179,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//巡检专用
|
|
|
@PostMapping("/getPatrolLotInfo")
|
|
|
+ @Log(title = "获取巡检批次信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getPatrolLotInfo(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//根据箱号查询当前绑定信息
|
|
|
Long deptId = dayworkCarrier.getDeptId();
|
|
@@ -3237,6 +3265,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/getFirstInspectionLotInfo")
|
|
|
+ @Log(title = "获取首序检批次信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getFirstInspectionLotInfo(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//根据箱号查询当前绑定信息
|
|
|
Long deptId = dayworkCarrier.getDeptId();
|
|
@@ -3307,6 +3336,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//交检专用
|
|
|
@PostMapping("/getDeliveryLotInfo")
|
|
|
+ @Log(title = "获取交检批次信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDeliveryLotInfo(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//根据箱号查询当前绑定信息
|
|
|
dayworkCarrier = bizDayworkCarrierService.getByCarrierCode(dayworkCarrier);
|
|
@@ -3377,6 +3407,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
|
|
|
//首件检专用
|
|
|
@PostMapping("/getLotInfoByFirstInspection")
|
|
|
+ @Log(title = "或许首序检批次信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getLotInfoByFirstInspection(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//获取报工信息
|
|
|
List<BizDayworkItem> itemList = bizDayworkItemService.getByDayworkId(dayworkCarrier.getDayworkId())
|
|
@@ -3464,6 +3495,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/getLotInfoByFactoryInspection")
|
|
|
+ @Log(title = "获取出厂检批次信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getLotInfoByFactoryInspection(@RequestBody BizDayworkCarrier dayworkCarrier) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//根据箱号查询当前绑定信息
|
|
|
dayworkCarrier = bizDayworkCarrierService.getByCarrierCode(dayworkCarrier);
|
|
@@ -3581,7 +3613,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
* 导出序检主列表
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('business:inspecion:export')")
|
|
|
- @Log(title = "序检主", businessType = BusinessType.EXPORT)
|
|
|
+ @Log(title = "导出序检列表", businessType = BusinessType.EXPORT)
|
|
|
@PostMapping("/export")
|
|
|
public void export(HttpServletResponse response, BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
setTenantId(bizProcessInspecion);
|
|
@@ -3595,6 +3627,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('business:inspecion:query')")
|
|
|
@GetMapping(value = "/{id}")
|
|
|
+ @Log(title = "获取序检信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getInfo(@PathVariable("id") Long id) {
|
|
|
return success(bizProcessInspecionService.getById(id));
|
|
|
}
|
|
@@ -3603,7 +3636,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
* 新增序检主
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('business:inspecion:add')")
|
|
|
- @Log(title = "序检主", businessType = BusinessType.INSERT)
|
|
|
+ @Log(title = "新增序检", businessType = BusinessType.INSERT)
|
|
|
@PostMapping
|
|
|
public AjaxResult add(@RequestBody BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
setTenantId(bizProcessInspecion);
|
|
@@ -3614,7 +3647,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
* 修改序检主
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('business:inspecion:edit')")
|
|
|
- @Log(title = "序检主", businessType = BusinessType.UPDATE)
|
|
|
+ @Log(title = "编辑序检", businessType = BusinessType.UPDATE)
|
|
|
@PutMapping
|
|
|
public AjaxResult edit(@RequestBody BizProcessInspecion bizProcessInspecion) throws NoSuchFieldException, IllegalAccessException {
|
|
|
setTenantId(bizProcessInspecion);
|
|
@@ -3624,7 +3657,7 @@ public class BizProcessInspecionController extends BaseController {
|
|
|
/**
|
|
|
* 删除序检主
|
|
|
*/
|
|
|
- @Log(title = "序检主", businessType = BusinessType.DELETE)
|
|
|
+ @Log(title = "删除序检", businessType = BusinessType.DELETE)
|
|
|
@DeleteMapping("/{ids}")
|
|
|
@Transactional
|
|
|
public AjaxResult remove(@PathVariable List<Long> ids) {
|