计划模块(优化)

op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderController.java

@@ -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
      */

op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java

@@ -45,6 +45,7 @@ public class ProOrderWorkorderController extends BaseController {
 
     /**
      * 通过子工单code查询并返回所有级联工单
+     *
      * @param code
      * @return
      */

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -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")) {
+        if (!(proOrderWorkorder.getStatus().equals("w0") ||proOrderWorkorder.getStatus().equals("w1"))) {
-            return error("工单处于活动状态！不可更改！");
+            return error("工单已生产，不可变更！");
-        }
-        if (proOrderWorkorder.getStatus().equals("w3")) {
-            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
      */

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml

@@ -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>