计划模块(优化)

highway
wws 1 year ago
parent 473f789631
commit 9229c77301

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

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

@ -55,6 +55,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
private ProWetMaterialPlanDetailMapper proWetMaterialPlanDetailMapper; private ProWetMaterialPlanDetailMapper proWetMaterialPlanDetailMapper;
@Autowired @Autowired
private RemoteSapService remoteSapService; private RemoteSapService remoteSapService;
/** /**
* *
* *
@ -192,6 +193,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
/** /**
* *
* (sap) * (sap)
*
* @param workorderIds * @param workorderIds
* @return * @return
*/ */
@ -584,11 +586,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
public AjaxResult checkWorkOrder(String id) { public AjaxResult checkWorkOrder(String id) {
// 判断工单状态1.活动不可以2.已报工不可以 // 判断工单状态1.活动不可以2.已报工不可以
ProOrderWorkorder proOrderWorkorder = proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(id); ProOrderWorkorder proOrderWorkorder = proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(id);
if (proOrderWorkorder.getStatus().equals("w2")) { if (!(proOrderWorkorder.getStatus().equals("w0") ||proOrderWorkorder.getStatus().equals("w1"))) {
return error("工单处于活动状态!不可更改!"); return error("工单已生产,不可变更!");
}
if (proOrderWorkorder.getStatus().equals("w3")) {
return error("工单处于报工状态!不可更改!");
} }
return success(); return success();
} }
@ -596,6 +595,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
/** /**
* workerIdsProOrderWorkorder * workerIdsProOrderWorkorder
*
* @param workerIds * @param workerIds
* @return * @return
*/ */
@ -607,6 +607,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
/** /**
* code * code
*
* @param code * @param code
* @return * @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="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> <if test="planDateEnd != null "> and '${planDateEnd}%' >= CONVERT(varchar(10),plan_pro_date, 120)</if>
</where> </where>
and prod_type != 'white'
ORDER BY plan_pro_date DESC ORDER BY plan_pro_date DESC
</select> </select>

Loading…
Cancel
Save