计划模块(优化)

highway
wws 1 year ago
parent 473f789631
commit 9229c77301

@ -42,6 +42,7 @@ public class ProOrderController extends BaseController {
/**
* Code
*
* @param orderCode
* @return
*/
@ -146,6 +147,7 @@ public class ProOrderController extends BaseController {
/**
* code
*
* @param prodCode
* @return
*/
@ -166,6 +168,7 @@ public class ProOrderController extends BaseController {
/**
* list
*
* @param routeCode
* @return
*/

@ -45,6 +45,7 @@ public class ProOrderWorkorderController extends BaseController {
/**
* code
*
* @param code
* @return
*/

@ -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 {
/**
* workerIdsProOrderWorkorder
*
* @param workerIds
* @return
*/
@ -607,6 +607,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
/**
* code
*
* @param code
* @return
*/

@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planDateStart != null "> and CONVERT(varchar(10),plan_pro_date, 120) >= '${planDateStart}'</if>
<if test="planDateEnd != null "> and '${planDateEnd}%' >= CONVERT(varchar(10),plan_pro_date, 120)</if>
</where>
and prod_type != 'white'
ORDER BY plan_pro_date DESC
</select>

Loading…
Cancel
Save