Merge remote-tracking branch 'origin/master'

hx-common/product-library/src/main/java/com/fjhx/entity/Material.java

@@ -22,14 +22,14 @@ import java.math.BigDecimal;
 public class Material extends BaseEntity {
 
     /**
-     * 物料类型
+     * 分类id
      */
-    private Integer type;
+    private Long classifyId;
 
     /**
-     * 分类id
+     * 物料类型
      */
-    private Long classifyId;
+    private Integer type;
 
     /**
      * 编码
@@ -77,9 +77,9 @@ public class Material extends BaseEntity {
     private BigDecimal loss;
 
     /**
-     * 备注
+     * 物料说明
      */
-    private String remarks;
+    private String introduce;
 
     /**
      * 逻辑删除 0未删除 1已删除

hx-common/product-library/src/main/java/com/fjhx/entity/Product.java

@@ -54,11 +54,6 @@ public class Product extends BaseEntity {
     private String introduce;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionLine.java

@@ -46,11 +46,6 @@ public class ProductionLine extends BaseEntity {
     private Integer status;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionProcess.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity.production;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,16 +19,15 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class ProductionProcess extends BaseEntity {
 
-
     /**
      * 生产流程名称
      */
     private String name;
 
     /**
-     * 备注
+     * 流程说明
      */
-    private String remarks;
+    private String introduce;
 
     /**
      * 逻辑删除 0未删除 1已删除

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionProcessWorkmanship.java

@@ -1,12 +1,12 @@
 package com.fjhx.entity.production;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-
 /**
  * <p>
  * 流程工艺关联表
@@ -40,11 +40,6 @@ public class ProductionProcessWorkmanship extends BaseEntity {
     private Integer sort;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionWorkmanship.java

@@ -1,12 +1,9 @@
 package com.fjhx.entity.production;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -39,11 +36,6 @@ public class ProductionWorkmanship extends BaseEntity {
     private Integer whetherPacking;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/iot-management-api/src/main/java/com/fjhx/entity/production/ProductionWorkshop.java

@@ -41,11 +41,6 @@ public class ProductionWorkshop extends BaseEntity {
     private Integer status;
 
     /**
-     * 备注
-     */
-    private String remarks;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service/iot-management/src/main/java/com/fjhx/bom/service/impl/BomServiceImpl.java

@@ -74,7 +74,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomSe
         return result;
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(BomVo bomVo) {
 
@@ -97,7 +97,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomSe
         FileClientUtil.bindingFile(bomVo.getId(), bomVo.getFileInfoParam());
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(BomVo bomVo) {
 
@@ -122,7 +122,7 @@ public class BomServiceImpl extends ServiceImpl<BomMapper, Bom> implements BomSe
         FileClientUtil.againBindingFile(bomVo.getId(), bomVo.getFileInfoParam());
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(BomVo bomVo) {
         removeById(bomVo.getId());

hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionWorkmanshipServiceImpl.java

@@ -43,21 +43,21 @@ public class ProductionWorkmanshipServiceImpl extends ServiceImpl<ProductionWork
         return page(condition, wrapper);
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(ProductionWorkmanshipVo productionWorkmanshipVo) {
         save(productionWorkmanshipVo);
         FileClientUtil.bindingFile(productionWorkmanshipVo.getId(), productionWorkmanshipVo.getFileInfoParam());
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(ProductionWorkmanshipVo productionWorkmanshipVo) {
         updateById(productionWorkmanshipVo);
         FileClientUtil.againBindingFile(productionWorkmanshipVo.getId(), productionWorkmanshipVo.getFileInfoParam());
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void delete(ProductionWorkmanshipVo productionWorkmanshipVo) {
         Long id = productionWorkmanshipVo.getId();

hx-service/service-file/src/main/java/com/fjhx/service/impl/FileInfoServiceImpl.java

@@ -110,7 +110,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         updateBatchById(collect);
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void againBindingFile(String applicationName, Long businessId, Integer businessType, List<FileInfoParam> paramList) {
 

hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -0,0 +1,24 @@
+package com.fjhx.task.controller;
+
+import com.fjhx.task.service.ScheduleTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+@Configuration
+@EnableScheduling
+public class ScheduleTaskController {
+
+    @Autowired
+    private ScheduleTaskService scheduleTaskService;
+
+    /**
+     * 定时推送id与工号不一致的信息
+     */
+    @Scheduled(cron = "0 0/10 * * * ?")
+    private void stockAcceptActionTask() {
+        scheduleTaskService.stockAcceptActionTask();
+    }
+
+}

hx-service/storage/src/main/java/com/fjhx/task/mapper/ScheduleTaskMapper.java

@@ -0,0 +1,24 @@
+package com.fjhx.task.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 供应商 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-12
+ */
+public interface ScheduleTaskMapper {
+
+    List<Map<String, Object>> selectPublished(@Param("selectPublishedSql") String selectPublishedSql);
+
+    Map<String, String> selectUserIdAndJobNo(@Param("userId") String userId);
+
+    void updatePublished(@Param("updatePublishedSql") String updatePublishedSql);
+
+}

hx-service/storage/src/main/java/com/fjhx/task/mapper/SchedulrTaskMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.task.mapper.ScheduleTaskMapper">
+
+    <select id="selectPublished" resultType="java.util.Map">
+        ${selectPublishedSql}
+    </select>
+
+    <select id="selectUserIdAndJobNo" resultType="java.util.Map">
+        select ID, JobNo
+        from u_user
+        where ID = #{userId}
+    </select>
+
+    <update id="updatePublished">
+        ${updatePublishedSql}
+    </update>
+
+</mapper>

hx-service/storage/src/main/java/com/fjhx/task/service/ScheduleTaskService.java

@@ -0,0 +1,7 @@
+package com.fjhx.task.service;
+
+public interface ScheduleTaskService {
+
+    void stockAcceptActionTask();
+
+}

hx-service/storage/src/main/java/com/fjhx/task/service/impl/ScheduleTaskServiceImpl.java

@@ -0,0 +1,215 @@
+package com.fjhx.task.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.fjhx.task.mapper.ScheduleTaskMapper;
+import com.fjhx.task.service.ScheduleTaskService;
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ScheduleTaskServiceImpl implements ScheduleTaskService {
+
+    private static final RestTemplate restTemplate;
+
+    private static final String GET_ACCESS_TOKEN_ACTION_URL;
+
+    private static final String STOCK_ACCEPT_ACTION;
+
+    private static final String SELECT_PUBLISHED_SQL;
+    private static final String UPDATE_PUBLISHED_SQL;
+
+    @Autowired
+    private ScheduleTaskMapper scheduleTaskMapper;
+
+    static {
+        restTemplate = new RestTemplate();
+        restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+
+        if (BladeApplication.isLocalDev()) {
+            GET_ACCESS_TOKEN_ACTION_URL = "http://106.14.146.72:8087/portal/getAccessTokenAction.do?AppId=1&AppSecret=a2b1c2d3";
+            STOCK_ACCEPT_ACTION = "http://106.14.146.72:8087/SrmWeb/stockAcceptAction.do?action=custom&access_token=";
+            SELECT_PUBLISHED_SQL = "select Id,Content from `cap.published_copy1` where handle is null";
+            UPDATE_PUBLISHED_SQL = "UPDATE `cap.published_copy1` SET handle=1 WHERE id=";
+        } else {
+            GET_ACCESS_TOKEN_ACTION_URL = "http://mes.cfmfactory.com:8087/portal/getAccessTokenAction.do?AppId=1&AppSecret=a2b1c2d3";
+            STOCK_ACCEPT_ACTION = "http://mes.cfmfactory.com:8087/SrmWeb/stockAcceptAction.do?action=custom&access_token=";
+            SELECT_PUBLISHED_SQL = "select Id,Content from `cap.published` where handle is null";
+            UPDATE_PUBLISHED_SQL = "UPDATE `cap.published` SET handle=1 WHERE id=";
+        }
+    }
+
+    @Override
+    public void stockAcceptActionTask() {
+
+        List<Map<String, Object>> selectPublishedList = scheduleTaskMapper.selectPublished(SELECT_PUBLISHED_SQL);
+
+        // 获取token
+        ResponseEntity<String> entity = restTemplate.getForEntity(GET_ACCESS_TOKEN_ACTION_URL, String.class);
+        String body = entity.getBody();
+        if (ObjectUtil.isEmpty(body)) return;
+        JSONObject jsonObject = JSONObject.parseObject(body);
+        String token = jsonObject.getString("token");
+        if (ObjectUtil.isEmpty(token)) return;
+
+        for (Map<String, Object> stringStringMap : selectPublishedList) {
+            String content = stringStringMap.get("Content").toString();
+            // 内容
+            JSONObject contentMap = JSONObject.parseObject(content);
+            JSONObject value = contentMap.getJSONObject("Value");
+            String userId = value.getString("UserId");
+
+            Map<String, String> userIdAndJobNo = scheduleTaskMapper.selectUserIdAndJobNo(userId);
+
+            if (userIdAndJobNo.get("ID").equals(userIdAndJobNo.get("JobNo"))) {
+                scheduleTaskMapper.updatePublished(UPDATE_PUBLISHED_SQL + stringStringMap.get("Id"));
+                continue;
+            }
+
+            try {
+                // 获取排班物料
+                HashMap<String, String> map = new HashMap<>();
+
+                map.put("material", value.getString("MaterialCode"));
+                map.put("type", value.getString("Type"));
+                map.put("begNum", value.getString("BegNum"));
+                map.put("endNum", value.getString("EndNum"));
+                map.put("count", value.getString("Qty"));
+                map.put("userId", userIdAndJobNo.get("JobNo"));
+                map.put("createDate", value.getString("CreateDate"));
+
+                ResponseEntity<String> stockAcceptActionResult = restTemplate.postForEntity(STOCK_ACCEPT_ACTION + token, map, String.class);
+                String stockAcceptActionBody = stockAcceptActionResult.getBody();
+
+                if (JSONObject.parseObject(stockAcceptActionBody).getBoolean("success")) {
+                    scheduleTaskMapper.updatePublished(UPDATE_PUBLISHED_SQL + stringStringMap.get("Id"));
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+//    public static void main(String[] args) {
+//
+//        List<String> strings1 = Arrays.asList(
+//                "01.002.0116",
+//                "01.002.0023",
+//                "01.002.0128",
+//                "01.002.0050",
+//                "01.002.0076",
+//                "01.002.0042",
+//                "01.002.0126",
+//                "01.002.0096",
+//                "01.002.0043",
+//                "01.002.0177",
+//                "01.002.0123",
+//                "01.002.0095",
+//                "01.002.0037",
+//                "01.002.0052",
+//                "01.001.0045",
+//                "01.002.0038",
+//                "01.002.0174",
+//                "01.002.0079",
+//                "01.001.0087",
+//                "01.002.0120",
+//                "01.003.0003",
+//                "01.002.0094",
+//                "01.004.0002",
+//                "01.002.0059",
+//                "01.001.0059",
+//                "01.002.0021",
+//                "01.002.0383",
+//                "01.001.0006",
+//                "01.001.0055",
+//                "01.001.0033",
+//                "01.001.0044",
+//                "01.002.0049",
+//                "01.001.0009",
+//                "01.002.0017",
+//                "01.002.0039"
+//        );
+//
+//        List<String> strings2 = Arrays.asList(
+//                "10.00",
+//                "100.00",
+//                "162.00",
+//                "0.00",
+//                "50.00",
+//                "80.00",
+//                "15.00",
+//                "0.00",
+//                "434.00",
+//                "0.00",
+//                "34.00",
+//                "0.00",
+//                "40.00",
+//                "70.00",
+//                "130.00",
+//                "929.00",
+//                "55.00",
+//                "20.00",
+//                "45.00",
+//                "95.00",
+//                "40.00",
+//                "0.00",
+//                "90.00",
+//                "15.00",
+//                "0.00",
+//                "967.00",
+//                "236.40",
+//                "15.00",
+//                "260.00",
+//                "70.00",
+//                "120.00",
+//                "60.00",
+//                "75.00",
+//                "0.00",
+//                "105.00"
+//        );
+//
+//
+//        // 获取token
+//        ResponseEntity<String> entity
+//                = restTemplate.getForEntity(
+//                "http://mes.cfmfactory.com:8087/portal/getAccessTokenAction.do?AppId=1&AppSecret=a2b1c2d3", String.class);
+//        String body = entity.getBody();
+//        if (ObjectUtil.isEmpty(body)) return;
+//        JSONObject jsonObject = JSONObject.parseObject(body);
+//        String token = jsonObject.get("token").toString();
+//        if (ObjectUtil.isEmpty(token)) return;
+//
+//
+//        for (int i = 0; i < strings1.size(); i++) {
+//            // 获取排班物料
+//            HashMap<String, String> map = new HashMap<>();
+//
+//            map.put("material", strings1.get(i));
+//            map.put("type", "1");
+//            map.put("begNum", "0.00");
+//            map.put("endNum", strings2.get(i));
+//            map.put("count", strings2.get(i));
+//            map.put("userId", "2206008");
+//            map.put("createDate", LocalDateTime.now().toString());
+//
+//            ResponseEntity<String> stockAcceptActionResult =
+//                    restTemplate.postForEntity("http://mes.cfmfactory.com:8087/SrmWeb/stockAcceptAction.do?action=custom&access_token=" + token, map, String.class);
+//            String stockAcceptActionBody = stockAcceptActionResult.getBody();
+//            System.out.println(map);
+//            System.out.println(stockAcceptActionBody);
+//            System.out.println();
+//            System.out.println();
+//        }
+//    }
+
+}