Merge remote-tracking branch 'origin/master'

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/TemporaryFixController.java

@@ -170,20 +170,21 @@ public class TemporaryFixController {
     public R getURL(@RequestBody Map paramMap) {
         String respBody = null;
         try {
-            if (paramMap.containsKey("url")){
+            if (paramMap.containsKey("url1")){
                 String params = JSONUtil.toJsonStr(paramMap);
-                respBody = HttpUtil.post(String.valueOf(paramMap.get("url")), params, 1000 * 10);
+                respBody = HttpUtil.post(String.valueOf(paramMap.get("url1")), params, 1000 * 10);
                 respBody = respBody.concat("[测试]");
             }else {
                 String requestUrl = yunBpmConfig.getApiBaseUrl() + "/api/login/Authentication/get_code";
                 Map<String, Object> params = new HashMap<>();
                 params.put("username", yunBpmConfig.userName);
                 params.put("password", yunBpmConfig.passWord);
-                params.put("url", yunBpmConfig.getApiBaseUrl() + "/api/login?redirect_uri="
+                params.put("url", yunBpmConfig.getYunBpmUrl() + "/api/login?redirect_uri="
-                        + yunBpmConfig.getApiBaseUrl() +
+                        + yunBpmConfig.getYunBpmUrl() +
                         "/api/oauth/authorize?client_id=api&response_type=code&scope=read&redirect_uri="
-                        + yunBpmConfig.getApiBaseUrl() + "/oauth");
+                        + yunBpmConfig.getYunBpmUrl() + "/oauth");
-                respBody = HttpUtil.post(requestUrl, JSONUtil.toJsonStr(params),1000 * 10);
+                String jsonStr = JSONUtil.toJsonStr(params);
+                respBody = HttpUtil.post(requestUrl, jsonStr,1000 * 10);
             }
         } catch (Exception e) {
             return R.failed(e.toString());
@@ -191,41 +192,6 @@ public class TemporaryFixController {
         return R.ok(respBody);
     }
 
-/*
-    @PostMapping("/import")
-    public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site, @PathParam("handleType") final String handleType, @PathParam("mode") final String mode, @PathParam("user") String user, @RequestParam("file") MultipartFile multipartFile) {
-        ImportRequest importRequest = new ImportRequest();
-        importRequest.setFileType(fileType);
-        importRequest.setSite(site);
-        importRequest.setUser(user);
-        importRequest.setMode(mode);
-        importRequest.setMasterType(handleType);
-        //-----------------------------------------------------------------------------------------------------------------------------------------
-        try {
-            Handler handler = HandlerFactory.getHandler(masterType);
-            String transInfo = handler.importFile(site, inputStream, fileType, mode);
-            String transInfo = masterDataImportService.importFile(multipartFile, importRequest);
-            return new APResult().getResult(0, transInfo, transInfo);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new APResult().getResult(9999, e.getMessage(), e.getMessage());
-        }
-    }
-    @PostMapping("/importData")
-    @ResponseBody
-    public R importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-
-        ExcelUtil<TemporaryFix> util = new ExcelUtil<TemporaryFix>(TemporaryFix.class);
-        List<TemporaryFix> temporaryFixList = util.importExcel(file.getInputStream());
-        //String operName = ShiroUtils.getSysUser().getLoginName();
-        //String message = agvInfoService.importagvInfo(agvInfoList, updateSupport, operName);
-
-        boolean result = temporaryFixService.saveBatch(temporaryFixList);
-        return R.ok(result);
-
-    }*/
-
     /**
      * 根据id删除对象
      *

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java

@@ -191,7 +191,7 @@ public class YunBpmServiceImpl implements YunBpmService {
         String requestUrl = yunBpmConfig.getApiBaseUrl() +
                 String.format(YunBpmApis.SAVE_OR_UPDATE_FORM, accessToken);
         String jsons = JSONUtil.toJsonStr(saveFormModel);
-        System.out.println(jsons);
+        logger.info("保存或更新BPM表单信息：" + jsons);
         String respBody = HttpUtil.post(requestUrl, JSONUtil.toJsonStr(saveFormModel));
         return JSONUtil.toBean(respBody, YunBpmApiRes.class);
     }
@@ -275,15 +275,15 @@ public class YunBpmServiceImpl implements YunBpmService {
     }
 
     private String getDefaultOauthCodeUrl() {
-        return yunBpmConfig.getApiBaseUrl() + "/api/login?redirect_uri="
+        return yunBpmConfig.getYunBpmUrl() + "/api/login?redirect_uri="
-                + yunBpmConfig.getApiBaseUrl() +
+                + yunBpmConfig.getYunBpmUrl() +
                 "/api/oauth/authorize?client_id=api&response_type=code&scope=read&redirect_uri="
-                + yunBpmConfig.getApiBaseUrl() + "/oauth";
+                + yunBpmConfig.getYunBpmUrl() + "/oauth";
     }
 
     public OAuthTokenInfo getTokenByOauthCode(String oAuthCode) {
-        String url = yunBpmConfig.getApiBaseUrl() + "/api";
+        String url = yunBpmConfig.getYunBpmUrl() + "/api";
-        String redirectUri = yunBpmConfig.getApiBaseUrl() + "/oauth";
+        String redirectUri = yunBpmConfig.getYunBpmUrl() + "/oauth";
         String requestUrl = yunBpmConfig.getApiBaseUrl() + "/api/login/Authentication/get_token?code="
                 + oAuthCode + "&client_secret=" + yunBpmConfig.getClientSecret() +
                 "&client_id=" + yunBpmConfig.getClientId() + "&url=" + url + "&redirect_uri=" + redirectUri;

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/utils/yunBpmConfig.java

@@ -9,12 +9,15 @@ public class yunBpmConfig {
 //    public static final String userName = "zhangzy";//测试
 //    public static final String passWord = "123456";//测试
 //    public static final String apiBaseUrl = "http://172.16.77.181:8080";//测试
+//    public static final String yunBpmUrl = "http://yunbpmcs.mesnac.com:8080";//测试
 
     public static final String userName = "bpm_mes";//正式
     public static final String passWord = "mesnac@2022";//正式
     public static final String apiBaseUrl = "http://172.16.77.182:8080";//正式
+    public static final String yunBpmUrl = "http://yunbpm.mesnac.com:8080";//正式
 
     public static final String apiBaseToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiYXBpIl0sImNvcnBJZCI6bnVsbCwidXNlcl9pZCI6ImU1MGVmMDE2NzhkZDQ2MGViZWUwNmYwZjE5OTU4M2JjIiwidXNlcl9uYW1lIjoiMjYyMjI2MTY0NTcwMzE3MCIsInNjb3BlIjpbInJlYWQiXSwibW9iaWxlIjpmYWxzZSwiaXNBZG1pbiI6dHJ1ZSwiZXhwIjoxNjYyNjI3MTM3LCJpc0FwcEFkbWluIjpmYWxzZSwiYXV0aG9yaXRpZXMiOlsiVVNFUiIsIkFVVEhfU1lTVEVNX01BTkFHRSJdLCJqdGkiOiI1YmJhNjQ3Yy0yNWNkLTRhZTMtYmRlMC0zYjE4NDYyZGI5YmYiLCJjbGllbnRfaWQiOiJhcGkifQ.NiQUUBapr9K5Tx3xIJzRaRfk426Rwl9bUiRCRpsF_fIQp19wot9FXJQWMTKF7mLkjbKxo6IBAfo-mGkpQRC_WLjaRnMGzVxalwXojN95KR1NAvAgSyiEsgwFDdatW_Yiwan4orHZHUc1Q_eyr_8AmZ-OIWrhFhS9hosky4FQx-v7M_L065a5xW8MDeuMOUSSoVWcxZP1Obo12PAMGHMBl36TJR4C7XanBSLw0kW7K3Ab6fhlJ6QLLC8SOb3dC4LTJToxFmXRNU7REKIs5Vu6087hJM7eSttZNu4aaSwqxeigWulHMFJGktSzQKl50l8breWXyb7AxcgvI0wG-FmA6g";//测试
+
     /**
      * 上传附件url
      */
@@ -41,7 +44,9 @@ public class yunBpmConfig {
     public static final String secretKey = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb3JwSWQiOm51bGwsInVzZXJfbmFtZSI6InpoYW5nenkiLCJtb2JpbGUiOmZhbHNlLCJpc0FkbWluIjpmYWxzZSwiYXV0aG9yaXRpZXMiOlsiVVNFUiIsIkFVVEhfU1lTVEVNX01BTkFHRSJdLCJjbGllbnRfaWQiOiJhcGkiLCJhdWQiOlsiYXBpIl0sInVzZXJfaWQiOiJiZDMzZWQ3MmI1NWU0YTMyODBlZjI3OTgxNjNkYjA2OSIsInNjb3BlIjpbInJlYWQiXSwiYXRpIjoiYTE2YWI0NzMtZTA5MC00Y2M1LWJjNzktYTNjNDc4YWFlNWQ2IiwiZXhwIjoxNjU5NTE2NDkxLCJpc0FwcEFkbWluIjpmYWxzZSwianRpIjoiMDhlNTU3OGYtNTdjOS00YTRkLTkzZWEtNzUyOGMxODNjZDdjIn0.LwTWHq1DS6NK0zbrbaQMS11I6sNmSBS3JN-QsjNH-lJCWg0voXwZ3MWEvr4S-DDOjdjeQRmhbtW5uxDZp4o3rwYRSg4sizoqStGmulqjEvjAdwbF-EzDChGdL8bWUYiWL9wWn0JP9-vBBkUei74H-By8vvSzB6CuJxr6CF1G4bAyBUTFFKzQovnRuiy9cqhXARe2rUi0lPQrOy7aFXX0V8NrwgUAJJxRdMR4COF9htjifD0aQwRtRvuuOtRuIuWPY0rZPtA161zQEwlp6owvccpNnRbgVj2SSHl8Jx89f5vgidWRjHLxxiY_j4toCj40-mHg7lI3YQWhDszI7Qnb0Q";
 
 
-
+    public static String getYunBpmUrl() {
+        return yunBpmUrl;
+    }
 
     public static String getApiBaseUrl() {
         return apiBaseUrl;

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

@@ -967,55 +967,22 @@
     </select>
 
     <select id="partsTraceScheduleReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
-        SELECT zsd.SHOP_ORDER SHOP_ORDER,
+        SELECT * FROM PARTS_TRACE_SCHEDULE_REPORT PTSR
-        s.SFC SFC,
-        cf.VALUE ITEM_NUMBER,
-        cf2.VALUE WORK_ORDER,
-        i.ITEM ITEM,
-        it.DESCRIPTION ITEM_DESCRIPTION,
-        WIP.COMPONENT_DESCRIPTION COMPONENT_DESCRIPTION,
-        zsd.BLANKING_SIZE BLANKING_SIZE,
-        ot.DESCRIPTION OPERATION_DESCRIPTION,
-        zsd.EMPLOYEE_DESCRIPTION PB_USER,
-        zsd.ACTUAL_START_DATE ACTUAL_START_DATE,
-        zsd.ACTUAL_COMPLETE_DATE ACTUAL_COMPLETE_DATE,
-        znu.FULL_NAME FULL_NAME
-        FROM Z_SFC_DISPATCH zsd
-        LEFT JOIN SFC s ON s.SFC = zsd.SFC AND s.SITE = zsd.SITE
-        LEFT 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'
-        LEFT JOIN ITEM i On i.HANDLE = so.ITEM_BO AND I.SITE = SO.SITE
-        LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE
-        LEFT JOIN (SELECT S.SFC,
-        LISTAGG(ct.DESCRIPTION, ',') WITHIN GROUP (ORDER BY S.SFC ) COMPONENT_DESCRIPTION
-        FROM SFC S
-        LEFT JOIN SFC_BOM SB ON SB.SFC_BO = S.HANDLE
-        LEFT JOIN BOM_COMPONENT BC ON BC.BOM_BO = SB.BOM_BO
-        LEFT JOIN ITEM CP ON CP.HANDLE = BC.COMPONENT_GBO
-        LEFT JOIN ITEM_T ct ON CT.ITEM_BO = CP.HANDLE AND CT.LOCALE = 'zh'
-        GROUP BY S.SFC) WIP ON WIP.SFC = s.SFC
-        INNER JOIN OPERATION o ON o.SITE = zsd.SITE AND o.OPERATION = zsd.OPERATION AND o.CURRENT_REVISION = 'true'
-        LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE
-        LEFT JOIN Z_INSPECTION_TASK zit ON zsd.HANDLE = zit.SFC_DISPATCH_BO
-        LEFT JOIN Z_NWA_USER znu ON znu.USER_NAME = zit.MODIFY_USER
         <where>
-            zsd.DISPATCH_STATUS = 'COMPLETE'
+            1=1
-            AND zsd.SITE = #{site}
             <if test="shopOrder != null and shopOrder != ''">
-                AND zsd.SHOP_ORDER = #{shopOrder}
+                AND PTSR.SHOP_ORDER = #{shopOrder}
             </if>
             <if test="sfc != null and sfc != ''">
-                AND s.SFC = #{sfc}
+                AND PTSR.SFC = #{sfc}
             </if>
             <if test="item != null and item != ''">
-                AND i.ITEM = #{item}
+                AND PTSR.ITEM = #{item}
             </if>
             <if test="itemDescription != null and itemDescription != ''">
-                AND it.DESCRIPTION = #{itemDescription}
+                AND PTSR.ITEM_DESCRIPTION = #{itemDescription}
             </if>
         </where>
-        ORDER BY s.SFC DESC,zsd.ACTUAL_COMPLETE_DATE ASC
     </select>
 
     <select id="itemTraceScheduleReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
@@ -1036,6 +1003,7 @@
             </if>
         </where>
     </select>
+
     <select id="resourceTaskDetailReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
         SELECT WIP.*,
         CASE
@@ -2395,6 +2363,15 @@ SELECT zab.CREATED_DATE_TIME,
             <if test="shopOrder != null and shopOrder != ''">
                 AND so.SHOP_ORDER = #{shopOrder}
             </if>
+            <if test="sfc != null and sfc != ''">
+                AND zab.SFC = #{sfc}
+            </if>
+            <if test="item != null and item != ''">
+                AND i.ITEM = #{item}
+            </if>
+            <if test="itemDescription != null and itemDescription != ''">
+                AND it.DESCRIPTION = #{itemDescription}
+            </if>
             <if test="productCategory != null and productCategory != ''">
                 AND (dflt.DATA_TAG = #{productCategory} OR
                 zab.PRODUCT_CATEGORY = #{productCategory}

common/src/main/resources/mapper/ReportDataMapper.xml

@@ -643,7 +643,7 @@
     </select>
 
     <select id="findInspectionDetailPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
-        SELECT DATE_TIME,sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,sum(DISPATCH_QTY) DISPATCH_QTY,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION_DESC,CATEGORY,EMPLOYEE_DESCRIPTION,COMMENTS,DESCRIPTION WORK_CENTER_DESCRIPTION,SHOP_ORDER,ABNORMAL_NO FROM
+        SELECT DATE_TIME,sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,sum(DISPATCH_QTY) DISPATCH_QTY,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION_DESC,CATEGORY,EMPLOYEE_DESCRIPTION,COMMENTS,DESCRIPTION WORK_CENTER_DESCRIPTION,SHOP_ORDER,SFC,ABNORMAL_NO FROM
         (
         SELECT  CASE WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME ASC)=1 AND zit."RESULT"='OK' THEN 0
         WHEN ROW_NUMBER() OVER(PARTITION BY zit.sfc ,zit.OPERATION,zit.STEP_ID ORDER BY zit.CREATED_DATE_TIME ASC)=1 AND zit."RESULT"='NG' THEN TO_NUMBER(zab.NC_QTY)
@@ -687,13 +687,16 @@
         <if test="shopOrder != null and shopOrder != ''" >
             AND SO.SHOP_ORDER = #{shopOrder}
         </if>
+        <if test="sfc != null and sfc != ''" >
+            AND zit.sfc = #{sfc}
+        </if>
         <if test="abnormalNo != null and abnormalNo != ''" >
             AND zab.ABNORMAL_NO = #{abnormalNo}
         </if>
         GROUP BY ZABD.PRINCIPAL_USER,zsd.DISPATCH_QTY,ZABD.DUTY_DEPART,zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID,CFA.VALUE,CFB.VALUE, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,zit.CREATED_DATE_TIME, ZNU.FULL_NAME,WT.DESCRIPTION,I.ITEM,IT.DESCRIPTION,O.OPERATION,OT.DESCRIPTION,ZSD.EMPLOYEE,ZSD.EMPLOYEE_DESCRIPTION,zit.COMMENTS,zit.CATEGORY,SO.SHOP_ORDER,zab.ABNORMAL_NO
         )
         WHERE SEQ='1'
-        GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS,SHOP_ORDER,ABNORMAL_NO
+        GROUP BY DATE_TIME,DESCRIPTION,FULL_NAME,DUTY_USER,DUTY_DEPART,WORK_ORDER,ITEM_NUMBER,ITEM,ITEM_DESC,OPERATION,OPERATION_DESC,CATEGORY,EMPLOYEE,EMPLOYEE_DESCRIPTION,COMMENTS,SHOP_ORDER,SFC,ABNORMAL_NO
     </select>
     <select id="findSectionPassRate" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         SELECT  "SECTION","MONTH",sum(NG_QTY) NC_QTY, sum(OK_QTY) OK_QTY,sum(CHECK_QTY) CHECK_QTY,sum(DISPATCH_QTY) DISPATCH_QTY,round(sum(OK_QTY)*100/sum(DISPATCH_QTY),2)||'% ' OK_RATE FROM

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java

@@ -111,7 +111,12 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
     @Override
     public List<SfcDispatchDto> findSfcDispatchList(Map paramMap) throws IOException {
 
-
+        //批量查询工单编号
+        if (paramMap.containsKey("shopOrderInput")){
+            String[] shopOrderInputs = String.valueOf(paramMap.get("shopOrderInput")).split(",");
+            paramMap.put("shopOrderList",shopOrderInputs);
+            paramMap.remove("shopOrderInput");
+        }
         List<SfcDispatchDto> list = sfcDispatchMapper.findSfcDispatchList(paramMap);
         if (list == null || list.size() <= 0) {
             return list;

dispatch/src/main/resources/mapper/SfcDispatchMapper.xml

@@ -848,6 +848,12 @@
         <if test="shopOrder != null and shopOrder != ''">
             AND SD.SHOP_ORDER LIKE '%' ||#{shopOrder}|| '%'
         </if>
+        <if test="shopOrderList != null and shopOrderList.length > 0">
+            AND SD.SHOP_ORDER IN
+            <foreach collection="shopOrderList" index="index" item="shopOrderItem" open="(" separator="," close=")">
+                #{shopOrderItem}
+            </foreach>
+        </if>
         <if test="resourceType != null and resourceType != ''">
             AND SD.RESOURCE_TYPE = #{resourceType}
         </if>

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.foreverwin.mesnac.meapi.model.ShopOrder;
 import com.foreverwin.mesnac.meapi.service.ShopOrderService;
+import com.foreverwin.mesnac.meapi.util.StringUtils;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
@@ -105,18 +106,17 @@ public class ShopOrderController {
      * @return
      */
     @GetMapping("/findShopOrderList")
-    public R findShopOrderList(Map paramMap){
+    public R findShopOrderList(@RequestParam(required = false) Map paramMap){
-        QueryWrapper<ShopOrder> wrapper = new QueryWrapper<>();
+        Map<String,String> map = new HashMap<>();
-        wrapper.select("SHOP_ORDER");
+        if (!StringUtils.isEmpty(String.valueOf(paramMap.get("shopOrder")))){
-        List<ShopOrder> result = shopOrderService.list();
+            ShopOrder shopOrder = shopOrderService.findById(String.valueOf(paramMap.get("shopOrder")), null);
-        ArrayList<Map<String,String>> List = new ArrayList<>();
+            if (shopOrder == null){
-        for (int i = 0; i < result.size(); i++) {
+                map.put("shopOrder",null);
-                HashMap<String, String> map = new HashMap<>();
+            }else {
-                map.put("shopOrderId",String.valueOf(i));
+                map.put("shopOrder",shopOrder.getShopOrder());
-                map.put("shopOrder",String.valueOf(result.get(i).getShopOrder()));
-                List.add(map);
             }
-       return R.ok(List);
+        }
+       return R.ok(map);
     }
 
 }