|
@@ -112,6 +112,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 查询报工列表
|
|
|
*/
|
|
|
@GetMapping("/list")
|
|
|
+ @Log(title = "查询报工列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo list(BizDaywork bizDaywork) {
|
|
|
startPage();
|
|
|
|
|
@@ -127,6 +128,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/lotList")
|
|
|
+ @Log(title = "查询批次列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo lotList(BizLot bizLot) {
|
|
|
// 获取批次信息列表
|
|
|
startPage();
|
|
@@ -142,6 +144,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/listDayworkLot")
|
|
|
+ @Log(title = "查询报工批次", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo listDayworkLot(BizDaywork bizDaywork) {
|
|
|
startPage();
|
|
|
List<BizDaywork> dayworkList = bizDayworkService.getListFromNoCurrent(bizDaywork);
|
|
@@ -161,6 +164,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/listForOutsource")
|
|
|
+ @Log(title = "查询外协列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo listForOutsource(BizDaywork bizDaywork) {
|
|
|
// 已经在页面中存在的daywork id
|
|
|
List<Long> existingDayworkIds = bizDaywork.getExistingDayworkIds();
|
|
@@ -228,6 +232,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/processesForOutsource")
|
|
|
+ @Log(title = "查询外协工序", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo listProcessesForOutsource(BizDaywork bizDaywork) {
|
|
|
//查找当前生产子计划的批次报工信息,找到最后一条包报工信息
|
|
|
BizDaywork daywork = bizDayworkService.query().eq("lot_id", bizDaywork.getLotId()).eq("deleted", 0).one();
|
|
@@ -260,6 +265,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/getLotPosition")
|
|
|
+ @Log(title = "查询批次位置", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo getLotPosition(BizDaywork bizDaywork) {
|
|
|
startPage();
|
|
|
List<BizDaywork> list = bizDayworkService.getLotPosition(bizDaywork);
|
|
@@ -273,6 +279,7 @@ public class BizDayworkController extends BaseController {
|
|
|
|
|
|
//查询辅助报工数据
|
|
|
@GetMapping("/listDayworkAuxiliaryItem")
|
|
|
+ @Log(title = "查询辅助报工列表", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult listDayworkAuxiliaryItem(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
|
|
|
//根据工序查询对饮工序的辅助报工信息
|
|
|
|
|
@@ -286,6 +293,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* @return TableDataInfo
|
|
|
*/
|
|
|
@GetMapping("/listItem")
|
|
|
+ @Log(title = "查询报工列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo listItem(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
|
|
|
startPage();
|
|
|
//查询批次报工信息列表
|
|
@@ -358,6 +366,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/listOriginalItem")
|
|
|
+ @Log(title = "查询报工列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo listOriginalItem(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
|
|
|
startPage();
|
|
|
//查询批次报工信息列表
|
|
@@ -439,6 +448,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* @return TableDataInfo
|
|
|
*/
|
|
|
@GetMapping("/listReportItem")
|
|
|
+ @Log(title = "查询报工日报列表", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo listReportItem(BizDayworkItem bizDayworkItem) throws NoSuchFieldException, IllegalAccessException {
|
|
|
startPage();
|
|
|
//查询批次报工信息列表
|
|
@@ -463,6 +473,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/getDayworkItemDetail")
|
|
|
+ @Log(title = "查询报工明细", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDayworkItemDetail(@RequestBody BizDayworkItem bizDayworkItem) {
|
|
|
BizDayworkItem dayworkItemInfo = new BizDayworkItem();
|
|
|
List<BizProcessInspecion> processInspectionList = bizProcessInspecionService.query().eq("daywork_item_id", bizDayworkItem.getId()).orderByDesc("create_time").list();
|
|
@@ -478,6 +489,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/getProcessDetail")
|
|
|
+ @Log(title = "查询报工工艺列表", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getProcessDetail(@RequestBody BizDaywork bizDaywork) {
|
|
|
if (bizDaywork.getIsAmend() == 1 || bizDaywork.getIsWasteRecycling() == 1) {
|
|
|
List<BizLotTechnologicalProcessDetail> list = bizLotTechnologicalProcessDetailService.query()
|
|
@@ -501,6 +513,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* @return TableDataInfo
|
|
|
*/
|
|
|
@PostMapping("/updateItem")
|
|
|
+ @Log(title = "修改报工列表", businessType = BusinessType.UPDATE)
|
|
|
public AjaxResult updateItem(@RequestBody BizDayworkItem bizDayworkItem) {
|
|
|
// String tenantId = request.getHeader("tenantId");
|
|
|
// bizDayworkItem.setTenantId(Long.valueOf(tenantId));
|
|
@@ -511,6 +524,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 获取工序列表
|
|
|
*/
|
|
|
@GetMapping("/getProcessList")
|
|
|
+ @Log(title = "获取工序列表", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getProcessList(BizDayworkItem bizDayworkItem) {
|
|
|
if (bizDayworkItem.getIsAmend() == 1 || bizDayworkItem.getIsWasteRecycling() == 1) {
|
|
|
// BizLotTechnologicalProcess bizLotTechnologicalProcess = bizLotTechnologicalProcessService.query().eq("lot_id", bizDayworkItem.getLotId()).eq("is_stop",0).list().get(0);
|
|
@@ -531,6 +545,7 @@ public class BizDayworkController extends BaseController {
|
|
|
//删除报工明细
|
|
|
@DeleteMapping("/{ids}")
|
|
|
@Transactional
|
|
|
+ @Log(title = "删除报工明细", businessType = BusinessType.DELETE)
|
|
|
public AjaxResult deletedItem(@PathVariable Long ids) {
|
|
|
//判断如果是首序,则必须留一条报工
|
|
|
BizDayworkItem bizDayworkItem = bizDayworkItemService.getById(ids);
|
|
@@ -656,6 +671,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
//更换炉号查询的批次信息
|
|
|
@GetMapping("/getDayworkList")
|
|
|
+ @Log(title = "更换炉号查询批次信息", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo getDayworkList(BizDaywork bizDaywork) throws NoSuchFieldException, IllegalAccessException, ParseException {
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
if(bizDaywork.getStartTime()!=null) {
|
|
@@ -778,6 +794,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 获取批次工序信息
|
|
|
*/
|
|
|
@GetMapping("/getDayworkItemProcess/{id}")
|
|
|
+ @Log(title = "获取批次工序信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDayworkItemProcess(@PathVariable("id") String lotCode) {
|
|
|
//查询批次信息
|
|
|
HashMap<String, Object> map = new HashMap<>();
|
|
@@ -834,6 +851,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/checkUseEquipment")
|
|
|
+ @Log(title = "检测社保使用情况", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult checkUseEquipment(@RequestBody List<BizProductionResourceGroupDetail> bizProductionResourceGroupDetailList) {
|
|
|
List<BizProductionResourceGroupDetail> equipmentDetail = bizProductionResourceGroupDetailList.stream().filter(item ->
|
|
|
item.getCommonType().equals("equipmentDetail")).collect(Collectors.toList());
|
|
@@ -854,6 +872,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 获取报工记录的工段
|
|
|
*/
|
|
|
@GetMapping("/getDeptInfo")
|
|
|
+ @Log(title = "获取报工记录的工段", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDeptList(BizDayworkItem bizDayworkItem) {
|
|
|
return success(bizDayworkItemService.getDeptInfo(bizDayworkItem));
|
|
|
}
|
|
@@ -862,17 +881,20 @@ public class BizDayworkController extends BaseController {
|
|
|
* 获取计划详情
|
|
|
*/
|
|
|
@GetMapping("/getDayworkInfo")
|
|
|
+ @Log(title = "获取计划详情", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo getDayworkInfo(BizDaywork daywork) {
|
|
|
return getDataTable(bizDayworkService.getDayworkInfo(daywork));
|
|
|
}
|
|
|
|
|
|
@GetMapping("/getProducedLot")
|
|
|
+ @Log(title = "获取计划单批次", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo getProducedLot(BizProductionPlanDetail data) {
|
|
|
|
|
|
return getDataTable(bizDayworkService.getProducedLot(data));
|
|
|
}
|
|
|
|
|
|
@GetMapping("/getItemProcess")
|
|
|
+ @Log(title = "获取报工工艺列表", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getItemProcess(BizProductionPlanDetail data) {
|
|
|
//拿到生产计划
|
|
|
BizProductionPlanDetail bizProductionPlanDetail = bizProductionPlanDetailService.query().eq("production_plan_No", data.getProductionPlanNo()).eq("line_number", data.getLineNumber()).list().get(0);
|
|
@@ -900,11 +922,13 @@ public class BizDayworkController extends BaseController {
|
|
|
* 获取计划详情的工段列表
|
|
|
*/
|
|
|
@GetMapping("/getDeptList")
|
|
|
+ @Log(title = "获取计划详情的工段列表", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDeptList(BizDaywork daywork) {
|
|
|
return success(bizDayworkService.getDeptList(daywork));
|
|
|
}
|
|
|
|
|
|
@GetMapping("/getDeptListForUser")
|
|
|
+ @Log(title = "获取用户工段", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDeptListForUser() {
|
|
|
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
|
|
|
List<Long> ids = new ArrayList<>();
|
|
@@ -939,6 +963,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 获取计划详情的工序列表
|
|
|
*/
|
|
|
@GetMapping("/getDayworkProcessList")
|
|
|
+ @Log(title = "获取计划详情的工序列表", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDayworkProcessList(BizDaywork daywork) {
|
|
|
return success(bizDayworkService.getDayworkProcessList(daywork));
|
|
|
}
|
|
@@ -1004,6 +1029,7 @@ public class BizDayworkController extends BaseController {
|
|
|
* 获取报工详细信息
|
|
|
*/
|
|
|
@GetMapping(value = "/{id}")
|
|
|
+ @Log(title = "获取报工详细信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getInfo(@PathVariable("id") Long id) {
|
|
|
return success(bizDayworkService.getById(id));
|
|
|
}
|
|
@@ -1012,12 +1038,14 @@ public class BizDayworkController extends BaseController {
|
|
|
* 获取报工废品数信息
|
|
|
*/
|
|
|
@GetMapping("/getDayworkItemRejectList")
|
|
|
+ @Log(title = "获取报工废品数信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getDayworkItemRejectList(BizDayworkItemReject bizDayworkItemReject) {
|
|
|
return success(bizDayworkItemRejectService.getList(bizDayworkItemReject));
|
|
|
}
|
|
|
|
|
|
/*普通报工废品*/
|
|
|
@GetMapping("/getOriginalDayworkItemRejectList")
|
|
|
+ @Log(title = "普通报工废品", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getOriginalDayworkItemRejectList(BizDayworkItemReject bizDayworkItemReject) {
|
|
|
return success(bizDayworkItemRejectService.getOriginalDayworkItemRejectList(bizDayworkItemReject));
|
|
|
}
|
|
@@ -1048,6 +1076,7 @@ public class BizDayworkController extends BaseController {
|
|
|
*/
|
|
|
@Transactional
|
|
|
@PostMapping("/updateDayworkItemInfo")
|
|
|
+ @Log(title = "修改报工信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult updateDayworkItemInfo(@RequestBody BizDayworkItem bizDayworkItem) {
|
|
|
// String tenantId = request.getHeader("tenantId");
|
|
|
// bizDayworkItem.setTenantId(Long.valueOf(tenantId));
|
|
@@ -1102,6 +1131,7 @@ public class BizDayworkController extends BaseController {
|
|
|
*/
|
|
|
@Transactional
|
|
|
@PostMapping("/updateDayworkItemInfoForNum")
|
|
|
+ @Log(title = "修改报工信息中的数量", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult updateDayworkItemInfoForNum(@RequestBody BizDayworkItem bizDayworkItem) {
|
|
|
// String tenantId = request.getHeader("tenantId");
|
|
|
// bizDayworkItem.setTenantId(Long.valueOf(tenantId));
|
|
@@ -1158,6 +1188,7 @@ public class BizDayworkController extends BaseController {
|
|
|
|
|
|
@Transactional
|
|
|
@PostMapping("/updateDayworkItemInfoForTurnover")
|
|
|
+ @Log(title = "修改周转报工信息", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult updateDayworkItemInfoForTurnover(@RequestBody BizDayworkItem bizDayworkItem) {
|
|
|
saveTurnoverHistory(bizDayworkItem);
|
|
|
|
|
@@ -1287,6 +1318,7 @@ public class BizDayworkController extends BaseController {
|
|
|
|
|
|
@Transactional
|
|
|
@PostMapping("/updateDayworkItemInfoMax")
|
|
|
+ @Log(title = "修改报工信息最高权限", businessType = BusinessType.UPDATE)
|
|
|
public AjaxResult updateDayworkItemInfoMax(@RequestBody BizDayworkItem bizDayworkItem) {
|
|
|
//判断箱子
|
|
|
//判断箱子是否没被占用
|
|
@@ -1408,6 +1440,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@GetMapping("/processesForOutsourceByFirst")
|
|
|
+ @Log(title = "获取首序外协工序", businessType = BusinessType.SELECT)
|
|
|
public TableDataInfo listProcessesForOutsourceByFirst(BizLot bizLot) {
|
|
|
//查找当前生产子计划的批次报工信息,找到最后一条包报工信息
|
|
|
//List<BizDayworkItem> dayworkItemList = bizDayworkItemService.getList(dayworkItem);
|
|
@@ -1426,6 +1459,7 @@ public class BizDayworkController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
@PostMapping("/updateDayworkFurnace")
|
|
|
+ @Log(title = "修改报工炉号", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult updateDayworkFurnace(@RequestBody BizDaywork bizDaywork) {
|
|
|
List<BizFurnaceNoInfo> furnaceList = bizFurnaceNoInfoService.query().in("daywork_id", bizDaywork.getDayworkIds()).list();
|
|
|
furnaceList.forEach(item->{
|
|
@@ -1443,6 +1477,7 @@ public class BizDayworkController extends BaseController {
|
|
|
return success(bizFurnaceNoInfoService.updateBatchById(furnaceList));
|
|
|
}
|
|
|
@GetMapping("/getAllWorkShop")
|
|
|
+ @Log(title = "获取所有车间和周转区", businessType = BusinessType.SELECT)
|
|
|
public AjaxResult getAllWorkShop() {
|
|
|
// 获取所有的车间和车间内工段
|
|
|
List<BizWorkshop> workShopList = bizWorkshopService.query().list();
|