update

质量异常待办事项-工单号检索条件只显示质量异常的
  操作者加工完成报表-添加列（用工属性：临时/正式）

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -743,11 +743,15 @@
                 WHEN zab.NC_QTY IS NOT NULL THEN ROUND((zsd.DISPATCH_QTY - TO_NUMBER(zab.NC_QTY))*ZSD.PROD_HOURS ,4)
                 ELSE ROUND(zsd.DISPATCH_QTY*ZSD.PROD_HOURS ,4)  END  TOTAL_PROD_HOURS ,
                zsd.EMPLOYEE_DESCRIPTION,
+               CASE WHEN ZUR.TEMPORARY_USER = 'true' THEN '临时'
+               WHEN ZUR.TEMPORARY_USER = 'false' THEN '正式' END EMPLOYEE_ATTR,
                zsd.ACTUAL_START_DATE,
                zsd.ACTUAL_COMPLETE_DATE,
                zsd.REMARK
         FROM Z_SFC_DISPATCH zsd
-                 INNER JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
+                LEFT JOIN Z_USER_RESOURCE ZUR ON  zsd.RESRCE = ZUR.RESRCE
+                AND zsd.EMPLOYEE_DESCRIPTION like CONCAT(ZUR.USER_DESCRIPTION, '%')
+                INNER JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
                  LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'ITEM_NUMBER'
                  LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
                  INNER JOIN ITEM i ON i.HANDLE = so.ITEM_BO

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java

@@ -9,10 +9,7 @@ import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
 import com.sap.me.status.StatusBOHandle;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  *
@@ -92,8 +89,8 @@ public class ShopOrderController {
      * 查出只有异常的工单
      */
     @GetMapping("/findAbnormalShopOrder")
-    public R findAbnormalShopOrder(ShopOrder shopOrder){
-        return R.ok(shopOrderService.findAbnormalShopOrder(shopOrder));
+    public R findAbnormalShopOrder(String type, ShopOrder shopOrder){
+        return R.ok(shopOrderService.findAbnormalShopOrder(type,shopOrder));
     }
 
 

meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java

@@ -136,7 +136,16 @@ public class ShopOrder extends Model<ShopOrder> {
    private Double maximumDeliveryQty;
    @TableField("TOLERANCE_DEFINED_IN")
    private String toleranceDefinedIn;
+   //异常类型，查询异常工单时传参
+   private String type;
 
+   public String getType() {
+      return type;
+   }
+
+   public void setType(String type) {
+      this.type = type;
+   }
 
    public String getHandle() {
       return handle;
@@ -752,6 +761,7 @@ public static final String TOLERANCE_DEFINED_IN = "TOLERANCE_DEFINED_IN";
          ", minimumDeliveryQty = " + minimumDeliveryQty +
          ", maximumDeliveryQty = " + maximumDeliveryQty +
          ", toleranceDefinedIn = " + toleranceDefinedIn +
+         ", type = " + type +
          "}";
    }
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java

@@ -36,7 +36,7 @@ public interface ShopOrderService extends IService<ShopOrder> {
 
     ShopOrderDto findByShopOrderBo(String handle);
 
-    List<ShopOrder> findAbnormalShopOrder(ShopOrder shopOrder);
+    List<ShopOrder> findAbnormalShopOrder(String type,ShopOrder shopOrder);
 
 
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java

@@ -65,9 +65,10 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
     }
 
     @Override
-    public List<ShopOrder> findAbnormalShopOrder(ShopOrder shopOrder) {
+    public List<ShopOrder> findAbnormalShopOrder(String type,ShopOrder shopOrder) {
         String site = CommonMethods.getSite();
         shopOrder.setSite(site);
+        shopOrder.setType(type);
         return shopOrderMapper.findAbnormalShopOrder(shopOrder);
     }
 

meapi/src/main/resources/mapper/ShopOrderMapper.xml

@@ -1041,6 +1041,9 @@
         INNER JOIN ITEM i ON i.HANDLE = so.PLANNED_ITEM_BO
         <where>
             so.SITE = #{site}
+            <if test="type!=null and type!=''">
+                AND zab.TYPE = #{type}
+            </if>
         </where>
     </select>
 </mapper>