修改

src/main/java/com/steerinfo/dil/controller/BackgroundProcessingController.java

@@ -170,4 +170,15 @@ public class BackgroundProcessingController extends BaseRESTfulController {
         }
         return success("修改成功！");
     }
+
+    @ApiOperation(value = "关联OA")
+    @PostMapping("oaRelevancy")
+    public RESTfulResult oaRelevancy(@RequestBody(required = false) Map<String,Object> map) {
+        if(map.get("orderNumber") == null) {
+            return failed("修改失败");
+        }
+        map.put("orderNumber",map.get("orderNumber") + "");
+        backgroundProcessingMapper.updateOaRelevancy(map);
+        return success();
+    }
 }

src/main/java/com/steerinfo/dil/mapper/BackgroundProcessingMapper.java

@@ -79,4 +79,6 @@ public interface BackgroundProcessingMapper {
 
     //清空进厂信息
     int clearEnDetails(Map<String,Object> map);
+
+    int updateOaRelevancy(Map<String, Object> map);
 }

src/main/resources/com/steerinfo/dil/mapper/BackgroundProcessingMapper.xml

@@ -299,4 +299,9 @@
         SET RESULT_ENTRY_MODE = NULL ,RESULT_ENTRY_GATE_TIME = NULL,INSERT_TIME = NULL
         WHERE RESULT_TOTAL_ID = #{resultTotalId}
     </update>
+    <update id="updateOaRelevancy">
+        UPDATE OMSTRUCK_ORDER
+        SET REMARK = #{remark}
+        WHERE ORDER_NUMBER = #{orderNumber}
+    </update>
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -486,6 +486,7 @@
         RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
         from  RMS_CONSIGNEE RC
         where instr(RC.CONSIGNEE_COMPANY_NAME, #{index}) > 0 and rownum < 10
+        AND RC.DELETED = 0
         order by "value"
     </select>
     <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
@@ -872,6 +873,7 @@
         WHERE RM.MATERIAL_SPECIFICATION LIKE 'Φ%'
         AND RM.MATERIAL_ID != 2533
         AND RM.MATERIAL_ID != 3465
+        AND RM.DELETED = 0
         <if test="materialNameText != null">
             AND (instr(RM.MATERIAL_NAME || RM.MATERIAL_MODEL, #{materialNameText}) > 0)
         </if>