workflow/src/main/java/com/tofly/workflow/process/controller/TfProcessNodeLController.java

@@ -4,6 +4,7 @@
  */
 package com.tofly.workflow.process.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tofly.common.core.result.BaseController;
@@ -20,6 +21,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.spring.web.json.Json;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -110,6 +112,9 @@ public class TfProcessNodeLController extends BaseController {
     @ApiOperation(value = "新增流程节点处理信息（操作步骤都有记录）")
     @PostMapping
     public ResultData save(@RequestPart @Valid PNodeSaveDto dto, @RequestPart List<MultipartFile> files) {
+
+        log.info("新增流程节点:{}", JSON.toJSONString(dto));
+
         for (MultipartFile multipartFile : files) {
             log.info("multipartFile.getOriginalFilename()"+multipartFile.getOriginalFilename());
         }

workflow/src/main/java/com/tofly/workflow/wzyy/controller/MaterialOutInController.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/materialOutIn")
 @Api(tags="同步到用友出入库")
@@ -24,6 +26,8 @@ public class MaterialOutInController {
     @Autowired
     private MaterialOutInService mOutInService;
 
+
+
     /**
      * 获取提交数据结果
      * @return
@@ -40,12 +44,29 @@ public class MaterialOutInController {
      * @return
      */
     @GetMapping("/pushFialMaterial")
-    @ApiOperation(value = "推送提交到用友失败的物料出入库信息")
-    public ResultData pushFialMaterial(){
+    @ApiOperation(value = "重新推送未推送的退料数据")
+    public ResultData pushFialMaterialTL(){
         mOutInService.pushMaterial(0);
         return ResultData.ok();
     }
+    /**
+     * 推送提交到用友失败的物料出入库信息
+     * @return
+     */
+    @GetMapping("/pushFialMaterialTL")
+    @ApiOperation(value = "推送提交到用友失败的物料出入库信息")
+    public ResultData pushFialMaterial(){
+
+        final List<Long> notPushTlInfo = mOutInService.findNotPushTlInfo();
+
+        for (Long l : notPushTlInfo) {
+            mOutInService.returnOfMaterial(l);
+        }
 
+
+
+        return ResultData.ok();
+    }
     /**
      * 获取工程提交到用友的出库物料信息
      * @return

workflow/src/main/java/com/tofly/workflow/wzyy/mapper/MaterialOutInMapper.java

@@ -19,4 +19,6 @@ import java.util.List;
  * @date Tue Dec 20 00:00:00 CST 2022
  */
 public interface MaterialOutInMapper extends BaseMapper<MaterialOutIn> {
+
+    List<Long> findNotPushTlInfo();
 }

workflow/src/main/java/com/tofly/workflow/wzyy/service/MaterialOutInService.java

@@ -10,6 +10,8 @@ import com.tofly.workflow.wzyy.entity.dto.PageInListDto;
 import com.tofly.workflow.wzyy.entity.dto.PageOutListDto;
 import com.tofly.workflow.wzyy.entity.dto.YyProjectMaterialDto;
 
+import java.util.List;
+
 /**
  * 同步到用友物料出库、入库数据
  *
@@ -70,4 +72,7 @@ public interface MaterialOutInService extends IService<MaterialOutIn> {
      * @return
      */
     String getYyCode(String id);
+
+
+    List<Long> findNotPushTlInfo();
 }

workflow/src/main/java/com/tofly/workflow/wzyy/service/impl/MaterialOutInServiceImpl.java

@@ -886,6 +886,11 @@ public class MaterialOutInServiceImpl extends ServiceImpl<MaterialOutInMapper, M
 
     }
 
+    @Override
+    public List<Long> findNotPushTlInfo() {
+        return baseMapper.findNotPushTlInfo();
+    }
+
     /**
      * 用友入库aip 调用
      * @param remap 条件

workflow/src/main/resources/mapper/wzyy/MaterialOutInMapper.xml

@@ -34,6 +34,13 @@
         <association property="mCharacter" column="ID"
                      select="com.tofly.workflow.wzyy.mapper.MaterialCharacterMapper.getMaterialCharacterByMOiId"></association>
     </resultMap>
+    <select id="findNotPushTlInfo" resultType="java.lang.Long">
+
+        select process_id from tf_project_material_w
+        where process_id not in ( select process_id from tf_material_out_in_w )
+          and MATERIAL_TYPE = 5
+
+    </select>
 
 
 </mapper>