From 7834c533f81dc959c14b3607ec3c819ca6b3cb8a Mon Sep 17 00:00:00 2001 From: limy135302065 <1353020654@qq.com> Date: Fri, 24 Dec 2021 15:08:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=20=E8=B4=A8=E9=87=8F=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9-=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=8F=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B4=A8=E9=87=8F=E5=BC=82=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=20=20=20=E6=93=8D=E4=BD=9C=E8=80=85=E5=8A=A0=E5=B7=A5=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=8A=A5=E8=A1=A8-=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=EF=BC=88=E7=94=A8=E5=B7=A5=E5=B1=9E=E6=80=A7=EF=BC=9A=E4=B8=B4?= =?UTF-8?q?=E6=97=B6/=E6=AD=A3=E5=BC=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anomaly/src/main/resources/mapper/ReportMapper.xml | 6 +++++- .../mesnac/meapi/controller/ShopOrderController.java | 9 +++------ .../com/foreverwin/mesnac/meapi/model/ShopOrder.java | 10 ++++++++++ .../mesnac/meapi/service/ShopOrderService.java | 2 +- .../meapi/service/impl/ShopOrderServiceImpl.java | 3 ++- meapi/src/main/resources/mapper/ShopOrderMapper.xml | 3 +++ 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index ca0ea7e5..721da842 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/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 diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java index 5fd6ecce..da37e95e 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java +++ b/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)); } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java index 7b5fe9b1..65ef6ee2 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/ShopOrder.java @@ -136,7 +136,16 @@ public class ShopOrder extends Model { 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 + "}"; } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java index a9e924f3..adf598c6 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ShopOrderService.java @@ -36,7 +36,7 @@ public interface ShopOrderService extends IService { ShopOrderDto findByShopOrderBo(String handle); - List findAbnormalShopOrder(ShopOrder shopOrder); + List findAbnormalShopOrder(String type,ShopOrder shopOrder); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java index 13ce5eee..2b6cec81 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java @@ -65,9 +65,10 @@ public class ShopOrderServiceImpl extends ServiceImpl findAbnormalShopOrder(ShopOrder shopOrder) { + public List findAbnormalShopOrder(String type,ShopOrder shopOrder) { String site = CommonMethods.getSite(); shopOrder.setSite(site); + shopOrder.setType(type); return shopOrderMapper.findAbnormalShopOrder(shopOrder); } diff --git a/meapi/src/main/resources/mapper/ShopOrderMapper.xml b/meapi/src/main/resources/mapper/ShopOrderMapper.xml index e0e4574a..34ef3ef9 100644 --- a/meapi/src/main/resources/mapper/ShopOrderMapper.xml +++ b/meapi/src/main/resources/mapper/ShopOrderMapper.xml @@ -1041,6 +1041,9 @@ INNER JOIN ITEM i ON i.HANDLE = so.PLANNED_ITEM_BO so.SITE = #{site} + + AND zab.TYPE = #{type} +