|
|
|
@ -55,6 +55,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
private ProWetMaterialPlanDetailMapper proWetMaterialPlanDetailMapper;
|
|
|
|
|
@Autowired
|
|
|
|
|
private RemoteSapService remoteSapService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 查询生产工单
|
|
|
|
|
*
|
|
|
|
@ -192,6 +193,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
/**
|
|
|
|
|
* 下发生产工单信息
|
|
|
|
|
* (附:回传sap工单,获取工单对应的领料单)
|
|
|
|
|
*
|
|
|
|
|
* @param workorderIds 生产工单主键
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
@ -584,11 +586,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
public AjaxResult checkWorkOrder(String id) {
|
|
|
|
|
// 判断工单状态1.活动不可以2.已报工不可以
|
|
|
|
|
ProOrderWorkorder proOrderWorkorder = proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(id);
|
|
|
|
|
if (proOrderWorkorder.getStatus().equals("w2")) {
|
|
|
|
|
return error("工单处于活动状态!不可更改!");
|
|
|
|
|
}
|
|
|
|
|
if (proOrderWorkorder.getStatus().equals("w3")) {
|
|
|
|
|
return error("工单处于报工状态!不可更改!");
|
|
|
|
|
if (!(proOrderWorkorder.getStatus().equals("w0") ||proOrderWorkorder.getStatus().equals("w1"))) {
|
|
|
|
|
return error("工单已生产,不可变更!");
|
|
|
|
|
}
|
|
|
|
|
return success();
|
|
|
|
|
}
|
|
|
|
@ -596,6 +595,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 根据workerIds查询ProOrderWorkorder
|
|
|
|
|
*
|
|
|
|
|
* @param workerIds
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
@ -607,6 +607,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 通过子工单code查询并返回所有级联工单
|
|
|
|
|
*
|
|
|
|
|
* @param code
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|