工单修改

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceWorkorderServiceImpl.java

@@ -158,15 +158,11 @@ public class ProduceWorkorderServiceImpl implements ProduceWorkorderService {
     public void update(ProduceWorkorderDto dto) {
         ProduceWorkorderDto entity = this.findById(dto.getWorkorder_id());
         if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
-
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
-
-
         dto.setUpdate_time(DateUtil.now());
         dto.setUpdate_id(currentUserId);
         dto.setUpdate_name(nickName);
-
         WQLObject wo = WQLObject.getWQLObject("pdm_produce_workorder");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         wo.update(json);

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/MPS_PRODUCEWORKORDER.wql

@@ -125,7 +125,7 @@
                 and device.device_code not in (
                     select o.current_device_code as device_code
                     from PDM_produce_workOrder o
-                    where o.workorder_status <> '5'
+                    where o.workorder_status <> '5' and o.is_delete = '0'
                 )
             ENDOPTION
         ENDSELECT